Update vnf instaniation code of gvnfm vnflcm

[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 a3a2f5f..f368271 100644 (file)
--- a/lcm/lcm/nf/vnfs/const.py
+++ b/lcm/lcm/nf/vnfs/const.py
@@ -22,43 +22,52 @@ 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",
+            "vlInstanceId": '55',
+            "resourceId": '55_network',
+            "resourceSubnetId": '55_subnet',
+            "cpdId": 'cpId1',
             "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
-                }
-            ]
+                "vimid": '55_vimid'
+            }
         }
     ],
     "localizationLanguage": "en_US",