enhace the get NS interfaces

NS get retrun vnfInfo and change list to dict

Change-Id: I41cb3b9baf233f08f011378326533b11ad211b11
Issue-ID: VFC-1158
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>

diff --git a/lcm/ns/biz/ns_get.py b/lcm/ns/biz/ns_get.py
index 31d2686..2e572a3 100644 (file)
--- a/lcm/ns/biz/ns_get.py
+++ b/lcm/ns/biz/ns_get.py
@@ -41,7 +41,7 @@ class GetNSInfoService(object):
             'description': ns_inst.description,
             'nsdId': ns_inst.nsd_id,
             'nsdInvariantId': ns_inst.nsd_invariant_id,
-            'vnfInfoId': self.get_vnf_infos(ns_inst.id),
+            'vnfInfo': self.get_vnf_infos(ns_inst.id),
             'vlInfo': self.get_vl_infos(ns_inst.id),
             'vnffgInfo': self.get_vnffg_infos(ns_inst.id, ns_inst.nsd_model),
             'nsState': ns_inst.status}

diff --git a/lcm/ns/tests/test_ns_get.py b/lcm/ns/tests/test_ns_get.py
index 32e5d1f..cd4a94a 100644 (file)
--- a/lcm/ns/tests/test_ns_get.py
+++ b/lcm/ns/tests/test_ns_get.py
@@ -27,7 +27,6 @@ class TestNsQuery(TestCase):
         response = self.client.get("/api/nslcm/v1/ns/1")\r
         self.failUnlessEqual(status.HTTP_200_OK, response.status_code)\r
         self.assertIsNotNone(response.data)\r
-        self.assertEqual(1, len(response.data))\r
 \r
     def test_query_all_nsinstance(self):\r
         response = self.client.get("/api/nslcm/v1/ns")\r

diff --git a/lcm/ns/views/get_del_ns_view.py b/lcm/ns/views/get_del_ns_view.py
index 6ea97da..02cfdc9 100644 (file)
--- a/lcm/ns/views/get_del_ns_view.py
+++ b/lcm/ns/views/get_del_ns_view.py
@@ -44,7 +44,7 @@ class NSDetailView(APIView):
             if not ret:
                 return Response(status=status.HTTP_404_NOT_FOUND)
             logger.debug("Leave NSDetailView::get::ret=%s", ret)
-            resp_serializer = QueryNsRespSerializer(data=ret, many=True)
+            resp_serializer = QueryNsRespSerializer(data=ret[0])
             if not resp_serializer.is_valid():
                 raise NSLCMException(resp_serializer.errors)
             return Response(data=resp_serializer.data, status=status.HTTP_200_OK)