fix new methods forgotten calls in func tests

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I560f2a36610138b936791ba4c7cfd67d27d3ef6e

diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py
index a3e42d155c8d4b8d095b7204e32d7db13be903c2..6c3b543c8c2b0f84bccf0a7c8e13d4a1f3c9f560 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test_end2end.py
@@ -160,20 +160,6 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(2)
 
     def test_06_connect_roadmA_PP1_to_xpdrA_N1(self):
-        url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links"
-        data = {
-            "networkutils:input": {
-                "networkutils:links-input": {
-                    "networkutils:xpdr-node": "XPDRA01",
-                    "networkutils:xpdr-num": "1",
-                    "networkutils:network-num": "1",
-                    "networkutils:rdm-node": "ROADMA01",
-                    "networkutils:srg-num": "1",
-                    "networkutils:termination-point-num": "SRG1-PP1-TXRX"
-                }
-            }
-        }
-        response = test_utils.post_request(url, data)
         response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "1",
                                                           "ROADMA01", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)

diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py
index e5a4dd89bb4e9b9b743a1a94bd2b6409f9680f68..3d8cf50dfa24da8ac6662e0baf2f2fbdf560cc58 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_topology.py
+++ b/tests/transportpce_tests/2.2.1/test_topology.py
@@ -278,36 +278,13 @@ class TransportPCEtesting(unittest.TestCase):
     # Connect the tail XPDRA to ROADMA and vice versa
     def test_10_connect_tail_xpdr_rdm(self):
         # Connect the tail: XPDRA to ROADMA
-        url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links"
-        data = {"networkutils:input": {
-            "networkutils:links-input": {
-                "networkutils:xpdr-node": "XPDR-A1",
-                "networkutils:xpdr-num": "1",
-                "networkutils:network-num": "1",
-                "networkutils:rdm-node": "ROADM-A1",
-                "networkutils:srg-num": "1",
-                "networkutils:termination-point-num": "SRG1-PP1-TXRX"
-            }
-        }
-        }
-        response = test_utils.post_request(url, data)
+        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1",
+                                                           "ROADM-A1", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
 
     def test_11_connect_tail_rdm_xpdr(self):
-        # Connect the tail: ROADMA to XPDRA
-        url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links"
-        data = {"networkutils:input": {
-            "networkutils:links-input": {
-                "networkutils:xpdr-node": "XPDR-A1",
-                "networkutils:xpdr-num": "1",
-                "networkutils:network-num": "1",
-                "networkutils:rdm-node": "ROADM-A1",
-                "networkutils:srg-num": "1",
-                "networkutils:termination-point-num": "SRG1-PP1-TXRX"
-            }
-        }
-        }
-        response = test_utils.post_request(url, data)
+        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1",
+                                                           "ROADM-A1", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
 
     def test_12_getLinks_OpenRoadmTopology(self):