Modify adapter code to repair 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 9adb4ed..122eeeb 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": {
@@ -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",