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.

JIRA: TRNSPRTPCE-86
Change-Id: Icf0eb7b38a2bd6f82b24a64ed32c44238fdb9087
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>

diff --git a/tests/transportpce_tests/test_topoPortMapping.py b/tests/transportpce_tests/test_topoPortMapping.py
index fa1ed4db78e74849b696eaf28405d423c44b5447..0ec2086a7b6741621c5f21427983454e02dd2857 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: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: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: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: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 cf769e0bd5519a37dfb33ed7e1269e6018b9bfbc..a22c1f49195e76a982c9fdd952629b910db7d9f7 100644 (file)
--- a/tests/transportpce_tests/test_topology.py
+++ b/tests/transportpce_tests/test_topology.py
@@ -840,14 +840,14 @@ class TransportPCETopologyTesting(unittest.TestCase):
              auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         #Delete in the openroadm-network
-        url = ("{}/config/ietf-network: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: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
@@ -870,14 +870,14 @@ class TransportPCETopologyTesting(unittest.TestCase):
              auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         #Delete in the openroadm-network
-        url = ("{}/config/ietf-network: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: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:network/openroadm-topology"
@@ -1046,14 +1046,14 @@ class TransportPCETopologyTesting(unittest.TestCase):
             auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         #Delete in the openroadm-network
-        url = ("{}/config/ietf-network: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: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:network/clli-network"
@@ -1206,15 +1206,15 @@ class TransportPCETopologyTesting(unittest.TestCase):
              auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         #Delete in the openroadm-network
-        url = ("{}/config/ietf-network: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: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:network/clli-network"