From: fengyuanxing <feng.yuanxing@zte.com.cn>
Date: Thu, 24 Aug 2017 06:30:09 +0000 (+0800)
Subject: Add ns package and nf package urls
X-Git-Tag: v1.0.0~95
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=64a83df6776b9118d8c7d4353d8cc46ef15d6b62;p=vfc%2Fnfvo%2Fcatalog.git

Add ns package and nf package urls

Change-Id: Ia7898fa2742e5a3c1db8af29d749eeb2bc7eda9c
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
---

diff --git a/catalog/packages/tests.py b/catalog/packages/tests.py
index b1ba5ecc..c336b89a 100644
--- a/catalog/packages/tests.py
+++ b/catalog/packages/tests.py
@@ -25,8 +25,11 @@ class PackageTest(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def test_package_get(self):
+    def test_nspackage_get(self):
 
-        response = self.client.get("/api/nfvocatalog/v1/packages")
+        response = self.client.get("/api/nfvocatalog/v1/nspackages")
         self.assertEqual(status.HTTP_200_OK, response.status_code, response.content)
 
+    def test_nfpackage_get(self):
+        response = self.client.get("/api/nfvocatalog/v1/nfpackages")
+        self.assertEqual(status.HTTP_200_OK, response.status_code, response.content)
\ No newline at end of file
diff --git a/catalog/packages/urls.py b/catalog/packages/urls.py
index c13852cd..a3cb1b98 100644
--- a/catalog/packages/urls.py
+++ b/catalog/packages/urls.py
@@ -16,7 +16,10 @@ from django.conf.urls import include, url
 from catalog.packages import views
 
 urlpatterns = [
-    url(r'^api/nfvocatalog/v1/packages$', views.package_get),
+    url(r'^api/nfvocatalog/v1/nspackages$', views.nspackage_get, name='nspackages_get'),
+    url(r'^api/nfvocatalog/v1/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.nspackage_get, name='nspackage_get'),
+    url(r'^api/nfvocatalog/v1/nfpackages$', views.nspackage_get, name='nfpackages_get'),
+    url(r'^api/nfvocatalog/v1/nfpackage/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.nfpackage_get, name='nfpackage_get'),
 ]
 
 
diff --git a/catalog/packages/views.py b/catalog/packages/views.py
index 3ad9ce8c..d9657788 100644
--- a/catalog/packages/views.py
+++ b/catalog/packages/views.py
@@ -21,7 +21,14 @@ from rest_framework.decorators import api_view
 logger = logging.getLogger(__name__)
 
 @api_view(http_method_names=['GET'])
-def package_get(request, *args, **kwargs):
+def nspackage_get(request, *args, **kwargs):
+    logger.info("Enter method is %s", fun_name())
+    ret, normal_status = None, None
+
+    return Response(data=ret, status=status.HTTP_200_OK)
+
+@api_view(http_method_names=['GET'])
+def nfpackage_get(request, *args, **kwargs):
     logger.info("Enter method is %s", fun_name())
     ret, normal_status = None, None