X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_pla%2Ftest%2Ftest_nsPlacementDataFactory.py;h=fe3c8dae6c2504c41258edfe8aec89d27962b4df;hb=refs%2Ftags%2Fv9.1.0;hp=73cbac45614dde4257332a1ed9fbbf3853ccfac3;hpb=31181aa29c6c0489b1629877e25fdafb62e3f4e2;p=osm%2FPLA.git

diff --git a/osm_pla/test/test_nsPlacementDataFactory.py b/osm_pla/test/test_nsPlacementDataFactory.py
index 73cbac4..fe3c8da 100644
--- a/osm_pla/test/test_nsPlacementDataFactory.py
+++ b/osm_pla/test/test_nsPlacementDataFactory.py
@@ -367,7 +367,7 @@ class TestNsPlacementDataFactory(TestCase):
                              {'cp_refs': ['two', 'three'], 'latency': 120}]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest2.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -406,7 +406,7 @@ class TestNsPlacementDataFactory(TestCase):
                              {'cp_refs': ['two', 'three'], 'latency': 90, 'jitter': 30}]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest_no_vld_constraints.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -425,7 +425,7 @@ class TestNsPlacementDataFactory(TestCase):
                              {'cp_refs': ['two', 'three'], 'latency': 90, 'jitter': 30}]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest3.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -444,7 +444,7 @@ class TestNsPlacementDataFactory(TestCase):
                              {'cp_refs': ['two', 'three'], 'latency': 121, 'jitter': 22}]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest3.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -469,7 +469,7 @@ class TestNsPlacementDataFactory(TestCase):
                              {'cp_refs': ['two', 'three']}]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest_no_vld_constraints.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -488,7 +488,7 @@ class TestNsPlacementDataFactory(TestCase):
                              {'cp_refs': ['two', 'three'], 'latency': 141, 'jitter': 42}]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest_no_vld_constraints.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -513,7 +513,7 @@ class TestNsPlacementDataFactory(TestCase):
                              {'cp_refs': ['two', 'three'], 'latency': 151}]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest_no_vld_constraints.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -538,7 +538,7 @@ class TestNsPlacementDataFactory(TestCase):
                              {'cp_refs': ['two', 'three']}]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest_no_vld_constraints.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -560,7 +560,7 @@ class TestNsPlacementDataFactory(TestCase):
                              {'cp_refs': ['2', '3'], 'latency': 20, 'jitter': 10}, ]
 
         nsd = self._get_ut_nsd_from_file('test_five_nsd.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -573,7 +573,7 @@ class TestNsPlacementDataFactory(TestCase):
         vld_desc_expected = []
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest4.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -585,7 +585,7 @@ class TestNsPlacementDataFactory(TestCase):
     def test__produce_vld_desc_slice_nsd(self):
         vld_desc_expected = []
         nsd = self._get_ut_nsd_from_file('slice_hackfest_middle_nsd.yaml')
-        nsd = nsd['nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -603,7 +603,7 @@ class TestNsPlacementDataFactory(TestCase):
                              {'cp_refs': ['two', 'three'], 'latency': 90, 'jitter': 30}]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest3.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -621,7 +621,7 @@ class TestNsPlacementDataFactory(TestCase):
         - fault case scenarios with non-existing vims, non-existing vnfds
         """
         nsd = self._get_ut_nsd_from_file('nsd_unittest3.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -642,7 +642,7 @@ class TestNsPlacementDataFactory(TestCase):
 
     def test__produce_ns_desc_with_more_vims(self):
         nsd = self._get_ut_nsd_from_file('nsd_unittest1.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(self.vim_accounts_more_vims),
                                        self._produce_ut_vnf_test_price_list('vnf_price_list_more_vims.yaml'),
                                        nsd=nsd,
@@ -652,7 +652,7 @@ class TestNsPlacementDataFactory(TestCase):
         ns_desc = nspdf._produce_ns_desc()
         # check that all expected member-vnf-index are present
         vnfs = [e['vnf_id'] for e in ns_desc]
-        self.assertEqual(Counter([1, 3, 2]), Counter(vnfs), 'vnf_id invalid')
+        self.assertEqual(Counter({'1': 1, '2': 1, '3': 1}), Counter(vnfs), 'vnf_id invalid')
 
         expected_keys = ['vnf_id', 'vnf_price_per_vim']
         for e in ns_desc:
@@ -663,7 +663,7 @@ class TestNsPlacementDataFactory(TestCase):
 
     def test__produce_ns_desc_with_fewer_vims(self):
         nsd = self._get_ut_nsd_from_file('nsd_unittest1.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(self.vim_accounts_fewer_vims),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -673,7 +673,7 @@ class TestNsPlacementDataFactory(TestCase):
         ns_desc = nspdf._produce_ns_desc()
         # check that all expected member-vnf-index are present
         vnfs = [e['vnf_id'] for e in ns_desc]
-        self.assertEqual(Counter([1, 3, 2]), Counter(vnfs), 'vnf_id invalid')
+        self.assertEqual(Counter({'1': 1, '2': 1, '3': 1}), Counter(vnfs), 'vnf_id invalid')
 
         expected_keys = ['vnf_id', 'vnf_price_per_vim']
         for e in ns_desc:
@@ -684,7 +684,7 @@ class TestNsPlacementDataFactory(TestCase):
 
     def test__produce_ns_desc_w_pinning(self):
         nsd = self._get_ut_nsd_from_file('nsd_unittest3.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         pinning = [{'member-vnf-index': 'two', 'vimAccountId': '331ffdec-44a8-4707-94a1-af7a292d9735'}]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
@@ -720,7 +720,7 @@ class TestNsPlacementDataFactory(TestCase):
                                                                'vimeda92f47-29b9-4007-9709-c1833dbfbe31']]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest3.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,
@@ -755,7 +755,7 @@ class TestNsPlacementDataFactory(TestCase):
                                                                'vimeda92f47-29b9-4007-9709-c1833dbfbe31']]
 
         nsd = self._get_ut_nsd_from_file('nsd_unittest3.yaml')
-        nsd = nsd['nsd:nsd-catalog']['nsd'][0]
+        nsd = nsd['nsd']['nsd'][0]
         nspdf = NsPlacementDataFactory(self._produce_ut_vim_accounts_info(TestNsPlacementDataFactory.vim_accounts),
                                        self._produce_ut_vnf_price_list(),
                                        nsd=nsd,