Modify code and test case of vnflcm and adaptor

[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 89c5d4b..d73ec3d 100644 (file)
--- a/lcm/lcm/nf/vnfs/const.py
+++ b/lcm/lcm/nf/vnfs/const.py
@@ -404,7 +404,7 @@ vnfd_model_dict = {
             'description': u'ppvm'
         }
     ],
-    'volumn_storages': [
+    'volume_storages': [
         {
             "volume_storage_id": "volume_storage1",
             "description": "",
@@ -416,8 +416,8 @@ vnfd_model_dict = {
                 "disk_type": "data",
                 "delete_on_termination_vm": True,
                 "location_info": {
-                    "vimid": "vimid",
-                    "tenant": "tenantname",
+                    "vimid": "vimid_1",
+                    "tenant": "tenantname_1",
                     "availability_zone": "zone1"
                 },
                 "is_predefined": False,
@@ -501,8 +501,8 @@ vnfd_model_dict = {
                     }
                 ],
                 "location_info": {
-                    "vimid": "vimid",
-                    "tenant": "tenantname"
+                    "vimid": "vimid_1",
+                    "tenant": "tenantname_1"
                 },
                 "cloud_type": "IaaS"
             },
@@ -545,8 +545,8 @@ vnfd_model_dict = {
                 "is_virtual": False,
                 "function": "control"
             },
-            "vl_id": "vlid1",
-            "vdu_id": "vdu_id1"
+            "vl_id": "vldId1",
+            "vdu_id": u'vdu_omm.001'
         }
     ],
     'local_storages': [