Manage 100GE on XPDR with a list of xponder
[transportpce.git] / tests / transportpce_tests / 2.2.1 / test12_end2end.py
index 422f525965caefca34f5da73f54b7591edb414ca..e0704c88b20e10e3161407ffaf1ab6930ff8fdbc 100644 (file)
@@ -15,9 +15,13 @@ import base64
 import unittest
 import time
 import requests
+# pylint: disable=wrong-import-order
 import sys
 sys.path.append('transportpce_tests/common/')
-import test_utils
+# pylint: disable=wrong-import-position
+# pylint: disable=import-error
+import test_utils  # nopep8
+
 
 class TransportPCEFulltesting(unittest.TestCase):
 
@@ -36,49 +40,49 @@ class TransportPCEFulltesting(unittest.TestCase):
             "service-rate": "100",
             "node-id": "XPDR-A1",
             "service-format": "Ethernet",
-            "clli": "SNJSCAMCJP8",
-                    "tx-direction": {
+            "clli": "NodeA",
+            "tx-direction": {
                         "port": {
-                            "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00",
-                            "port-type": "router",
-                            "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0",
+                            "port-device-name": "XPDR-A1-XPDR1",
+                            "port-type": "fixed",
+                            "port-name": "1/0/2-PLUG-CLIENT",
                             "port-rack": "000000.00",
                             "port-shelf": "00"
                         },
-                        "lgx": {
+                "lgx": {
                             "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00",
                             "lgx-port-name": "LGX Back.3",
                             "lgx-port-rack": "000000.00",
                             "lgx-port-shelf": "00"
                         }
-                    },
+            },
             "rx-direction": {
-                        "port": {
-                            "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00",
-                            "port-type": "router",
-                            "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0",
-                            "port-rack": "000000.00",
-                            "port-shelf": "00"
-                        },
-                        "lgx": {
-                            "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00",
-                            "lgx-port-name": "LGX Back.4",
-                            "lgx-port-rack": "000000.00",
-                            "lgx-port-shelf": "00"
-                        }
-                    },
+                "port": {
+                    "port-device-name": "XPDR-A1-XPDR1",
+                    "port-type": "fixed",
+                    "port-name": "1/0/2-PLUG-CLIENT",
+                    "port-rack": "000000.00",
+                    "port-shelf": "00"
+                },
+                "lgx": {
+                    "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00",
+                    "lgx-port-name": "LGX Back.4",
+                    "lgx-port-rack": "000000.00",
+                    "lgx-port-shelf": "00"
+                }
+            },
             "optic-type": "gray"
         },
         "service-z-end": {
             "service-rate": "100",
             "node-id": "XPDR-C1",
             "service-format": "Ethernet",
-            "clli": "SNJSCAMCJT4",
+            "clli": "NodeC",
                     "tx-direction": {
                         "port": {
-                            "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00",
+                            "port-device-name": "XPDR-C1-XPDR2",
                             "port-type": "router",
-                            "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0",
+                            "port-name": "1/0/2-PLUG-CLIENT",
                             "port-rack": "000000.00",
                             "port-shelf": "00"
                         },
@@ -91,9 +95,9 @@ class TransportPCEFulltesting(unittest.TestCase):
                     },
             "rx-direction": {
                         "port": {
-                            "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00",
+                            "port-device-name": "XPDR-C1-XPDR2",
                             "port-type": "router",
-                            "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0",
+                            "port-name": "1/0/2-PLUG-CLIENT",
                             "port-rack": "000000.00",
                             "port-shelf": "00"
                         },
@@ -130,6 +134,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         print("all processes killed")
 
     def setUp(self):  # instruction executed before each test method
+        # pylint: disable=consider-using-f-string
         print("execution of {}".format(self.id().split(".")[-1]))
 
     def test_01_connect_xpdrA(self):
@@ -164,7 +169,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
         time.sleep(2)
 
-    def test_07_connect_xprdC_N1_to_roadmC_PP1(self):
+    def test_07_connect_xprdC_xpdr1_N1_to_roadmC_PP1(self):
         response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "1",
                                                           "ROADM-C1", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -172,7 +177,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
         time.sleep(2)
 
-    def test_08_connect_roadmC_PP1_to_xpdrC_N1(self):
+    def test_08_connect_roadmC_PP1_to_xpdrC_xprd1_N1(self):
         response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "1",
                                                           "ROADM-C1", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -180,7 +185,39 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
         time.sleep(2)
 
-    def test_09_add_omsAttributes_ROADMA_ROADMC(self):
+    def test_09_connect_xprdA_N2_to_roadmA_PP2(self):
+        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "2",
+                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        time.sleep(2)
+
+    def test_10_connect_roadmA_PP2_to_xpdrA_N2(self):
+        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "2",
+                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        time.sleep(2)
+
+    def test_11_connect_xprdC_xpdr2_N1_to_roadmC_PP2(self):
+        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "2", "1",
+                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        time.sleep(2)
+
+    def test_12_connect_roadmC_PP2_to_xpdrC_xpdr2_N1(self):
+        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "2", "1",
+                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        time.sleep(2)
+
+    def test_13_add_omsAttributes_ROADMA_ROADMC(self):
         # Config ROADMA-ROADMC oms-attributes
         data = {"span": {
             "auto-spanloss": "true",
@@ -195,7 +232,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
-    def test_10_add_omsAttributes_ROADMC_ROADMA(self):
+    def test_14_add_omsAttributes_ROADMC_ROADMA(self):
         # Config ROADMC-ROADMA oms-attributes
         data = {"span": {
             "auto-spanloss": "true",
@@ -211,8 +248,8 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created)
 
 # test service-create for Eth service from xpdr to xpdr
-    def test_11_create_eth_service1(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1"
+    def test_15_create_eth_service2(self):
+        self.cr_serv_sample_data["input"]["service-name"] = "service2"
         response = test_utils.service_create_request(self.cr_serv_sample_data)
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
@@ -220,21 +257,21 @@ class TransportPCEFulltesting(unittest.TestCase):
                       res['output']['configuration-response-common']['response-message'])
         time.sleep(self.WAITING)
 
-    def test_12_get_eth_service1(self):
-        response = test_utils.get_service_list_request("services/service1")
+    def test_16_get_eth_service1(self):
+        response = test_utils.get_service_list_request("services/service2")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
             res['services'][0]['administrative-state'], 'inService')
         self.assertEqual(
-            res['services'][0]['service-name'], 'service1')
+            res['services'][0]['service-name'], 'service2')
         self.assertEqual(
             res['services'][0]['connection-type'], 'service')
         self.assertEqual(
             res['services'][0]['lifecycle-state'], 'planned')
         time.sleep(2)
 
-    def test_13_check_xc1_ROADMA(self):
+    def test_17_check_xc1_ROADMA(self):
         response = test_utils.check_netconf_node_request(
             "ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -256,45 +293,45 @@ class TransportPCEFulltesting(unittest.TestCase):
             res['roadm-connections'][0]['destination'])
         time.sleep(5)
 
-    def test_14_check_xc1_ROADMC(self):
+    def test_18_check_xc1_ROADMC(self):
         response = test_utils.check_netconf_node_request(
-            "ROADM-C1", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768")
+            "ROADM-C1", "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-761:768")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
         self.assertDictEqual(
             dict({
-                'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768',
+                'connection-name': 'SRG1-PP2-TXRX-DEG1-TTP-TXRX-761:768',
                 'opticalControlMode': 'gainLoss',
                 'target-output-power': -3.0
             }, **res['roadm-connections'][0]),
             res['roadm-connections'][0]
         )
         self.assertDictEqual(
-            {'src-if': 'SRG1-PP1-TXRX-nmc-761:768'},
+            {'src-if': 'SRG1-PP2-TXRX-nmc-761:768'},
             res['roadm-connections'][0]['source'])
         self.assertDictEqual(
             {'dst-if': 'DEG1-TTP-TXRX-nmc-761:768'},
             res['roadm-connections'][0]['destination'])
         time.sleep(5)
 
-    def test_15_check_topo_XPDRA(self):
+    def test_19_check_topo_XPDRA(self):
         response = test_utils.get_ordm_topo_request("node/XPDR-A1-XPDR1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({u'frequency': 196.1,
-                                  u'width': 40},
+                self.assertEqual({'frequency': 196.1,
+                                  'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
-            if ele['tp-id'] == 'XPDR1-CLIENT2' or ele['tp-id'] == 'XPDR1-CLIENT1':
+            elif ele['tp-id'] in ('XPDR1-CLIENT1', 'XPDR1-CLIENT2'):
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
-            if ele['tp-id'] == 'XPDR1-NETWORK2':
-                self.assertNotIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele))
+            elif ele['tp-id'] == 'XPDR1-NETWORK2':
+                self.assertIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele))
         time.sleep(3)
 
-    def test_16_check_topo_ROADMA_SRG1(self):
+    def test_20_check_topo_ROADMA_SRG1(self):
         response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
@@ -309,11 +346,11 @@ class TransportPCEFulltesting(unittest.TestCase):
                     ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
-            if ele['tp-id'] == 'SRG1-PP2-TXRX':
+            elif ele['tp-id'] == 'SRG1-PP2-TXRX':
                 self.assertNotIn('avail-freq-maps', dict.keys(ele))
         time.sleep(3)
 
-    def test_17_check_topo_ROADMA_DEG1(self):
+    def test_21_check_topo_ROADMA_DEG2(self):
         response = test_utils.get_ordm_topo_request("node/ROADM-A1-DEG2")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
@@ -328,47 +365,24 @@ class TransportPCEFulltesting(unittest.TestCase):
                     ele['org-openroadm-network-topology:ctp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
-            if ele['tp-id'] == 'DEG2-TTP-TXRX':
+            elif ele['tp-id'] == 'DEG2-TTP-TXRX':
                 freq_map = base64.b64decode(
                     ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
         time.sleep(3)
 
-    def test_18_connect_xprdA_N2_to_roadmA_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "2",
-                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
-        time.sleep(2)
-
-    def test_19_connect_roadmA_PP2_to_xpdrA_N2(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "2",
-                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
-        time.sleep(2)
-
-    def test_20_connect_xprdC_N2_to_roadmC_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "2",
-                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
-        time.sleep(2)
-
-    def test_21_connect_roadmC_PP2_to_xpdrC_N2(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "2",
-                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
-        time.sleep(2)
+    def test_22_create_eth_service1(self):
+        self.cr_serv_sample_data["input"]["service-name"] = "service1"
+        del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"]
+        del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"]
 
-    def test_22_create_eth_service2(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service2"
         response = test_utils.service_create_request(self.cr_serv_sample_data)
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
@@ -376,22 +390,22 @@ class TransportPCEFulltesting(unittest.TestCase):
                       res['output']['configuration-response-common']['response-message'])
         time.sleep(self.WAITING)
 
-    def test_23_get_eth_service2(self):
-        response = test_utils.get_service_list_request("services/service2")
+    def test_23_get_eth_service1(self):
+        response = test_utils.get_service_list_request("services/service1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
             res['services'][0]['administrative-state'],
             'inService')
         self.assertEqual(
-            res['services'][0]['service-name'], 'service2')
+            res['services'][0]['service-name'], 'service1')
         self.assertEqual(
             res['services'][0]['connection-type'], 'service')
         self.assertEqual(
             res['services'][0]['lifecycle-state'], 'planned')
         time.sleep(1)
 
-    def test_24_check_xc2_ROADMA(self):
+    def test_24_check_xc1_ROADMA(self):
         response = test_utils.check_netconf_node_request(
             "ROADM-A1", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP2-TXRX-753:760")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -417,15 +431,11 @@ class TransportPCEFulltesting(unittest.TestCase):
         res = response.json()
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
-            if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({u'frequency': 196.1,
-                                  u'width': 40},
-                                 ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
             if ele['tp-id'] == 'XPDR1-NETWORK2':
-                self.assertEqual({u'frequency': 196.05,
-                                  u'width': 40},
+                self.assertEqual({'frequency': 196.05,
+                                  'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
-            if ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT2':
+            elif ele['tp-id'] in ('XPDR1-CLIENT1'):
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
         time.sleep(10)
 
@@ -446,13 +456,13 @@ class TransportPCEFulltesting(unittest.TestCase):
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
                 self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
-            if ele['tp-id'] == 'SRG1-PP2-TXRX':
+            elif ele['tp-id'] == 'SRG1-PP2-TXRX':
                 freq_map = base64.b64decode(
                     ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
                 self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-            if ele['tp-id'] == 'SRG1-PP3-TXRX':
+            elif ele['tp-id'] == 'SRG1-PP3-TXRX':
                 self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
         time.sleep(10)
 
@@ -473,7 +483,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
                 self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-            if ele['tp-id'] == 'DEG2-TTP-TXRX':
+            elif ele['tp-id'] == 'DEG2-TTP-TXRX':
                 freq_map = base64.b64decode(
                     ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
@@ -531,13 +541,13 @@ class TransportPCEFulltesting(unittest.TestCase):
         res = response.json()
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
-            if ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT':
+            if ele['org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT':
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
-            elif ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK':
-                self.assertIn(u'tail-equipment-id',
-                              dict.keys(ele[u'org-openroadm-network-topology:xpdr-network-attributes']))
+            elif ele['org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK':
+                self.assertIn('tail-equipment-id',
+                              dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes']))
                 self.assertNotIn('wavelength', dict.keys(
-                    ele[u'org-openroadm-network-topology:xpdr-network-attributes']))
+                    ele['org-openroadm-network-topology:xpdr-network-attributes']))
         time.sleep(10)
 
     def test_34_check_topo_ROADMA_SRG1(self):
@@ -551,7 +561,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertEqual(freq_map_array[94], 255, "Index 2 should  be available")
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
-            if ele['tp-id'] == 'SRG1-PP1-TXRX' or ele['tp-id'] == 'SRG1-PP2-TXRX':
+            if ele['tp-id'] in ('SRG1-PP1-TXRX', 'SRG1-PP2-TXRX'):
                 freq_map = base64.b64decode(
                     ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
@@ -584,7 +594,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
                 self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
-            if ele['tp-id'] == 'DEG2-TTP-TXRX':
+            elif ele['tp-id'] == 'DEG2-TTP-TXRX':
                 freq_map = base64.b64decode(
                     ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
@@ -718,7 +728,31 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(2)
 
     def test_43_check_topo_ROADMA(self):
-        self.test_26_check_topo_ROADMA_SRG1()
+        response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        freq_map = base64.b64decode(
+            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+        freq_map_array = [int(x) for x in freq_map]
+        self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
+        self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
+        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        for ele in liste_tp:
+            if ele['tp-id'] == 'SRG1-PP1-TXRX':
+                freq_map = base64.b64decode(
+                    ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
+                freq_map_array = [int(x) for x in freq_map]
+                self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
+                self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
+            elif ele['tp-id'] == 'SRG1-PP2-TXRX':
+                freq_map = base64.b64decode(
+                    ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
+                freq_map_array = [int(x) for x in freq_map]
+                self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
+                self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
+            elif ele['tp-id'] == 'SRG1-PP3-TXRX':
+                self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
+        time.sleep(10)
         self.test_27_check_topo_ROADMA_DEG2()
         time.sleep(3)
 
@@ -760,25 +794,9 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.test_34_check_topo_ROADMA_SRG1()
         self.test_35_check_topo_ROADMA_DEG2()
 
-    def test_49_loop_create_eth_service(self):
-        for i in range(1, 6):
-            print("iteration number {}".format(i))
-            print("eth service creation")
-            self.test_11_create_eth_service1()
-            print("check xc in ROADM-A1")
-            self.test_13_check_xc1_ROADMA()
-            print("check xc in ROADM-C1")
-            self.test_14_check_xc1_ROADMC()
-            print("eth service deletion\n")
-            self.test_30_delete_eth_service1()
-
-    def test_50_loop_create_oc_service(self):
-        response = test_utils.get_service_list_request("services/service1")
-        if response.status_code != 404:
-            response = test_utils.service_delete_request("service1")
-            time.sleep(5)
-
-        for i in range(1, 6):
+    def test_49_loop_create_oc_service(self):
+        for i in range(1, 3):
+            # pylint: disable=consider-using-f-string
             print("iteration number {}".format(i))
             print("oc service creation")
             self.test_36_create_oc_service1()
@@ -789,6 +807,26 @@ class TransportPCEFulltesting(unittest.TestCase):
             print("oc service deletion\n")
             self.test_44_delete_oc_service1()
 
+    def test_50_loop_create_eth_service(self):
+        response = test_utils.get_service_list_request("services/service1")
+        if response.status_code != requests.codes.not_found:
+            response = test_utils.service_delete_request("service1")
+            time.sleep(5)
+        self.cr_serv_sample_data["input"]["connection-type"] = "service"
+        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "XPDR-A1"
+        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet"
+        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "XPDR-C1"
+        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet"
+        for i in range(1, 3):
+            # pylint: disable=consider-using-f-string
+            print("iteration number {}".format(i))
+            print("eth service creation")
+            self.test_15_create_eth_service2()
+            print("check xc in ROADM-A1")
+            self.test_17_check_xc1_ROADMA()
+            print("eth service deletion\n")
+            self.test_31_delete_eth_service2()
+
     def test_51_disconnect_XPDRA(self):
         response = test_utils.unmount_device("XPDR-A1")
         self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)