fix deprecated openroadm interfaces/objects

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

diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py
index 2bf5763f00623e727aecc664f3d8313d2ffad06b..10d66d0de0511e904b31fd96bca53ad4f2d786a8 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_end2end.py
@@ -1051,9 +1051,9 @@ 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-network-topology:tp-type'] == 'XPONDER-CLIENT':
+            if ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT':
                 self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-client-attributes']))
-            elif ele[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-NETWORK':
+            elif ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK':
                 self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes']))
         time.sleep(10)
 
@@ -1497,7 +1497,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.test_34_check_topo_ROADMA_SRG1()
         self.test_35_check_topo_ROADMA_DEG2()
 
-    @unittest.expectedFailure
+#    @unittest.expectedFailure
     def test_49_loop_create_eth_service(self):
         for i in range(1,6):
             print ("trial number {}".format(i))
@@ -1510,7 +1510,7 @@ class TransportPCEFulltesting(unittest.TestCase):
             print ("eth service deletion\n")
             self.test_30_delete_eth_service1()
 
-    @unittest.expectedFailure
+#    @unittest.expectedFailure
     def test_50_loop_create_oc_service(self):
         url = ("{}/operational/org-openroadm-service:service-list/services/service1"
                .format(self.restconf_baseurl))