From d01015f71d50a0e47110d73a640c1a8eb4f2dbd6 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Fri, 4 Sep 2020 10:41:16 +0200 Subject: [PATCH] run autopep8 on functional tests JIRA: TRNSPRTPCE-320 Signed-off-by: guillaume.lambert Change-Id: I6a4bc50291e1debde1ecf3bbdf57368ba235ace6 (cherry picked from commit 33dfc1e027c4eabdb78d5a30388840fa09a7157e) --- tests/transportpce_tests/1.2.1/test_gnpy.py | 48 ++++--- tests/transportpce_tests/1.2.1/test_pce.py | 129 ++++++++++-------- .../2.2.1/test_otn_renderer.py | 2 +- .../transportpce_tests/2.2.1/test_topology.py | 4 +- tests/transportpce_tests/common/test_utils.py | 40 +++--- 5 files changed, 122 insertions(+), 101 deletions(-) diff --git a/tests/transportpce_tests/1.2.1/test_gnpy.py b/tests/transportpce_tests/1.2.1/test_gnpy.py index 3b8b69be2..20e7d7578 100644 --- a/tests/transportpce_tests/1.2.1/test_gnpy.py +++ b/tests/transportpce_tests/1.2.1/test_gnpy.py @@ -94,8 +94,10 @@ class TransportGNPYtesting(unittest.TestCase): # Path computed by PCE is feasible according to Gnpy def test_04_path_computation_FeasibleWithPCE(self): response = test_utils.path_computation_request("request-1", "service-1", - {"node-id": "XPONDER-1", "service-rate": "100", "service-format": "Ethernet", "clli": "Node1"}, - {"node-id": "XPONDER-5", "service-rate": "100", "service-format": "Ethernet", "clli": "Node5"}) + {"node-id": "XPONDER-1", "service-rate": "100", + "service-format": "Ethernet", "clli": "Node1"}, + {"node-id": "XPONDER-5", "service-rate": "100", + "service-format": "Ethernet", "clli": "Node5"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ @@ -115,12 +117,14 @@ class TransportGNPYtesting(unittest.TestCase): # another one (low SNR) def test_05_path_computation_FoundByPCE_NotFeasibleByGnpy(self): response = test_utils.path_computation_request("request-2", "service-2", - {"node-id": "XPONDER-1", "service-rate": "100", "service-format": "Ethernet", "clli": "Node1"}, - {"node-id": "XPONDER-5", "service-rate": "100", "service-format": "Ethernet", "clli": "Node5"}, - {"include_": { "ordered-hops": [ - {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}}, - {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}, - {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-4"}}]}}) + {"node-id": "XPONDER-1", "service-rate": "100", + "service-format": "Ethernet", "clli": "Node1"}, + {"node-id": "XPONDER-5", "service-rate": "100", + "service-format": "Ethernet", "clli": "Node5"}, + {"include_": {"ordered-hops": [ + {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}}, + {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}, + {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-4"}}]}}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ @@ -141,11 +145,13 @@ class TransportGNPYtesting(unittest.TestCase): # #PCE cannot find a path while GNPy finds a feasible one def test_06_path_computation_NotFoundByPCE_FoundByGNPy(self): response = test_utils.path_computation_request("request-3", "service-3", - {"node-id": "XPONDER-1", "service-rate": "100", "service-format": "Ethernet", "clli": "Node1"}, - {"node-id": "XPONDER-4", "service-rate": "100", "service-format": "Ethernet", "clli": "Node5"}, - {"include_": {"ordered-hops": [ - {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}}, - {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}]}}) + {"node-id": "XPONDER-1", "service-rate": "100", + "service-format": "Ethernet", "clli": "Node1"}, + {"node-id": "XPONDER-4", "service-rate": "100", + "service-format": "Ethernet", "clli": "Node5"}, + {"include_": {"ordered-hops": [ + {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}}, + {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}]}}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ @@ -164,13 +170,15 @@ class TransportGNPYtesting(unittest.TestCase): # Not found path by PCE and GNPy cannot find another one def test_07_path_computation_FoundByPCE_NotFeasibleByGnpy(self): response = test_utils.path_computation_request("request-4", "service-4", - {"node-id": "XPONDER-1", "service-rate": "100", "service-format": "Ethernet", "clli": "Node1"}, - {"node-id": "XPONDER-4", "service-rate": "100", "service-format": "Ethernet", "clli": "Node5"}, - {"include_": {"ordered-hops": [ - {"hop-number": "0","hop-type": {"node-id": "OpenROADM-2"}}, - {"hop-number": "1","hop-type": {"node-id": "OpenROADM-3"}}, - {"hop-number": "2","hop-type": {"node-id": "OpenROADM-4"}}, - {"hop-number": "3","hop-type": {"node-id": "OpenROADM-3"}}]}}) + {"node-id": "XPONDER-1", "service-rate": "100", + "service-format": "Ethernet", "clli": "Node1"}, + {"node-id": "XPONDER-4", "service-rate": "100", + "service-format": "Ethernet", "clli": "Node5"}, + {"include_": {"ordered-hops": [ + {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}}, + {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}, + {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-4"}}, + {"hop-number": "3", "hop-type": {"node-id": "OpenROADM-3"}}]}}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ diff --git a/tests/transportpce_tests/1.2.1/test_pce.py b/tests/transportpce_tests/1.2.1/test_pce.py index be417d8f9..00aab10de 100644 --- a/tests/transportpce_tests/1.2.1/test_pce.py +++ b/tests/transportpce_tests/1.2.1/test_pce.py @@ -96,8 +96,9 @@ class TransportPCEtesting(unittest.TestCase): # Path Computation success def test_04_path_computation_xpdr_bi(self): response = test_utils.path_computation_request("request-1", "service-1", - {"node-id": "XPDRA01", "service-rate": "100", "service-format": "Ethernet", "clli": "nodeA"}, - {"node-id": "XPDRC01", "service-rate": "100", "service-format": "Ethernet", "clli": "nodeC"}) + {"node-id": "XPDRA01", "service-rate": "100", + "service-format": "Ethernet", "clli": "nodeA"}, + {"node-id": "XPDRC01", "service-rate": "100", "service-format": "Ethernet", "clli": "nodeC"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -107,8 +108,9 @@ class TransportPCEtesting(unittest.TestCase): # Path Computation success def test_05_path_computation_rdm_bi(self): response = test_utils.path_computation_request("request-1", "service-1", - {"node-id": "ROADMA01", "service-rate": "100", "service-format": "Ethernet", "clli": "NodeA"}, - {"node-id": "ROADMC01", "service-rate": "100", "service-format": "Ethernet", "clli": "NodeC"}) + {"node-id": "ROADMA01", "service-rate": "100", + "service-format": "Ethernet", "clli": "NodeA"}, + {"node-id": "ROADMC01", "service-rate": "100", "service-format": "Ethernet", "clli": "NodeC"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -156,8 +158,9 @@ class TransportPCEtesting(unittest.TestCase): # Path Computation success def test_11_path_computation_xpdr_uni(self): response = test_utils.path_computation_request("request-1", "service-1", - {"node-id": "XPONDER-1-2", "service-rate": "100", "service-format": "Ethernet", "clli": "ORANGE1"}, - {"node-id": "XPONDER-3-2", "service-rate": "100", "service-format": "Ethernet", "clli": "ORANGE3"}) + {"node-id": "XPONDER-1-2", "service-rate": "100", + "service-format": "Ethernet", "clli": "ORANGE1"}, + {"node-id": "XPONDER-3-2", "service-rate": "100", "service-format": "Ethernet", "clli": "ORANGE3"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -167,8 +170,9 @@ class TransportPCEtesting(unittest.TestCase): # Path Computation success def test_12_path_computation_rdm_uni(self): response = test_utils.path_computation_request("request1", "service1", - {"service-rate": "100", "service-format": "Ethernet", "clli": "cll21", "node-id": "OpenROADM-2-1"}, - {"service-rate": "100", "service-format": "Ethernet", "clli": "ncli22", "node-id": "OpenROADM-2-2"}) + {"service-rate": "100", "service-format": "Ethernet", + "clli": "cll21", "node-id": "OpenROADM-2-1"}, + {"service-rate": "100", "service-format": "Ethernet", "clli": "ncli22", "node-id": "OpenROADM-2-2"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -218,7 +222,7 @@ class TransportPCEtesting(unittest.TestCase): # Test failed path computation def test_17_fail_path_computation(self): response = test_utils.post_request(test_utils.URL_PATH_COMPUTATION_REQUEST, - {"input": { "service-handler-header": { "request-id": "request-1" }}}) + {"input": {"service-handler-header": {"request-id": "request-1"}}}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Service Name is not set', @@ -228,47 +232,49 @@ class TransportPCEtesting(unittest.TestCase): # Test1 success path computation def test_18_success1_path_computation(self): response = test_utils.path_computation_request("request1", "service1", - {"service-format": "Ethernet","service-rate": "100", "clli": "ORANGE2", "node-id": "XPONDER-2-2", - "tx-direction": {"port": { - "port-device-name": "Some port-device-name", - "port-type": "Some port-type", - "port-name": "Some port-name", - "port-rack": "Some port-rack", - "port-shelf": "Some port-shelf", - "port-slot": "Some port-slot", - "port-sub-slot": "Some port-sub-slot" - }}, - "rx-direction": {"port": { - "port-device-name": "Some port-device-name", - "port-type": "Some port-type", - "port-name": "Some port-name", - "port-rack": "Some port-rack", - "port-shelf": "Some port-shelf", - "port-slot": "Some port-slot", - "port-sub-slot": "Some port-sub-slot" - }}}, - {"service-format": "Ethernet", "service-rate": "100", "clli": "ORANGE1", "node-id": "XPONDER-1-2", - "tx-direction": {"port": { - "port-device-name": "Some port-device-name", - "port-type": "Some port-type", - "port-name": "Some port-name", - "port-rack": "Some port-rack", - "port-shelf": "Some port-shelf", - "port-slot": "Some port-slot", - "port-sub-slot": "Some port-sub-slot" - }}, - "rx-direction": {"port": { - "port-device-name": "Some port-device-name", - "port-type": "Some port-type", - "port-name": "Some port-name", - "port-rack": "Some port-rack", - "port-shelf": "Some port-shelf", - "port-slot": "Some port-slot", - "port-sub-slot": "Some port-sub-slot" - }}}, - {"customer-code": ["Some customer-code"], "co-routing": {"existing-service": ["Some existing-service"]}}, - {"customer-code": ["Some customer-code"], "co-routing": {"existing-service": ["Some existing-service"]}}, - "hop-count", {"locally-protected-links": "true"}) + {"service-format": "Ethernet", "service-rate": "100", "clli": "ORANGE2", "node-id": "XPONDER-2-2", + "tx-direction": {"port": { + "port-device-name": "Some port-device-name", + "port-type": "Some port-type", + "port-name": "Some port-name", + "port-rack": "Some port-rack", + "port-shelf": "Some port-shelf", + "port-slot": "Some port-slot", + "port-sub-slot": "Some port-sub-slot" + }}, + "rx-direction": {"port": { + "port-device-name": "Some port-device-name", + "port-type": "Some port-type", + "port-name": "Some port-name", + "port-rack": "Some port-rack", + "port-shelf": "Some port-shelf", + "port-slot": "Some port-slot", + "port-sub-slot": "Some port-sub-slot" + }}}, + {"service-format": "Ethernet", "service-rate": "100", "clli": "ORANGE1", "node-id": "XPONDER-1-2", + "tx-direction": {"port": { + "port-device-name": "Some port-device-name", + "port-type": "Some port-type", + "port-name": "Some port-name", + "port-rack": "Some port-rack", + "port-shelf": "Some port-shelf", + "port-slot": "Some port-slot", + "port-sub-slot": "Some port-sub-slot" + }}, + "rx-direction": {"port": { + "port-device-name": "Some port-device-name", + "port-type": "Some port-type", + "port-name": "Some port-name", + "port-rack": "Some port-rack", + "port-shelf": "Some port-shelf", + "port-slot": "Some port-slot", + "port-sub-slot": "Some port-sub-slot" + }}}, + {"customer-code": ["Some customer-code"], + "co-routing": {"existing-service": ["Some existing-service"]}}, + {"customer-code": ["Some customer-code"], + "co-routing": {"existing-service": ["Some existing-service"]}}, + "hop-count", {"locally-protected-links": "true"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -278,8 +284,9 @@ class TransportPCEtesting(unittest.TestCase): # Test2 success path computation with path description def test_19_success2_path_computation(self): response = test_utils.path_computation_request("request 1", "service 1", - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"}, - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-3-2", "clli": "ORANGE3"}) + {"service-rate": "100", "service-format": "Ethernet", + "node-id": "XPONDER-1-2", "clli": "ORANGE1"}, + {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-3-2", "clli": "ORANGE3"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -293,9 +300,11 @@ class TransportPCEtesting(unittest.TestCase): # Test3 success path computation with hard-constraints exclude def test_20_success3_path_computation(self): response = test_utils.path_computation_request("request 1", "service 1", - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"}, - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-3-2", "clli": "ORANGE3"}, - {"exclude_": { "node-id": ["OpenROADM-2-1", "OpenROADM-2-2"] }}) + {"service-rate": "100", "service-format": "Ethernet", + "node-id": "XPONDER-1-2", "clli": "ORANGE1"}, + {"service-rate": "100", "service-format": "Ethernet", + "node-id": "XPONDER-3-2", "clli": "ORANGE3"}, + {"exclude_": {"node-id": ["OpenROADM-2-1", "OpenROADM-2-2"]}}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -309,8 +318,9 @@ class TransportPCEtesting(unittest.TestCase): # Path computation before deleting oms-attribute of the link :openroadm1-3 to openroadm1-2 def test_21_path_computation_before_oms_attribute_deletion(self): response = test_utils.path_computation_request("request 1", "service 1", - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-2-2", "clli": "ORANGE2"}, - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"}) + {"service-rate": "100", "service-format": "Ethernet", + "node-id": "XPONDER-2-2", "clli": "ORANGE2"}, + {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -336,8 +346,9 @@ class TransportPCEtesting(unittest.TestCase): # Path computation after deleting oms-attribute of the link :openroadm1-3 to openroadm1-2 def test_23_path_computation_after_oms_attribute_deletion(self): response = test_utils.path_computation_request("request 1", "service 1", - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-2-2", "clli": "ORANGE2"}, - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"}) + {"service-rate": "100", "service-format": "Ethernet", + "node-id": "XPONDER-2-2", "clli": "ORANGE2"}, + {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py index e5a3816f7..35262a5f5 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py @@ -220,7 +220,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertTrue(res["output"]["success"]) self.assertEqual('SPDR-SA1', res["output"]['node-interface'][0]['node-id']) self.assertIn('XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1', - res["output"]['node-interface'][0]['connection-id']) + res["output"]['node-interface'][0]['connection-id']) self.assertIn('XPDR1-CLIENT4-ETHERNET10G', res["output"]['node-interface'][0]['eth-interface-id']) self.assertIn('XPDR1-NETWORK1-ODU2e-service1', res["output"]['node-interface'][0]['odu-interface-id']) self.assertIn('XPDR1-CLIENT4-ODU2e-service1', res["output"]['node-interface'][0]['odu-interface-id']) diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py index 3d8cf50df..c90f0a430 100644 --- a/tests/transportpce_tests/2.2.1/test_topology.py +++ b/tests/transportpce_tests/2.2.1/test_topology.py @@ -279,12 +279,12 @@ class TransportPCEtesting(unittest.TestCase): def test_10_connect_tail_xpdr_rdm(self): # Connect the tail: XPDRA to ROADMA response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1", - "ROADM-A1", "1", "SRG1-PP1-TXRX") + "ROADM-A1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) def test_11_connect_tail_rdm_xpdr(self): response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1", - "ROADM-A1", "1", "SRG1-PP1-TXRX") + "ROADM-A1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) def test_12_getLinks_OpenRoadmTopology(self): diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index 3a2d6e9ea..ee5df6997 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -329,18 +329,19 @@ def get_service_list_request(suffix: str): def service_create_request(attr): return post_request(URL_SERV_CREATE, attr) -def service_delete_request(servicename : str, - requestid = "e3028bae-a90f-4ddd-a83f-cf224eba0e58", + +def service_delete_request(servicename: str, + requestid="e3028bae-a90f-4ddd-a83f-cf224eba0e58", notificationurl="http://localhost:8585/NotificationServer/notify"): attr = {"input": { - "sdnc-request-header": { - "request-id": requestid, - "rpc-action": "service-delete", - "request-system-id": "appname", - "notification-url": notificationurl}, - "service-delete-req-info": { - "service-name": servicename, - "tail-retention": "no"}}} + "sdnc-request-header": { + "request-id": requestid, + "rpc-action": "service-delete", + "request-system-id": "appname", + "notification-url": notificationurl}, + "service-delete-req-info": { + "service-name": servicename, + "tail-retention": "no"}}} return post_request(URL_SERV_DELETE, attr) @@ -371,21 +372,22 @@ def create_ots_oms_request(nodeid: str, lcp: str): "logical-connection-point": lcp}} return post_request(URL_CREATE_OTS_OMS, attr) + def path_computation_request(requestid: str, servicename: str, serviceaend, servicezend, hardconstraints=None, softconstraints=None, metric="hop-count", other_attr=None): - attr = {"service-name": servicename, - "resource-reserve": "true", - "service-handler-header": { "request-id": requestid }, - "service-a-end": serviceaend, - "service-z-end": servicezend, - "pce-metric": metric} + attr = {"service-name": servicename, + "resource-reserve": "true", + "service-handler-header": {"request-id": requestid}, + "service-a-end": serviceaend, + "service-z-end": servicezend, + "pce-metric": metric} if hardconstraints: - attr.update({ "hard-constraints": hardconstraints}) + attr.update({"hard-constraints": hardconstraints}) if softconstraints: - attr.update({ "soft-constraints": softconstraints}) + attr.update({"soft-constraints": softconstraints}) if other_attr: attr.update(other_attr) - return post_request(URL_PATH_COMPUTATION_REQUEST, {"input": attr }) + return post_request(URL_PATH_COMPUTATION_REQUEST, {"input": attr}) def shutdown_process(process): -- 2.36.6