Update vfc-gvnfmadapter code and tests

Change-Id: I4fe4c9926c5b1a537fb7cffb69d2d9f38d1c0312
Issue-ID: VFC-442
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/gvnfmadapter/driver/interfaces/tests.py b/gvnfmadapter/driver/interfaces/tests.py
index 8f0c2ad..f6bda99 100644 (file)
--- a/gvnfmadapter/driver/interfaces/tests.py
+++ b/gvnfmadapter/driver/interfaces/tests.py
@@ -39,7 +39,7 @@ class InterfacesTest(TestCase):
             'version': 'V1.0',
             'vnfmId': 'b0797c9b-3da9-459c-b25c-3813e9d8fd70',
             'password': 'admin',
-            'type': 'ztevmanagerdriver',
+            'type': 'gvnfmdriver',
             'createTime': '2016-10-3111: 08: 39',
             'description': ''
         }
@@ -85,7 +85,7 @@ class InterfacesTest(TestCase):
         vnfm_info = {
             "vnfmId": "19ecbb3a-3242-4fa3-9926-8dfb7ddc29ee",
             "name": "g_vnfm",
-            "type": "vnfm",
+            "type": "gvnfmdriver",
             "vimId": "",
             "vendor": "ZTE",
             "version": "v1.0",
@@ -129,7 +129,7 @@ class InterfacesTest(TestCase):
         vnfm_info = {
             "vnfmId": "19ecbb3a-3242-4fa3-9926-8dfb7ddc29ee",
             "name": "g_vnfm",
-            "type": "vnfm",
+            "type": "gvnfmdriver",
             "vimId": "",
             "vendor": "ZTE",
             "version": "v1.0",
@@ -173,7 +173,7 @@ class InterfacesTest(TestCase):
             'version': 'V1.0',
             'vnfmId': 'b0797c9b-3da9-459c-b25c-3813e9d8fd70',
             'password': 'admin',
-            'type': 'ztevmanagerdriver',
+            'type': 'gvnfmdriver',
             'createTime': '2016-10-3111: 08: 39',
             'description': ''
         }
@@ -238,7 +238,7 @@ class InterfacesTest(TestCase):
             "vimid": "12345678",
             "exvimidlist ": "exvimid",
             "tenant": " tenant1",
-            "vnfistanceid": "1234",
+            "vnfinstanceid": "1234",
             "operationright": "0",
             "vmlist": [
                 {

diff --git a/gvnfmadapter/driver/interfaces/views.py b/gvnfmadapter/driver/interfaces/views.py
index e7d7f20..267998b 100644 (file)
--- a/gvnfmadapter/driver/interfaces/views.py
+++ b/gvnfmadapter/driver/interfaces/views.py
@@ -287,7 +287,9 @@ def ignorcase_get(args, key):
 
 
 def get_vnfminfo_from_nslcm(vnfm_id):
+    logger.debug("[get_vnfminfo_from_nslcm] vnfm_id=[%s]", vnfm_id)
     ret = req_by_msb("api/aai-esr-server/v1/vnfms/%s" % vnfm_id, "GET")
+    logger.debug("[get_vnfminfo_from_nslcm] response=%s", ret)
     if ret[0] != 0:
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
         raise GvnfmDriverException("Failed to query vnfm(%s) from nslcm." % vnfm_id)