X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fconst.py;h=bf4343ad05f7557a6c9d18dcaa73d438189bdb8c;hb=810981f10c7730bf5c6c39fd4ed33c1f54242067;hp=f368271e792debaae16eb0681496644ec84ace50;hpb=b51f79348b419a755dd08f758c45ed56c2ea0a10;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/const.py b/lcm/lcm/nf/vnfs/const.py
index f368271e..bf4343ad 100644
--- a/lcm/lcm/nf/vnfs/const.py
+++ b/lcm/lcm/nf/vnfs/const.py
@@ -18,48 +18,49 @@ VNF_STATUS = enum(NULL='null', INSTANTIATING="instantiating", INACTIVE='inactive
                   FAILED="failed", TERMINATING="terminating", SCALING="scaling", OPERATING="operating",
                   UPDATING="updating", HEALING="healing")
 
+# inst_req_data
 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": "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',
@@ -71,9 +72,27 @@ inst_req_data = {
         }
     ],
     "localizationLanguage": "en_US",
-    "additionalParams": {}
+    "additionalParams": {
+        "inputs": {
+            "key1": "test1",
+            "key2": "test2"
+        },
+        "extVirtualLinks": [
+            {
+                "vlInstanceId": '55',
+                "resourceId": '55_network',
+                "resourceSubnetId": '55_subnet',
+                "cpdId": 'cpId1',
+                "vim": {
+                    "vimid": '55_vimid'
+                }
+            }
+        ]
+    }
 }
 
+
+# vnfd_rawdata
 vnfd_rawdata = {
     "rawData": {
         "instance": {
@@ -341,7 +360,7 @@ vnfd_rawdata = {
     }
 }
 
-
+# vnfd_model_dict
 vnfd_model_dict = {
     'metadata': {
         'vendor': u'zte',
@@ -419,7 +438,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",
@@ -651,7 +670,8 @@ vnfd_model_dict = {
     ],
 }
 
-c1_data_get_tenant_id = {  # get_tenant_id
+# get_tenant_id
+c1_data_get_tenant_id = {
     "tenants": [
         {
             "id": "1",
@@ -659,6 +679,8 @@ c1_data_get_tenant_id = {  # get_tenant_id
         }
     ]
 }
+
+# create_volume
 c2_data_create_volume = {
     "id": "4bd3e9eb-cd8b-456a-8589-910836a0ab31",
     "name": "volume1",
@@ -673,7 +695,9 @@ c2_data_create_volume = {
     "type": None,
     "size": 40
 }
-c3_data_get_volume = {  # get_volume
+
+# get_volume
+c3_data_get_volume = {
     "status": "available",
     "name": "wangsong",
     "attachments": [
@@ -690,7 +714,9 @@ c3_data_get_volume = {  # get_volume
     "id": "4bd3e9eb-cd8b-456a-8589-910836a0ab31",
     "size": 40
 }
-c4_data_create_network = {  # create_network
+
+# create_network
+c4_data_create_network = {
     "returnCode": 0,
     "vimId": "11111",
     "vimName": "11111",
@@ -706,6 +732,8 @@ c4_data_create_network = {  # create_network
     "physicalNetwork": "ctrl",
     "routerExternal": False
 }
+
+# create_subnet
 c5_data_create_subnet = {
     "returnCode": 0,
     "vimId": "11111",
@@ -729,6 +757,8 @@ c5_data_create_subnet = {
     ],
     "hostRoutes": []
 }
+
+# create_ports
 c6_data_create_port = {
     "returnCode": 0,
     "vimId": "11111",
@@ -746,7 +776,9 @@ c6_data_create_port = {
     "vnicType": "normal",
     "securityGroups": ""
 }
-c7_data_create_flavor ={
+
+# create_flavor
+c7_data_create_flavor = {
     "returnCode": 0,
     "vimId": "11111",
     "vimName": "11111",
@@ -762,10 +794,11 @@ c7_data_create_flavor ={
     "extraSpecs": "testtt"
 }
 
+# list_image
 c8_data_list_image = {
     "vimid": "",
     "vimname": "",
-    "imageList": [
+    "images": [
         {
             "status": "active",
             "id": "5e2757c1-f846-4727-915c-9a872553ed75",
@@ -774,6 +807,8 @@ c8_data_list_image = {
         }
     ]
 }
+
+# create_vm
 c9_data_create_vm = {
     "returnCode": 1,
     "id": "3c9eebdbbfd345658269340b9ea6fb73",
@@ -791,6 +826,8 @@ c9_data_create_vm = {
     "serverGroup": "fdvfdv",
     "status": "ACTIVE"
 }
+
+# get_vm
 c10_data_get_vm = {
     "returnCode": 1,
     "id": "3c9eebdbbfd345658269340b9ea6fb73",