Fix some bugs in topology tests

Remove in some tests the manual node deletions in openroadm-network.
This action is already performed by TransportPCE when disconnecting the
topology-netconf device. Related tests should no longer report an error.

NB: test_05 in test_topoPortMapping.py still fails because of a bug in
the creation of xpdr device in the openroadm-topology.

JIRA: TRNSPRTPCE-86
Change-Id: Icf0eb7b38a2bd6f82b24a64ed32c44238fdb9087
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
(cherry picked from commit f49d7be5a843a3915e33cb2de4e9d5ffcb485748)

diff --git a/tests/transportpce_tests/test_topoPortMapping.py b/tests/transportpce_tests/test_topoPortMapping.py
index 77f0b56add2f8c923f3ace8bc715d9c3612fabd7..d623d2e797060bd687637c0dc1aab6d02124ca64 100644 (file)
--- a/tests/transportpce_tests/test_topoPortMapping.py
+++ b/tests/transportpce_tests/test_topoPortMapping.py
@@ -164,15 +164,15 @@ class TransportPCEtesting(unittest.TestCase):
              auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         #Delete in the openroadm-network
-        url = ("{}/config/ietf-network:networks/network/openroadm-network/node/ROADMA"
-               .format(self.restconf_baseurl))
-        data = {}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "DELETE", url, data=json.dumps(data), headers=headers,
-             auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(5)
+#         url = ("{}/config/ietf-network:networks/network/openroadm-network/node/ROADMA"
+#                .format(self.restconf_baseurl))
+#         data = {}
+#         headers = {'content-type': 'application/json'}
+#         response = requests.request(
+#              "DELETE", url, data=json.dumps(data), headers=headers,
+#              auth=('admin', 'admin'))
+#         self.assertEqual(response.status_code, requests.codes.ok)
+#         time.sleep(5)
 
     #Connect the XPDRA
     def test_04_connect_xpdr(self):
@@ -258,14 +258,14 @@ class TransportPCEtesting(unittest.TestCase):
             auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         #Delete in the openroadm-network
-        url = ("{}/config/ietf-network:networks/network/openroadm-network/node/XPDRA"
-               .format(self.restconf_baseurl))
-        data = {}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "DELETE", url, data=json.dumps(data), headers=headers,
-             auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
+#         url = ("{}/config/ietf-network:networks/network/openroadm-network/node/XPDRA"
+#                .format(self.restconf_baseurl))
+#         data = {}
+#         headers = {'content-type': 'application/json'}
+#         response = requests.request(
+#              "DELETE", url, data=json.dumps(data), headers=headers,
+#              auth=('admin', 'admin'))
+#         self.assertEqual(response.status_code, requests.codes.ok)
 
 
 if __name__ == "__main__":

diff --git a/tests/transportpce_tests/test_topology.py b/tests/transportpce_tests/test_topology.py
index da950441f52cdcf50d7cb47e618f3e9539c41313..df3e05f22e4d06fd6efb878a1f433645ab8a91bc 100644 (file)
--- a/tests/transportpce_tests/test_topology.py
+++ b/tests/transportpce_tests/test_topology.py
@@ -797,14 +797,14 @@ class TransportPCEtesting(unittest.TestCase):
              auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         #Delete in the openroadm-network
-        url = ("{}/config/ietf-network:networks/network/openroadm-network/node/ROADMB"
-               .format(self.restconf_baseurl))
-        data = {}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "DELETE", url, data=json.dumps(data), headers=headers,
-             auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
+#         url = ("{}/config/ietf-network:networks/network/openroadm-network/node/ROADMB"
+#                .format(self.restconf_baseurl))
+#         data = {}
+#         headers = {'content-type': 'application/json'}
+#         response = requests.request(
+#              "DELETE", url, data=json.dumps(data), headers=headers,
+#              auth=('admin', 'admin'))
+#         self.assertEqual(response.status_code, requests.codes.ok)
 
     def test_23_disconnect_ROADMC(self):
         #Delete in the topology-netconf
@@ -827,14 +827,14 @@ class TransportPCEtesting(unittest.TestCase):
              auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         #Delete in the openroadm-network
-        url = ("{}/config/ietf-network:networks/network/openroadm-network/node/ROADMC"
-               .format(self.restconf_baseurl))
-        data = {}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "DELETE", url, data=json.dumps(data), headers=headers,
-             auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
+#         url = ("{}/config/ietf-network:networks/network/openroadm-network/node/ROADMC"
+#                .format(self.restconf_baseurl))
+#         data = {}
+#         headers = {'content-type': 'application/json'}
+#         response = requests.request(
+#              "DELETE", url, data=json.dumps(data), headers=headers,
+#              auth=('admin', 'admin'))
+#         self.assertEqual(response.status_code, requests.codes.ok)
 
 #    def test_24_getLinks_OpenRoadmTopology(self):
 #        url = ("{}/config/ietf-network:networks/network/openroadm-topology"
@@ -1003,14 +1003,14 @@ class TransportPCEtesting(unittest.TestCase):
             auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         #Delete in the openroadm-network
-        url = ("{}/config/ietf-network:networks/network/openroadm-network/node/XPDRA"
-               .format(self.restconf_baseurl))
-        data = {}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "DELETE", url, data=json.dumps(data), headers=headers,
-             auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
+#         url = ("{}/config/ietf-network:networks/network/openroadm-network/node/XPDRA"
+#                .format(self.restconf_baseurl))
+#         data = {}
+#         headers = {'content-type': 'application/json'}
+#         response = requests.request(
+#              "DELETE", url, data=json.dumps(data), headers=headers,
+#              auth=('admin', 'admin'))
+#         self.assertEqual(response.status_code, requests.codes.ok)
 
     def test_29_getClliNetwork(self):
         url = ("{}/config/ietf-network:networks/network/clli-network"
@@ -1163,15 +1163,15 @@ class TransportPCEtesting(unittest.TestCase):
              auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         #Delete in the openroadm-network
-        url = ("{}/config/ietf-network:networks/network/openroadm-network/node/ROADMA"
-               .format(self.restconf_baseurl))
-        data = {}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "DELETE", url, data=json.dumps(data), headers=headers,
-             auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(5)
+#         url = ("{}/config/ietf-network:networks/network/openroadm-network/node/ROADMA"
+#                .format(self.restconf_baseurl))
+#         data = {}
+#         headers = {'content-type': 'application/json'}
+#         response = requests.request(
+#              "DELETE", url, data=json.dumps(data), headers=headers,
+#              auth=('admin', 'admin'))
+#         self.assertEqual(response.status_code, requests.codes.ok)
+#         time.sleep(5)
 
     def test_35_getClliNetwork(self):
         url = ("{}/config/ietf-network:networks/network/clli-network"