Fix the vnflcm problem of registering MSB with HTTPS

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / const.py

diff --git a/lcm/lcm/nf/const.py b/lcm/lcm/nf/const.py
index 8c43434..1d584b8 100644 (file)
--- a/lcm/lcm/nf/const.py
+++ b/lcm/lcm/nf/const.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from lcm.pub.config import config
+from lcm.pub.config.config import MSB_BASE_URL
 from lcm.pub.utils.jobutil import enum
 
 HEAL_ACTION_TYPE = enum(
@@ -75,6 +75,25 @@ OPERATION_TASK = enum(
     TERMINATE="terminate"
 )
 
+SUB_OPERATION_TASK = enum(
+    RETRY="retry",
+    ROLLBACK="rollback",
+    FAIL="fail",
+    CANCEL="cancel",
+    ERROR="error",
+    SUCCESS="success",
+    GRANTED="granted",
+    UNRESOLVABLE_ERROR="unresolvable_error",
+    AUTO_ROLLBACK="auto_rollback",
+)
+
+SUB_OPERATION_TUPLE = (
+    SUB_OPERATION_TASK.RETRY,
+    SUB_OPERATION_TASK.ROLLBACK,
+    SUB_OPERATION_TASK.FAIL,
+    SUB_OPERATION_TASK.CANCEL
+)
+
 INSTANTIATION_STATE = enum(
     NOT_INSTANTIATED="NOT_INSTANTIATED",
     INSTANTIATED="INSTANTIATED"
@@ -123,7 +142,7 @@ CHANGE_TYPE = enum(
 RESOURCE_MAP = {'Storage': 'volumn', 'Network': 'network', 'SubNetwork': 'subnet', 'Port': 'port',
                 'Flavour': 'flavor', 'Vm': 'vm'}
 
-URL_PREFIX = "http://%s:%s/api/vnflcm/v1" % (config.MSB_SERVICE_IP, config.MSB_SERVICE_PORT)
+URL_PREFIX = "%s/api/vnflcm/v1" % (MSB_BASE_URL)
 
 ROOT_URI = "api/vnflcm/v1/subscriptions/"