Get flavor id from OOF.

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

diff --git a/lcm/lcm/nf/const.py b/lcm/lcm/nf/const.py
index 5e6cb67..c11c099 100644 (file)
--- a/lcm/lcm/nf/const.py
+++ b/lcm/lcm/nf/const.py
@@ -34,6 +34,8 @@ OPERATION_TYPE = enum(
     MODIFY_INFO="MODIFY_INFO"
 )
 
+LCM_NOTIFICATION_STATUS = enum(START="START", RESULT="RESULT")
+
 OPERATION_STATE_TYPE = enum(
     STARTING="STARTING",
     PROCESSING="PROCESSING",
@@ -245,9 +247,9 @@ vnfd_model_dict = {
                 "local_storage_id1",
                 "local_storage_id2"
             ],
-            "volume_storages": [
+            "virtual_storages": [
                 {
-                    "volume_storage_id": "volume_storage1",
+                    "virtual_storage_id": "volume_storage1",
                     "location": "/usr/data",
                     "device": "/dev/hda1"
                 }
@@ -338,7 +340,7 @@ vnfd_model_dict = {
             "volume_storage_id": "volume_storage1",
             "description": "",
             "properties": {
-                "size": "100 GB",
+                "size": "\"100 GB\"",
                 "volume_id": "",
                 "volume_name": "volumeStorage1",
                 "custom_volume_type": "type1",
@@ -672,7 +674,7 @@ vnfdModel = {
                 },
                 "volume_name": "test",
                 "custom_volume_type": "test",
-                "size": "10 GB",
+                "size_of_storage": "\"10 GB\"",
             },
             "image_file": "test",
         },
@@ -730,7 +732,7 @@ vnfdModel = {
                 "virtual_network_interface_requirements": [
                     {
                         "network_interface_requirements": {
-                            "interfaceType": '{"schema-version": "0", "schema-location":"", "platform-id": "generic", "mandatory": false, "configuration-value": "SR-IOV"}'
+                            "interfaceType": '{"schemaVersion": "0", "schemaLocation":"", "platformId": "generic", "mandatory": false, "configurationValue": "SR-IOV"}'
                         },
                         "support_mandatory": False,
                         "name": "SRIOV_Port",
@@ -755,7 +757,7 @@ vnfdModel = {
                     "vduInfo": [
                         {
                             "vduName": "VDU_vbng_0",
-                            "flavorName": "flavor_1",
+                            "flavorId": "12345",
                             "directive": ""
                         }
                     ]
@@ -778,10 +780,11 @@ vnfdModel = {
                     },
                 },
             },
-            "virtual_storage": {
+            "virtual_storages": [{
+                "virtual_storage_id": "test",
                 "type_of_storage": "ephemeral",
                 "size_of_storage": "10 GB",
-            },
+            }],
             "type": "tosca.nodes.nfv.Vdu.Compute",
             "artifacts": [
                 {