Add test cases for catalog

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

diff --git a/catalog/packages/__init__.py b/catalog/packages/__init__.py
new file mode 100644 (file)
index 0000000..c7b6818
--- /dev/null
+++ b/catalog/packages/__init__.py
@@ -0,0 +1,13 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

diff --git a/catalog/packages/tests.py b/catalog/packages/tests.py
new file mode 100644 (file)
index 0000000..b1ba5ec
--- /dev/null
+++ b/catalog/packages/tests.py
@@ -0,0 +1,32 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+import json
+from django.test import Client
+from rest_framework import status
+
+
+class PackageTest(unittest.TestCase):
+    def setUp(self):
+        self.client = Client()
+
+    def tearDown(self):
+        pass
+
+    def test_package_get(self):
+
+        response = self.client.get("/api/nfvocatalog/v1/packages")
+        self.assertEqual(status.HTTP_200_OK, response.status_code, response.content)
+

diff --git a/catalog/packages/urls.py b/catalog/packages/urls.py
index 7f0b4e2..c13852c 100644 (file)
--- a/catalog/packages/urls.py
+++ b/catalog/packages/urls.py
@@ -16,7 +16,7 @@ from django.conf.urls import include, url
 from catalog.packages import views
 
 urlpatterns = [
-    url(r'^api/nfvocatalog/v1/packages/(?P<csarId>[a-zA-Z\-]+)$', views.package_get()),
+    url(r'^api/nfvocatalog/v1/packages$', views.package_get),
 ]
 
 

diff --git a/catalog/packages/views.py b/catalog/packages/views.py
index 760e537..3ad9ce8 100644 (file)
--- a/catalog/packages/views.py
+++ b/catalog/packages/views.py
@@ -13,17 +13,16 @@
 # limitations under the License.
 
 import logging
-import traceback
 from catalog.pub.utils.syscomm import fun_name
 from rest_framework.response import Response
 from rest_framework import status
+from rest_framework.decorators import api_view
 
 logger = logging.getLogger(__name__)
 
-
 @api_view(http_method_names=['GET'])
 def package_get(request, *args, **kwargs):
-    logger.info("Enter %s%s, method is %s", fun_name(), request.data, request.method)
+    logger.info("Enter method is %s", fun_name())
     ret, normal_status = None, None
 
     return Response(data=ret, status=status.HTTP_200_OK)

diff --git a/catalog/samples/tests.py b/catalog/samples/tests.py
index f98b46b..f54c372 100644 (file)
--- a/catalog/samples/tests.py
+++ b/catalog/samples/tests.py
@@ -26,9 +26,9 @@ class SampleViewTest(unittest.TestCase):
         pass
 
     def test_sample(self):
-        '''
+
         response = self.client.get("/samples/")
         self.assertEqual(status.HTTP_200_OK, response.status_code, response.content)
         resp_data = json.loads(response.content)
         self.assertEqual({"status": "active"}, resp_data)
-        '''
+