Fixed some gvnfm vnflcm adapter bugs

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

diff --git a/lcm/lcm/nf/vnfs/const.py b/lcm/lcm/nf/vnfs/const.py
index 66dae1e..3967eae 100644 (file)
--- a/lcm/lcm/nf/vnfs/const.py
+++ b/lcm/lcm/nf/vnfs/const.py
@@ -18,6 +18,71 @@ VNF_STATUS = enum(NULL='null', INSTANTIATING="instantiating", INACTIVE='inactive
                   FAILED="failed", TERMINATING="terminating", SCALING="scaling", OPERATING="operating",
                   UPDATING="updating", HEALING="healing")
 
+inst_req_data = {
+    "flavourId": "flavour_1",
+    "instantiationLevelId": "instantiationLevel_1",
+    "extVirtualLinks": [
+        # {
+        #     "vlInstanceId": "1",
+        #     "vim": {
+        #         "vimInfoId": "1",
+        #         "vimId": "1",
+        #         "interfaceInfo": {
+        #             "vimType": "vim",
+        #             "apiVersion": "v2",
+        #             "protocolType": "http"
+        #         },
+        #         "accessInfo": {
+        #             "tenant": "tenant_vCPE",
+        #             "username": "vCPE",
+        #             "password": "vCPE_321"
+        #         },
+        #         "interfaceEndpoint": "http://10.43.21.105:80/"
+        #     },
+        #     "resourceId": "1246",
+        #     "extCps": [
+        #         {
+        #             "cpdId": "11",
+        #             "addresses": [
+        #                 {
+        #                     "addressType": "MAC",
+        #                     "l2AddressData": "00:f3:43:20:a2:a3"
+        #                 },
+        #                 {
+        #                     "addressType": "IP",
+        #                     "l3AddressData": {
+        #                         "iPAddressType": "IPv4",
+        #                         "iPAddress": "192.168.104.2"
+        #                     }
+        #                 }
+        #             ],
+        #             "numDynamicAddresses": 0
+        #         }
+        #     ]
+        # },
+        {
+            "vlInstanceId": '55',
+            "resourceId": '55_network',
+            "resourceSubnetId": '55_subnet',
+            "cpdId": 'cpId1',
+            "vim": {
+                "vimid": '55_vimid'
+            }
+        }
+    ],
+    "localizationLanguage": "en_US",
+    "additionalParams": {"inputs": {"key1":"test1","key2":"test2"},
+                         "extVirtualLinks": [{
+                            "vlInstanceId": '55',
+                            "resourceId": '55_network',
+                            "resourceSubnetId": '55_subnet',
+                            "cpdId": 'cpId1',
+                            "vim": {
+                                "vimid": '55_vimid'
+                            }
+                        }]}
+}
+
 vnfd_rawdata = {
     "rawData": {
         "instance": {
@@ -345,14 +410,14 @@ vnfd_model_dict = {
                 "inner_hugepage_size": "2048",
                 "action": "add"
             },
-            "image_file": "omm_image",
+            "image_file": u'sss',
             "local_storages": [
                 "local_storage_id1",
                 "local_storage_id2"
             ],
             "volume_storages": [
                 {
-                    "volume_storage_id": "volume_storage_id1",
+                    "volume_storage_id": "volume_storage1",
                     "location": "/usr/data",
                     "device": "/dev/hda1"
                 }
@@ -363,7 +428,7 @@ vnfd_model_dict = {
             ],
             "nfv_compute": {
                 "num_cpus": 4,
-                "mem_size": "1024MB",
+                "mem_size": "1 GB",
                 "cpu_frequency": "1GHz",
                 "flavor_extra_specs": {
                     "hw: cpu_policy": "shared",
@@ -386,11 +451,9 @@ vnfd_model_dict = {
             },
             "vls": [
                 "vlId1",
-                "vlIdN"
             ],
             "cps": [
                 "cpId1",
-                "cpIdN"
             ],
             "scalable": {
                 "min_instances": 1,
@@ -555,7 +618,7 @@ vnfd_model_dict = {
     ],
     'cps': [
         {
-            "cp_id": "cpId",
+            "cp_id": "cpId1",
             "description": "",
             "properties": {
                 "name": "",
@@ -692,7 +755,7 @@ c6_data_create_port = {
     "vnicType": "normal",
     "securityGroups": ""
 }
-c1_data_create_flavor ={
+c7_data_create_flavor ={
     "returnCode": 0,
     "vimId": "11111",
     "vimName": "11111",
@@ -706,4 +769,43 @@ c1_data_create_flavor ={
     "swap": 20,
     "isPublic": True,
     "extraSpecs": "testtt"
-}
\ No newline at end of file
+}
+
+c8_data_list_image = {
+    "vimid": "",
+    "vimname": "",
+    "images": [
+        {
+            "status": "active",
+            "id": "5e2757c1-f846-4727-915c-9a872553ed75",
+            "size": 862016,
+            "name": u'sss.vmdk'
+        }
+    ]
+}
+c9_data_create_vm = {
+    "returnCode": 1,
+    "id": "3c9eebdbbfd345658269340b9ea6fb73",
+    "name": "vm1",
+    "vimId": "11111",
+    "vimName": "11111",
+    "tenantId": "tenant1",
+    "boot": "boot_1",
+    "nicArray": "dfdf",
+    "volumeArray": "dfdf",
+    "availabilityZone": "fdvfdv",
+    "flavorId": "fdvfdv",
+    "metadata": "fdvfdv",
+    "securityGroups": "fdvfdv",
+    "serverGroup": "fdvfdv",
+    "status": "ACTIVE"
+}
+c10_data_get_vm = {
+    "returnCode": 1,
+    "id": "3c9eebdbbfd345658269340b9ea6fb73",
+    "name": "vm1",
+    "vimId": "11111",
+    "vimName": "11111",
+    "tenantId": "tenant1",
+    "status": "ACTIVE"
+}