Re-open:Drop service-name from ODU connection name

[transportpce.git] / tests / transportpce_tests / 2.2.1 / test11_otn_end2end.py

diff --git a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
index 02398aa8306da675152b32135d310cadece54314..b6181acf60a4bab1f4ba366cb910a0b27439c1f7 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
@@ -609,9 +609,9 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_32_check_interface_ODU2E_CLIENT_spdra(self):
         response = test_utils.check_node_attribute_request(
-            'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e')
+            'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e:service1-10GE')
         self.assertEqual(response['status_code'], requests.codes.ok)
-        input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e',
+        input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e:service1-10GE',
                         'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP1-SFP4',
                         'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G',
@@ -633,9 +633,9 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_33_check_interface_ODU2E_NETWORK_spdra(self):
         response = test_utils.check_node_attribute_request(
-            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU2e')
+            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU2e:service1-10GE')
         self.assertEqual(response['status_code'], requests.codes.ok)
-        input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e',
+        input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e:service1-10GE',
                         'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP1-CFP0',
                         'supporting-interface': 'XPDR1-NETWORK1-ODU4',
@@ -671,9 +671,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
                              response['odu-connection'][0])
-        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'},
+        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e:service1-10GE'},
                              response['odu-connection'][0]['destination'])
-        self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'},
+        self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e:service1-10GE'},
                              response['odu-connection'][0]['source'])
 
     def test_35_check_interface_10GE_CLIENT_spdrc(self):
@@ -694,9 +694,9 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_36_check_interface_ODU2E_CLIENT_spdrc(self):
         response = test_utils.check_node_attribute_request(
-            'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ODU2e')
+            'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ODU2e:service1-10GE')
         self.assertEqual(response['status_code'], requests.codes.ok)
-        input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e',
+        input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e:service1-10GE',
                         'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP1-SFP4',
                         'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G',
@@ -718,9 +718,9 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_37_check_interface_ODU2E_NETWORK_spdrc(self):
         response = test_utils.check_node_attribute_request(
-            'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU2e')
+            'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU2e:service1-10GE')
         self.assertEqual(response['status_code'], requests.codes.ok)
-        input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e',
+        input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e:service1-10GE',
                         'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP1-CFP0',
                         'supporting-interface': 'XPDR1-NETWORK1-ODU4',
@@ -760,9 +760,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
                              response['odu-connection'][0])
-        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'},
+        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e:service1-10GE'},
                              response['odu-connection'][0]['destination'])
-        self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'},
+        self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e:service1-10GE'},
                              response['odu-connection'][0]['source'])
 
     def test_39_check_otn_topo_links(self):
@@ -1117,9 +1117,9 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_73_check_interface_ODU0_CLIENT_spdra(self):
         response = test_utils.check_node_attribute_request(
-            'SPDR-SA1', 'interface', 'XPDR3-CLIENT1-ODU0')
+            'SPDR-SA1', 'interface', 'XPDR3-CLIENT1-ODU0:service1-1GE')
         self.assertEqual(response['status_code'], requests.codes.ok)
-        input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0',
+        input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0:service1-1GE',
                         'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP3-SFP1',
                         'supporting-interface': 'XPDR3-CLIENT1-ETHERNET1G',
@@ -1140,9 +1140,9 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_74_check_interface_ODU0_NETWORK_spdra(self):
         response = test_utils.check_node_attribute_request(
-            'SPDR-SA1', 'interface', 'XPDR3-NETWORK1-ODU0')
+            'SPDR-SA1', 'interface', 'XPDR3-NETWORK1-ODU0:service1-1GE')
         self.assertEqual(response['status_code'], requests.codes.ok)
-        input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0',
+        input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0:service1-1GE',
                         'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP3-CFP0',
                         'supporting-interface': 'XPDR3-NETWORK1-ODU4',
@@ -1176,9 +1176,9 @@ class TransportPCEtesting(unittest.TestCase):
         }
         self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
                              response['odu-connection'][0])
-        self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0'},
+        self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0:service1-1GE'},
                              response['odu-connection'][0]['destination'])
-        self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0'},
+        self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0:service1-1GE'},
                              response['odu-connection'][0]['source'])
 
     def test_76_check_interface_1GE_CLIENT_spdrc(self):
@@ -1199,9 +1199,9 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_77_check_interface_ODU0_CLIENT_spdrc(self):
         response = test_utils.check_node_attribute_request(
-            'SPDR-SC1', 'interface', 'XPDR3-CLIENT1-ODU0')
+            'SPDR-SC1', 'interface', 'XPDR3-CLIENT1-ODU0:service1-1GE')
         self.assertEqual(response['status_code'], requests.codes.ok)
-        input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0',
+        input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0:service1-1GE',
                         'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP3-SFP1',
                         'supporting-interface': 'XPDR3-CLIENT1-ETHERNET1G',
@@ -1222,9 +1222,9 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_78_check_interface_ODU0_NETWORK_spdrc(self):
         response = test_utils.check_node_attribute_request(
-            'SPDR-SC1', 'interface', 'XPDR3-NETWORK1-ODU0')
+            'SPDR-SC1', 'interface', 'XPDR3-NETWORK1-ODU0:service1-1GE')
         self.assertEqual(response['status_code'], requests.codes.ok)
-        input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0',
+        input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0:service1-1GE',
                         'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP3-CFP0',
                         'supporting-interface': 'XPDR3-NETWORK1-ODU4',
@@ -1261,9 +1261,9 @@ class TransportPCEtesting(unittest.TestCase):
         }
         self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
                              response['odu-connection'][0])
-        self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0'},
+        self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0:service1-1GE'},
                              response['odu-connection'][0]['destination'])
-        self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0'},
+        self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0:service1-1GE'},
                              response['odu-connection'][0]['source'])
 
     def test_80_check_otn_topo_links(self):
@@ -1317,12 +1317,12 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_85_check_no_interface_ODU0_NETWORK_spdra(self):
         response = test_utils.check_node_attribute_request(
-            'SPDR-SA1', 'interface', 'XPDR3-NETWORK1-ODU0-service1')
+            'SPDR-SA1', 'interface', 'XPDR3-NETWORK1-ODU0:service1-1GE')
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_86_check_no_interface_ODU0_CLIENT_spdra(self):
         response = test_utils.check_node_attribute_request(
-            'SPDR-SA1', 'interface', 'XPDR3-CLIENT1-ODU0-service1')
+            'SPDR-SA1', 'interface', 'XPDR3-CLIENT1-ODU0:service1-1GE')
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_87_check_no_interface_10GE_CLIENT_spdra(self):