X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Ftests%2Ftest_nsdm_subscription.py;h=b992b2d974a36ea366defbc156863dd4272f97d4;hb=ffe0ada0cab8d728442466de27aeb3a792d98531;hp=4e14ca16a86d638f1075554cf14d5e5a59235fc0;hpb=ac2f763bcf8ed41d9f2867a33b29860318854502;p=modeling%2Fetsicatalog.git

diff --git a/catalog/packages/tests/test_nsdm_subscription.py b/catalog/packages/tests/test_nsdm_subscription.py
index 4e14ca1..b992b2d 100644
--- a/catalog/packages/tests/test_nsdm_subscription.py
+++ b/catalog/packages/tests/test_nsdm_subscription.py
@@ -625,22 +625,22 @@ class TestNsdmSubscription(TestCase):
             'timeStamp': "nowtime()",
             'nsdInfoId': "d0ea5ec3-0b98-438a-9bea-488230cff174",
             'nsdId': "b632bddc-bccd-4180-bd8d-4e8a9578eff7",
-            "subscriptionId": "1111",
             '_links': {
-                'subscription': {
-                    'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
-                                                   pub_config.MSB_SERVICE_PORT,
-                                                   const.NSDM_SUBSCRIPTION_ROOT_URI,
-                                                   "1111")},
                 'nsdInfo': {
                     'href': 'http://%s:%s/%s/ns_descriptors/%s' % (pub_config.MSB_SERVICE_IP,
                                                                    pub_config.MSB_SERVICE_PORT,
                                                                    const.NSD_URL_PREFIX,
-                                                                   "d0ea5ec3-0b98-438a-9bea-488230cff174")
-                }
-            }
+                                                                   "d0ea5ec3-0b98-438a-9bea-488230cff174")},
+                'subscription': {
+                    'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
+                                                   pub_config.MSB_SERVICE_PORT,
+                                                   const.NSDM_SUBSCRIPTION_ROOT_URI,
+                                                   "1111")}
+
+            },
+            "subscriptionId": "1111"
         }
-        mock_requests_post.assert_called_with(expect_callbackuri, data=expect_notification,
+        mock_requests_post.assert_called_with(expect_callbackuri, data=json.dumps(expect_notification),
                                               auth=HTTPBasicAuth("username", "password"),
                                               headers={'Connection': 'close',
                                                        'content-type': 'application/json',
@@ -680,24 +680,24 @@ class NotificationTest(TestCase):
             'timeStamp': "nowtime()",
             'nsdInfoId': "nsdinfoid1",
             'nsdId': "nsdid1",
-            'onboardingFailureDetails': "NSD(nsdid1) already exists.",
-            "subscriptionId": "1",
             '_links': {
-                'subscription': {
-                    'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
-                                                   pub_config.MSB_SERVICE_PORT,
-                                                   const.NSDM_SUBSCRIPTION_ROOT_URI,
-                                                   "1")},
                 'nsdInfo': {
                     'href': 'http://%s:%s/%s/ns_descriptors/%s' % (pub_config.MSB_SERVICE_IP,
                                                                    pub_config.MSB_SERVICE_PORT,
                                                                    const.NSD_URL_PREFIX,
                                                                    "nsdinfoid1")
-                }
-            }
+                },
+                'subscription': {
+                    'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
+                                                   pub_config.MSB_SERVICE_PORT,
+                                                   const.NSDM_SUBSCRIPTION_ROOT_URI,
+                                                   "1")}
+            },
+            'onboardingFailureDetails': "NSD(nsdid1) already exists.",
+            "subscriptionId": "1"
         }
         mock_requests_post.assert_called_with(expect_callbackuri,
-                                              data=expect_notification,
+                                              data=json.dumps(expect_notification),
                                               headers={'Connection': 'close',
                                                        'content-type': 'application/json',
                                                        'accept': 'application/json'},
@@ -722,22 +722,22 @@ class NotificationTest(TestCase):
             'timeStamp': "nowtime()",
             'pnfdInfoIds': "pnfdInfoIds1",
             'pnfdId': "pnfdId1",
-            "subscriptionId": "1",
             '_links': {
-                'subscription': {
-                    'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
-                                                   pub_config.MSB_SERVICE_PORT,
-                                                   const.NSDM_SUBSCRIPTION_ROOT_URI,
-                                                   "1")},
                 'pnfdInfo': {
                     'href': 'http://%s:%s/%s/pnf_descriptors/%s' % (pub_config.MSB_SERVICE_IP,
                                                                     pub_config.MSB_SERVICE_PORT,
                                                                     const.NSD_URL_PREFIX,
                                                                     "pnfdInfoIds1")
-                }
-            }
+                },
+                'subscription': {
+                    'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
+                                                   pub_config.MSB_SERVICE_PORT,
+                                                   const.NSDM_SUBSCRIPTION_ROOT_URI,
+                                                   "1")},
+            },
+            "subscriptionId": "1",
         }
-        mock_requests_post.assert_called_with(expect_callbackuri, data=expect_notification,
+        mock_requests_post.assert_called_with(expect_callbackuri, data=json.dumps(expect_notification),
                                               headers={'Connection': 'close',
                                                        'content-type': 'application/json',
                                                        'accept': 'application/json'},