X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Ftests%2Ftest_vnf_pkg_subscription.py;h=080a7c4cb85b4d785dabf13ac38c50fef22acc07;hb=011186aa2d7cb73592249f0ff7f472e75b9803fa;hp=a8fd5d55b3a5d88c3c9b991a4b77540e53be6d3d;hpb=f173f592ed958f55d992c109553760e3fb12628a;p=modeling%2Fetsicatalog.git

diff --git a/catalog/packages/tests/test_vnf_pkg_subscription.py b/catalog/packages/tests/test_vnf_pkg_subscription.py
index a8fd5d5..080a7c4 100644
--- a/catalog/packages/tests/test_vnf_pkg_subscription.py
+++ b/catalog/packages/tests/test_vnf_pkg_subscription.py
@@ -27,11 +27,12 @@ from catalog.packages import const
 from catalog.packages.biz.notificationsutil import PkgNotifications
 from catalog.packages.biz.vnf_pkg_subscription import QuerySubscription, TerminateSubscription
 from catalog.pub.config import config as pub_config
-from catalog.pub.config.config import CATALOG_ROOT_PATH
+from catalog.pub.config.config import CATALOG_ROOT_PATH, MSB_SERVICE_IP, MSB_SERVICE_PORT
 from catalog.pub.database.models import VnfPkgSubscriptionModel, VnfPackageModel
 from catalog.pub.exceptions import SubscriptionDoesNotExistsException
+from .const import vnf_subscription_data
 from catalog.pub.utils import toscaparser
-from .const import vnf_subscription_data, vnfd_data
+from catalog.packages.tests.const import vnfd_data
 
 
 class TestNfPackageSubscription(TestCase):
@@ -81,16 +82,46 @@ class TestNfPackageSubscription(TestCase):
             response.data["callbackUri"]
         )
         self.assertEqual(temp_uuid, response.data["id"])
-        temp_uuid = "00442b18-a5c7-11e8-998c-bf1755941f12"
+        temp2_uuid = "00442b18-a5c7-11e8-998c-bf1755941f12"
         mock_requests.return_value.status_code = 204
         mock_requests.get.status_code = 204
-        mock_uuid4.return_value = temp_uuid
+        mock_uuid4.return_value = temp2_uuid
         response = self.client.post(
             "/api/vnfpkgm/v1/subscriptions",
             data=self.vnf_subscription_data,
             format='json'
         )
         self.assertEqual(303, response.status_code)
+        redirect_addr = "https://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT,
+                                              os.path.join(const.VNFPKG_SUBSCRIPTION_ROOT_URI, temp_uuid))
+        self.assertEqual(redirect_addr, response["Location"])
+
+    @mock.patch("requests.get")
+    def test_callbackuri_same_subscriptions(self, mock_requests):
+        mock_requests.return_value.status_code = 204
+        mock_requests.get.status_code = 204
+        response = self.client.post(
+            "/api/vnfpkgm/v1/subscriptions",
+            data=self.vnf_subscription_data,
+            format='json'
+        )
+        self.assertEqual(201, response.status_code)
+        self.assertEqual(
+            self.vnf_subscription_data["callbackUri"],
+            response.data["callbackUri"]
+        )
+        newsubs = self.vnf_subscription_data
+        newsubs["filter"]["vnfdId"] = ["ssss"]
+        response = self.client.post(
+            "/api/vnfpkgm/v1/subscriptions",
+            data=self.vnf_subscription_data,
+            format='json'
+        )
+        self.assertEqual(201, response.status_code)
+        self.assertEqual(
+            newsubs["callbackUri"],
+            response.data["callbackUri"]
+        )
 
     @mock.patch("requests.get")
     @mock.patch.object(uuid, 'uuid4')
@@ -149,20 +180,16 @@ class TestNfPackageSubscription(TestCase):
         self.assertEqual(temp_uuid, response.data["id"])
 
     @mock.patch("requests.get")
-    @mock.patch.object(uuid, 'uuid4')
-    def test_get_subscription_with_id_not_exists(self, mock_uuid4, mock_requests):
-        temp_uuid = "99442b18-a5c7-11e8-998c-bf1755941f13"
-        dummy_uuid = str(uuid.uuid4())
+    def test_get_subscription_with_id_not_exists(self, mock_requests):
         mock_requests.return_value.status_code = 204
         mock_requests.get.status_code = 204
-        mock_uuid4.return_value = temp_uuid
         self.client.post(
             "/api/vnfpkgm/v1/subscriptions",
             data=self.vnf_subscription_data,
             format='json'
         )
         response = self.client.get(
-            "/api/vnfpkgm/v1/subscriptions/%s" % dummy_uuid,
+            "/api/vnfpkgm/v1/subscriptions/111",
             format='json'
         )
         self.assertEqual(404, response.status_code)
@@ -187,9 +214,7 @@ class TestNfPackageSubscription(TestCase):
         response = self.client.delete("/api/vnfpkgm/v1/subscriptions/%s" % temp_uuid)
         self.assertEqual(204, response.status_code)
 
-    @mock.patch("requests.get")
-    @mock.patch.object(uuid, 'uuid4')
-    def test_delete_subscription_with_id_not_exists(self, mock_uuid4, mock_requests):
+    def test_delete_subscription_with_id_not_exists(self):
         dummy_uuid = str(uuid.uuid4())
         response = self.client.delete("/api/vnfpkgm/v1/subscriptions/%s" % dummy_uuid)
         self.assertEqual(404, response.status_code)
@@ -249,7 +274,11 @@ class TestNfPackageSubscription(TestCase):
             }
         }
         mock_requests_post.assert_called_with(vnf_subscription_data["callbackUri"], data=expect_notification,
-                                              headers={'Connection': 'close'}, auth=HTTPBasicAuth("admin", "pwd1234"))
+                                              headers={'Connection': 'close',
+                                                       'content-type': 'application/json',
+                                                       'accept': 'application/json'},
+                                              auth=HTTPBasicAuth("admin", "pwd1234"),
+                                              verify=False)
 
     def test_service_query_single_subscription_not_found(self):
         try:
@@ -320,4 +349,7 @@ class NotificationTest(TestCase):
             }
         }
         mock_requests_post.assert_called_with(expect_callbackuri, data=expect_notification,
-                                              headers={'Connection': 'close'})
+                                              headers={'Connection': 'close',
+                                                       'content-type': 'application/json',
+                                                       'accept': 'application/json'},
+                                              verify=False)