fix renderer_service_path_nominal tests

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

diff --git a/tests/transportpce_tests/test_portmapping.py b/tests/transportpce_tests/test_portmapping.py
index 529a2e346405a73ec63ea058097901e7ab196a9a..3f798fdcc1b58bd90ba0b9d39d0fa07ad697af18 100644 (file)
--- a/tests/transportpce_tests/test_portmapping.py
+++ b/tests/transportpce_tests/test_portmapping.py
@@ -58,9 +58,9 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.__start_honeynode1()
-        time.sleep(40)
+        time.sleep(20)
         cls.__start_honeynode2()
-        time.sleep(40)
+        time.sleep(20)
         cls.__start_odl()
         time.sleep(60)
 
@@ -96,19 +96,19 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 #        self.assertEqual(res['node'] [0] ['netconf-node-topology:connection-status'],
 #                         'connected')
 
-    def test_02_restconfAPI(self):
-        url = ("{}/config/portmapping:network/nodes/controller-config".format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        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 "},
-            res['errors']['error'])
-
-    def test_03_rdm_device_connected(self):
+#     def test_02_restconfAPI(self):
+#         url = ("{}/config/transportpce-portmapping:network/nodes/controller-config".format(self.restconf_baseurl))
+#         headers = {'content-type': 'application/json'}
+#         response = requests.request(
+#             "GET", url, headers=headers, auth=('admin', 'admin'))
+#         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 "},
+#             res['errors']['error'])
+
+    def test_01_rdm_device_connected(self):
         url = ("{}/config/network-topology:"
                "network-topology/topology/topology-netconf/node/ROADMA"
               .format(self.restconf_baseurl))
@@ -127,7 +127,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created)
         time.sleep(20)
 
-    def test_04_rdm_device_connected(self):
+    def test_02_rdm_device_connected(self):
         url = ("{}/operational/network-topology:"
                "network-topology/topology/topology-netconf/node/ROADMA"
                .format(self.restconf_baseurl))
@@ -141,8 +141,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             'connected')
         time.sleep(10)
 
-    def test_05_rdm_portmapping_DEG1_TTP_TXRX(self):
-        url = ("{}/config/portmapping:network/"
+    def test_03_rdm_portmapping_DEG1_TTP_TXRX(self):
+        url = ("{}/config/transportpce-portmapping:network/"
                "nodes/ROADMA/mapping/DEG1-TTP-TXRX"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -155,8 +155,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              'logical-connection-point': 'DEG1-TTP-TXRX'},
             res['mapping'])
 
-    def test_06_rdm_portmapping_SRG1_PP7_TXRX(self):
-        url = ("{}/config/portmapping:network/"
+    def test_04_rdm_portmapping_SRG1_PP7_TXRX(self):
+        url = ("{}/config/transportpce-portmapping:network/"
                "nodes/ROADMA/mapping/SRG1-PP7-TXRX"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -169,8 +169,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              'logical-connection-point': 'SRG1-PP7-TXRX'},
             res['mapping'])
 
-    def test_07_rdm_portmapping_SRG3_PP1_TXRX(self):
-        url = ("{}/config/portmapping:network/"
+    def test_05_rdm_portmapping_SRG3_PP1_TXRX(self):
+        url = ("{}/config/transportpce-portmapping:network/"
                "nodes/ROADMA/mapping/SRG3-PP1-TXRX"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -183,7 +183,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              'logical-connection-point': 'SRG3-PP1-TXRX'},
             res['mapping'])
 
-    def test_08_xpdr_device_connected(self):
+    def test_06_xpdr_device_connected(self):
         url = ("{}/config/network-topology:"
                "network-topology/topology/topology-netconf/node/XPDRA"
               .format(self.restconf_baseurl))
@@ -202,7 +202,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created)
         time.sleep(20)
 
-    def test_09_xpdr_device_connected(self):
+    def test_07_xpdr_device_connected(self):
         url = ("{}/operational/network-topology:"
                "network-topology/topology/topology-netconf/node/XPDRA"
                .format(self.restconf_baseurl))
@@ -216,8 +216,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             'connected')
         time.sleep(10)
 
