X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest07_otn_renderer.py;h=6bb1fd6641851068d949fc7b42c26d45940ed93f;hb=b671a17c8a89921283887c54d8fc144ea8fb2ed2;hp=df4a8b227fffc0e7d295b20f98d460a5207e19d2;hpb=03766681879bd1d6b41b4c90862661dca95d1cae;p=transportpce.git

diff --git a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
index df4a8b227..6bb1fd664 100644
--- a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
@@ -88,8 +88,8 @@ class TransportPCEtesting(unittest.TestCase):
             response['mapping'])
 
     def test_04_service_path_create_OCH_OTU4(self):
-        data = {
-            'input': {
+        response = test_utils_rfc8040.device_renderer_service_path_request(
+            {'input': {
                 'service-name': 'service_test',
                 'wave-number': '7',
                 'modulation-format': 'dp-qpsk',
@@ -101,10 +101,14 @@ class TransportPCEtesting(unittest.TestCase):
                 'max-freq': 196.125,
                 'lower-spectral-slot-number': 761,
                 'higher-spectral-slot-number': 768
-            }
-        }
-        response = test_utils_rfc8040.device_renderer_service_path_request(data)
-        self.assertEqual(response.status_code, requests.codes.ok)
+            }})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Interfaces created successfully for nodes: ', response['output']['result'])
+        self.assertTrue(response['output']['success'])
+        self.assertIn(
+            {'node-id': 'SPDR-SA1',
+             'otu-interface-id': ['XPDR1-NETWORK1-OTU'],
+             'och-interface-id': ['XPDR1-NETWORK1-761:768']}, response['output']['node-interface'])
 
     def test_05_get_portmapping_NETWORK1(self):
         response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-NETWORK1")
@@ -155,16 +159,14 @@ class TransportPCEtesting(unittest.TestCase):
                              response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
 
     def test_08_otn_service_path_create_ODU4(self):
-        data = {
-            'input': {
+        response = test_utils_rfc8040.device_renderer_otn_service_path_request(
+            {'input': {
                 'service-name': 'service_ODU4',
                 'operation': 'create',
                 'service-rate': '100',
                 'service-format': 'ODU',
                 'nodes': [{'node-id': 'SPDR-SA1', 'network-tp': 'XPDR1-NETWORK1'}]
-            }
-        }
-        response = test_utils_rfc8040.device_renderer_otn_service_path_request(data)
+            }})
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Otn Service path was set up successfully for node :SPDR-SA1', response['output']['result'])
         self.assertTrue(response['output']['success'])
@@ -203,8 +205,8 @@ class TransportPCEtesting(unittest.TestCase):
             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_11_otn_service_path_create_10GE(self):
-        data = {
-            'input': {
+        response = test_utils_rfc8040.device_renderer_otn_service_path_request(
+            {'input': {
                 'service-name': 'service1',
                 'operation': 'create',
                 'service-rate': '10',
@@ -213,9 +215,7 @@ class TransportPCEtesting(unittest.TestCase):
                 'ethernet-encoding': 'eth encode',
                 'trib-slot': ['1'],
                 'trib-port-number': '1'
-            }
-        }
-        response = test_utils_rfc8040.device_renderer_otn_service_path_request(data)
+            }})
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Otn Service path was set up successfully for node :SPDR-SA1', response['output']['result'])
         self.assertTrue(response['output']['success'])
@@ -313,8 +313,8 @@ class TransportPCEtesting(unittest.TestCase):
                              response['odu-connection'][0]['source'])
 
     def test_16_otn_service_path_delete_10GE(self):
-        data = {
-            'input': {
+        response = test_utils_rfc8040.device_renderer_otn_service_path_request(
+            {'input': {
                 'service-name': 'service1',
                 'operation': 'delete',
                 'service-rate': '10',
@@ -323,9 +323,7 @@ class TransportPCEtesting(unittest.TestCase):
                 'ethernet-encoding': 'eth encode',
                 'trib-slot': ['1'],
                 'trib-port-number': '1'
-            }
-        }
-        response = test_utils_rfc8040.device_renderer_otn_service_path_request(data)
+            }})
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Request processed', response['output']['result'])
         self.assertTrue(response['output']['success'])
@@ -350,16 +348,14 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_21_otn_service_path_delete_ODU4(self):
-        data = {
-            'input': {
+        response = test_utils_rfc8040.device_renderer_otn_service_path_request(
+            {'input': {
                 'service-name': 'service_ODU4',
                 'operation': 'delete',
                 'service-rate': '100',
                 'service-format': 'ODU',
                 'nodes': [{'node-id': 'SPDR-SA1', 'network-tp': 'XPDR1-NETWORK1'}]
-            }
-        }
-        response = test_utils_rfc8040.device_renderer_otn_service_path_request(data)
+            }})
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Request processed', response['output']['result'])
         self.assertTrue(response['output']['success'])
@@ -369,8 +365,8 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_23_service_path_delete_OCH_OTU4(self):
-        data = {
-            'input': {
+        response = test_utils_rfc8040.device_renderer_service_path_request(
+            {'input': {
                 'service-name': 'service_test',
                 'wave-number': '7',
                 'modulation-format': 'dp-qpsk',
@@ -382,10 +378,10 @@ class TransportPCEtesting(unittest.TestCase):
                 'max-freq': 196.125,
                 'lower-spectral-slot-number': 761,
                 'higher-spectral-slot-number': 768
-            }
-        }
-        response = test_utils_rfc8040.device_renderer_service_path_request(data)
-        self.assertEqual(response.status_code, requests.codes.ok)
+            }})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Request processed', response['output']['result'])
+        self.assertTrue(response['output']['success'])
 
     def test_24_check_no_interface_OTU4(self):
         response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-OTU")