Merges branch sol006 into master, allowing NBI to use, parse and validate SOL006...

[osm/NBI.git] / osm_nbi / tests / test_instance_topics.py

diff --git a/osm_nbi/tests/test_instance_topics.py b/osm_nbi/tests/test_instance_topics.py
index 9dc5cc1..bff7775 100644 (file)
--- a/osm_nbi/tests/test_instance_topics.py
+++ b/osm_nbi/tests/test_instance_topics.py
@@ -171,8 +171,10 @@ class TestNsrTopic(unittest.TestCase):
             "nsdId": self.nsd_id,
             "nsName": "name",
             "vimAccountId": self.vim_id,
             "nsdId": self.nsd_id,
             "nsName": "name",
             "vimAccountId": self.vim_id,

-            "additionalParamsForVnf": [{"member-vnf-index": "1", "additionalParams": {"touch_filename": "file"}},
-                                       {"member-vnf-index": "2", "additionalParams": {"touch_filename": "file"}}]
+            "additionalParamsForVnf": [
+                {"member-vnf-index": "hackfest_vnf1", "additionalParams": {"touch_filename": "file"}},
+                {"member-vnf-index": "hackfest_vnf2", "additionalParams": {"touch_filename": "file"}}
+            ]

         }
         rollback = []
         headers = {}
         }
         rollback = []
         headers = {}


@@ -210,8 +212,7 @@ class TestNsrTopic(unittest.TestCase):
             self.assertTrue(created_item["_admin"]["nsState"] == "NOT_INSTANTIATED",
                             "Database record must contain '_admin.nstate=NOT INSTANTIATE'")
 
             self.assertTrue(created_item["_admin"]["nsState"] == "NOT_INSTANTIATED",
                             "Database record must contain '_admin.nstate=NOT INSTANTIATE'")
 

-        self.assertEqual(len(created_vnfrs), len(self.nsd["constituent-vnfd"]),
-                         "created a mismatch number of vnfr at database")
+        self.assertEqual(len(created_vnfrs), 2, "created a mismatch number of vnfr at database")

         self.assertEqual(len(created_nsrs), 1, "Only one nsrs must be created at database")
         self.assertEqual(len(rollback), len(created_vnfrs) + 1, "rollback mismatch with created items at database")
 
         self.assertEqual(len(created_nsrs), 1, "Only one nsrs must be created at database")
         self.assertEqual(len(rollback), len(created_vnfrs) + 1, "rollback mismatch with created items at database")