-    def test_10_xpdr_portmapping_NETWORK1(self):
-        url = ("{}/config/portmapping:network/"
+    def test_08_xpdr_portmapping_NETWORK1(self):
+        url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDRA/mapping/XPDR1-NETWORK1"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -230,9 +230,9 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              'logical-connection-point': 'XPDR1-NETWORK1'},
             res['mapping'])
 
-    def test_11_xpdr_portmapping_NETWORK2(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/XPDRA/mapping/XPDR0-NETWORK2"
+    def test_09_xpdr_portmapping_NETWORK2(self):
+        url = ("{}/config/transportpce-portmapping:network/"
+               "nodes/XPDRA/mapping/XPDR1-NETWORK2"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
@@ -240,12 +240,12 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-            {'supporting-port': '2', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET',
-             'logical-connection-point': 'XPDR0-NETWORK2'},
+            {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET',
+             'logical-connection-point': 'XPDR1-NETWORK2'},
             res['mapping'])
 
-    def test_12_xpdr_portmapping_CLIENT1(self):
-        url = ("{}/config/portmapping:network/"
+    def test_10_xpdr_portmapping_CLIENT1(self):
+        url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDRA/mapping/XPDR1-CLIENT1"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -259,23 +259,24 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              'logical-connection-point': 'XPDR1-CLIENT1'},
             res['mapping'])
 
-    def test_13_xpdr_portmapping_CLIENT2(self):
-        url = ("{}/config/portmapping:network/"
+    def test_11_xpdr_portmapping_CLIENT2(self):
+        url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDRA/mapping/XPDR1-CLIENT2"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
             "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.ok)
         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 "},
-            res['errors']['error'])
+            {'supporting-port': 'C2',
+                 'supporting-circuit-pack-name': '1/0/C2-PLUG-CLIENT',
+                 'logical-connection-point': 'XPDR1-CLIENT2'},
+            res['mapping'])
 
-    def test_14_xpdr_portmapping_CLIENT4(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/XPDRA/mapping/XPDR0-CLIENT4"
+    def test_12_xpdr_portmapping_CLIENT4(self):
+        url = ("{}/config/transportpce-portmapping:network/"
+               "nodes/XPDRA/mapping/XPDR1-CLIENT4"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
@@ -285,10 +286,10 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertIn(
             {'supporting-port': 'C4',
              'supporting-circuit-pack-name': '1/0/C4-PLUG-CLIENT',
-             'logical-connection-point': 'XPDR0-CLIENT4'},
+             'logical-connection-point': 'XPDR1-CLIENT4'},
             res['mapping'])
 
-    def test_15_xpdr_device_disconnected(self):
+    def test_13_xpdr_device_disconnected(self):
         url = ("{}/config/network-topology:"
                 "network-topology/topology/topology-netconf/node/XPDRA"
                .format(self.restconf_baseurl))
@@ -299,7 +300,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(20)
 
-    def test_16_xpdr_device_disconnected(self):
+    def test_14_xpdr_device_disconnected(self):
         url = ("{}/operational/network-topology:network-topology/topology/"
                "topology-netconf/node/XPDRA".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -309,11 +310,11 @@ class TransportPCEPortMappingTesting(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_17_xpdr_device_disconnected(self):
-        url = ("{}/config/portmapping:network/nodes/XPDRA".format(self.restconf_baseurl))
+    def test_15_xpdr_device_disconnected(self):
+        url = ("{}/config/transportpce-portmapping:network/nodes/XPDRA".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
             "GET", url, headers=headers, auth=('admin', 'admin'))
@@ -321,10 +322,10 @@ class TransportPCEPortMappingTesting(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_18_rdm_device_disconnected(self):
+    def test_16_rdm_device_disconnected(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -334,7 +335,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(20)
 
-    def test_19_rdm_device_disconnected(self):
+    def test_17_rdm_device_disconnected(self):
         url = ("{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADMA"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -344,11 +345,11 @@ class TransportPCEPortMappingTesting(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_20_rdm_device_disconnected(self):
-        url = ("{}/config/portmapping:network/nodes/ROADMA".format(self.restconf_baseurl))
+    def test_18_rdm_device_disconnected(self):
+        url = ("{}/config/transportpce-portmapping:network/nodes/ROADMA".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
             "GET", url, headers=headers, auth=('admin', 'admin'))
@@ -356,7 +357,7 @@ class TransportPCEPortMappingTesting(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'])