functional tests update for network model 4.1

[transportpce.git] / tests / transportpce_tests / test_renderer_service_path_nominal.py

diff --git a/tests/transportpce_tests/test_renderer_service_path_nominal.py b/tests/transportpce_tests/test_renderer_service_path_nominal.py
index 729bbb7f36b2d3c47a6a3d9ecf9801ab4b6748dc..9d64344c8c6c798500c1bc703cb80d539a194765 100644 (file)
--- a/tests/transportpce_tests/test_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/test_renderer_service_path_nominal.py
@@ -28,6 +28,8 @@ class TransportPCERendererTesting(unittest.TestCase):
     odl_process = None
     restconf_baseurl = "http://localhost:8181/restconf"
 
+#START_IGNORE_XTESTING
+
     @classmethod
     def __start_honeynode1(cls):
         executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc"
@@ -35,7 +37,7 @@ class TransportPCERendererTesting(unittest.TestCase):
         if os.path.isfile(executable):
             with open('honeynode1.log', 'w') as outfile:
                 cls.honeynode_process1 = subprocess.Popen(
-                    [executable, "17830", "sample_configs/ord_2.1/oper-ROADMA.xml"],
+                    [executable, "17830", "sample_configs/openroadm/2.1/oper-ROADMA.xml"],
                     stdout=outfile)
 
     @classmethod
@@ -45,7 +47,7 @@ class TransportPCERendererTesting(unittest.TestCase):
         if os.path.isfile(executable):
             with open('honeynode2.log', 'w') as outfile:
                 cls.honeynode_process2 = subprocess.Popen(
-                    [executable, "17831", "sample_configs/ord_2.1/oper-XPDRA.xml"],
+                    [executable, "17831", "sample_configs/openroadm/2.1/oper-XPDRA.xml"],
                     stdout=outfile)
 
     @classmethod
@@ -87,6 +89,8 @@ class TransportPCERendererTesting(unittest.TestCase):
         print ("execution of {}".format(self.id().split(".")[-1]))
         time.sleep(10)
 
+#END_IGNORE_XTESTING
+
     def test_01_rdm_device_connected(self):
         url = ("{}/config/network-topology:"
                "network-topology/topology/topology-netconf/node/ROADMA"
@@ -382,7 +386,7 @@ class TransportPCERendererTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
              {"error-type":"application", "error-tag":"data-missing",
-              "error-message":"Request could not be completed because the relevant data model content does not exist "},
+              "error-message":"Request could not be completed because the relevant data model content does not exist"},
              res['errors']['error'])
 
     def test_16_service_path_delete_rdm_check(self):
@@ -396,7 +400,7 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist "},
+             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
              res['errors']['error'])
 
     def test_17_service_path_delete_rdm_check(self):
@@ -410,7 +414,7 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist "},
+             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
              res['errors']['error'])
 
     def test_18_service_path_delete_xpdr_check(self):
@@ -424,7 +428,7 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist "},
+             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
              res['errors']['error'])
 
     def test_19_service_path_delete_xpdr_check(self):
@@ -438,7 +442,7 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist "},
+             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
              res['errors']['error'])
 
     def test_20_service_path_delete_xpdr_check(self):
@@ -452,7 +456,7 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist "},
+             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
              res['errors']['error'])
 
     def test_21_service_path_delete_xpdr_check(self):
@@ -466,7 +470,7 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist "},
+             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
              res['errors']['error'])
 
     def test_22_service_path_delete_xpdr_check(self):