Merge "Update instance_config.sh of vfc-nfvo-lcm"

diff --git a/lcm/ns/ns_get.py b/lcm/ns/ns_get.py
index 15f20e1..0bd3955 100644 (file)
--- a/lcm/ns/ns_get.py
+++ b/lcm/ns/ns_get.py
@@ -22,21 +22,20 @@ logger = logging.getLogger(__name__)
 
 
 class GetNSInfoService(object):
-    def __init__(self, ns_inst_id=None):
-        self.ns_inst_id = ns_inst_id
+    def __init__(self, nsfilter=None):
+        self.ns_filter=nsfilter
 
     def get_ns_info(self):
-        try:
-            if self.ns_inst_id:
-                return self.get_single_ns_info(self.ns_inst_id)
-            else:
-                return self.get_total_ns_info()
-        except:
-            logger.error(traceback.format_exc())
-            return None if self.ns_inst_id else []
+        if self.ns_filter:
+            if ("ns_inst_id" in self.ns_filter):
+                ns_inst_id = self.ns_filter["ns_inst_id"]
+                ns_inst_infos = NSInstModel.objects.filter(id=ns_inst_id)
+            if ("csarId" in self.ns_filter):
+                csar_id = self.ns_filter["csarId"]
+                ns_inst_infos = NSInstModel.objects.filter(nsd_id=csar_id)
+        else:
+            ns_inst_infos = NSInstModel.objects.all()
 
-    def get_total_ns_info(self):
-        ns_inst_infos = NSInstModel.objects.all()
         ns_info_list = []
         for info in ns_inst_infos:
             ret = self.get_single_ns_info(info.id)

diff --git a/lcm/ns/tests/test_ns_create.py b/lcm/ns/tests/test_ns_create.py
index 0f23056..a1b836e 100644 (file)
--- a/lcm/ns/tests/test_ns_create.py
+++ b/lcm/ns/tests/test_ns_create.py
@@ -1,4 +1,4 @@
-# Copyright 2016 ZTE Corporation.
+# Copyright 2017 ZTE Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/lcm/ns/tests/test_ns_get.py b/lcm/ns/tests/test_ns_get.py
new file mode 100644 (file)
index 0000000..9da1ab3
--- /dev/null
+++ b/lcm/ns/tests/test_ns_get.py
@@ -0,0 +1,37 @@
+# Copyright 2017 ZTE Corporation.\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License");\r
+# you may not use this file except in compliance with the License.\r
+# You may obtain a copy of the License at\r
+#\r
+#         http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+# See the License for the specific language governing permissions and\r
+# limitations under the License.\r
+import uuid\r
+\r
+from django.test import TestCase, Client\r
+from rest_framework import status\r
+\r
+from lcm.pub.database.models import NSInstModel\r
+\r
+\r
+class TestNsQuery(TestCase):\r
+    def setUp(self):\r
+        self.client = Client()\r
+        self.nsd_id = str(uuid.uuid4())\r
+        self.ns_package_id = str(uuid.uuid4())\r
+        NSInstModel(id=1, nsd_id=1, name='test01').save()\r
+        NSInstModel(id=2, nsd_id=1, name='test02').save()\r
+\r
+    def test_query_ns_by_csarId(self):\r
+        response = self.client.get("/api/nslcm/v1/ns?csarId=1")\r
+        self.failUnlessEqual(status.HTTP_200_OK, response.status_code)\r
+\r
+\r
+    def test_query_ns_by_nsinstance_id(self):\r
+        response = self.client.get("/api/nslcm/v1/ns/1")\r
+        self.failUnlessEqual(status.HTTP_200_OK, response.status_code)
\ No newline at end of file

diff --git a/lcm/ns/views.py b/lcm/ns/views.py
index 8fa4ba7..9a25027 100644 (file)
--- a/lcm/ns/views.py
+++ b/lcm/ns/views.py
@@ -38,7 +38,14 @@ logger = logging.getLogger(__name__)
 class CreateNSView(APIView):
     def get(self, request):
         logger.debug("CreateNSView::get")
-        ret = GetNSInfoService().get_ns_info()
+        filter=None
+        csarId = ignore_case_get(request.META, 'csarId')
+        if csarId:
+            filter ={
+            "csarId":csarId
+            }
+
+        ret = GetNSInfoService(filter).get_ns_info()
         logger.debug("CreateNSView::get::ret=%s", ret)
         return Response(data=ret, status=status.HTTP_200_OK)
 
@@ -96,7 +103,8 @@ class NSHealView(APIView):
 class NSDetailView(APIView):
     def get(self, request, ns_instance_id):
         logger.debug("Enter NSDetailView::get ns(%s)", ns_instance_id)
-        ret = GetNSInfoService(ns_instance_id).get_ns_info()
+        ns_filter ={"ns_inst_id":ns_instance_id}
+        ret = GetNSInfoService(ns_filter).get_ns_info()
         if not ret:
             return Response(status=status.HTTP_404_NOT_FOUND)
         logger.debug("Leave NSDetailView::get::ret=%s", ret)

diff --git a/lcm/pub/utils/toscaparser/vnfdmodel.py b/lcm/pub/utils/toscaparser/vnfdmodel.py
index 166690b..2deb87f 100644 (file)
--- a/lcm/pub/utils/toscaparser/vnfdmodel.py
+++ b/lcm/pub/utils/toscaparser/vnfdmodel.py
@@ -39,6 +39,7 @@ class EtsiVnfdInfoModel(EtsiNsdInfoModel):
         self.vdus = self._get_all_vdu(nodeTemplates)
         self.vls = self.get_all_vl(nodeTemplates)
         self.cps = self.get_all_cp(nodeTemplates)
+        self.plugins = self.get_all_plugin(nodeTemplates)
 
 
     def _get_all_services(self, nodeTemplates):
@@ -251,3 +252,20 @@ class EtsiVnfdInfoModel(EtsiNsdInfoModel):
                     cp['vls'] = vls
                 cps.append(cp)
         return cps
+
+    def get_all_plugin(self, node_templates):
+        plugins = []
+        for node in node_templates:
+            if self._isPlugin(node):
+                plugin = {}
+                plugin['plugin_id'] = node['name']
+                plugin['description'] = node['description']
+                plugin['properties'] = node['properties']
+                if 'interfaces' in node:
+                    plugin['interfaces'] = node['interfaces']
+
+                plugins.append(plugin)
+        return plugins
+
+    def _isPlugin(self, node):
+        return node['nodeType'].lower().find('.plugin.') >= 0 or node['nodeType'].lower().endswith('.plugin')

diff --git a/lcm/swagger/vfc.nslcm.swagger.json b/lcm/swagger/vfc.nslcm.swagger.json
index 528ec67..0a8fc09 100644 (file)
--- a/lcm/swagger/vfc.nslcm.swagger.json
+++ b/lcm/swagger/vfc.nslcm.swagger.json
@@ -56,13 +56,21 @@
         ],\r
         "summary": "ns get",\r
         "description": "ns get",\r
-        "operationId": "ns_get",\r
-        "parameters": [],\r
+        "operationId": "ns_instantces_get",\r
+        "parameters": [\r
+          {\r
+            "required": true,\r
+            "type": "string",\r
+            "description": "job response message id",\r
+            "name": "csarId",\r
+            "in": "query"\r
+          }\r
+        ],\r
         "responses": {\r
           "200": {\r
             "description": "successful operation",\r
             "schema": {\r
-              "$ref": "#/definitions/NsInfo"\r
+              "$ref": "#/definitions/NsInstancesInfo"\r
             }\r
           }\r
         }\r
@@ -225,6 +233,23 @@
       }\r
     },\r
     "/ns/{ns_instance_id}": {\r
+      "get": {\r
+        "tags": [\r
+          "ns"\r
+        ],\r
+        "summary": "ns get",\r
+        "description": "ns get",\r
+        "operationId": "ns_instance_get",\r
+        "parameters": [],\r
+        "responses": {\r
+          "200": {\r
+            "description": "successful operation",\r
+            "schema": {\r
+              "$ref": "#/definitions/NsInstanceInfo"\r
+            }\r
+          }\r
+        }\r
+      },      \r
       "delete": {\r
         "tags": [\r
           "ns"\r
@@ -411,8 +436,13 @@
         }\r
       }\r
     },\r
-   \r
-    "NsInfo": {\r
+    "NsInstancesInfo":{\r
+      "type": "array",\r
+      "items": {\r
+            "$ref": "#/definitions/NsInstanceInfo"\r
+      }\r
+    },\r
+    "NsInstanceInfo": {\r
       "type": "object",\r
       "properties": {\r
         "nsInstanceId": {\r