From 764a00cec0dd3a9b04701a009cfd9728493a9a73 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Thu, 16 Jul 2020 14:50:07 +0200 Subject: [PATCH] add methods to manage service list in func tests Signed-off-by: guillaume.lambert Change-Id: I3348586596dd26ccf5ccf286029af326704a0954 --- .../transportpce_tests/1.2.1/test_end2end.py | 33 +- .../transportpce_tests/2.2.1/test_end2end.py | 33 +- .../2.2.1/test_otn_end2end.py | 453 ++++++------------ tests/transportpce_tests/common/test_utils.py | 9 + 4 files changed, 165 insertions(+), 363 deletions(-) diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py index 76a34cd6c..ebacc2868 100644 --- a/tests/transportpce_tests/1.2.1/test_end2end.py +++ b/tests/transportpce_tests/1.2.1/test_end2end.py @@ -138,7 +138,6 @@ class TransportPCEFulltesting(unittest.TestCase): # test service-create for Eth service from xpdr to xpdr def test_11_create_eth_service1(self): - url = "{}/operations/org-openroadm-service:service-create" data = { "input": { "sdnc-request-header": { @@ -237,7 +236,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -246,8 +245,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_12_get_eth_service1(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -403,7 +401,6 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_22_create_eth_service2(self): - url = "{}/operations/org-openroadm-service:service-create" data = { "input": { "sdnc-request-header": { @@ -502,7 +499,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -511,8 +508,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_23_get_eth_service2(self): - url = "{}/operational/org-openroadm-service:service-list/services/service2" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -632,7 +628,6 @@ class TransportPCEFulltesting(unittest.TestCase): # creation service test on a non-available resource def test_28_create_eth_service3(self): - url = "{}/operations/org-openroadm-service:service-create" data = { "input": { "sdnc-request-header": { @@ -731,7 +726,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -892,7 +887,6 @@ class TransportPCEFulltesting(unittest.TestCase): # test service-create for Optical Channel (OC) service from srg-pp to srg-pp def test_36_create_oc_service1(self): - url = "{}/operations/org-openroadm-service:service-create" data = { "input": { "sdnc-request-header": { @@ -991,7 +985,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1000,8 +994,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_37_get_oc_service1(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1060,7 +1053,6 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(7) def test_40_create_oc_service2(self): - url = "{}/operations/org-openroadm-service:service-create" data = { "input": { "sdnc-request-header": { @@ -1159,7 +1151,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1168,8 +1160,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_41_get_oc_service2(self): - url = "{}/operational/org-openroadm-service:service-list/services/service2" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1260,8 +1251,7 @@ class TransportPCEFulltesting(unittest.TestCase): def test_46_get_no_oc_services(self): print("start test") - url = "{}/operational/org-openroadm-service:service-list" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -1299,8 +1289,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_30_delete_eth_service1() def test_50_loop_create_oc_service(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1") if response.status_code != 404: url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py index a9078c5d2..6b86cfdd7 100644 --- a/tests/transportpce_tests/2.2.1/test_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_end2end.py @@ -115,7 +115,6 @@ class TransportPCEFulltesting(unittest.TestCase): # test service-create for Eth service from xpdr to xpdr def test_11_create_eth_service1(self): - url = "{}/operations/org-openroadm-service:service-create" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -204,7 +203,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -212,8 +211,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_12_get_eth_service1(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -351,7 +349,6 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_22_create_eth_service2(self): - url = "{}/operations/org-openroadm-service:service-create" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -440,7 +437,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -448,8 +445,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_23_get_eth_service2(self): - url = "{}/operational/org-openroadm-service:service-list/services/service2" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -553,7 +549,6 @@ class TransportPCEFulltesting(unittest.TestCase): # creation service test on a non-available resource def test_28_create_eth_service3(self): - url = "{}/operations/org-openroadm-service:service-create" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -642,7 +637,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -774,7 +769,6 @@ class TransportPCEFulltesting(unittest.TestCase): # test service-create for Optical Channel (OC) service from srg-pp to srg-pp def test_36_create_oc_service1(self): - url = "{}/operations/org-openroadm-service:service-create" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -863,7 +857,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -871,8 +865,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_37_get_oc_service1(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -929,7 +922,6 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(7) def test_40_create_oc_service2(self): - url = "{}/operations/org-openroadm-service:service-create" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1018,7 +1010,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1026,8 +1018,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_41_get_oc_service2(self): - url = "{}/operational/org-openroadm-service:service-list/services/service2" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1113,8 +1104,7 @@ class TransportPCEFulltesting(unittest.TestCase): def test_46_get_no_oc_services(self): print("start test") - url = "{}/operational/org-openroadm-service:service-list" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -1147,8 +1137,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_30_delete_eth_service1() def test_50_loop_create_oc_service(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1") if response.status_code != 404: url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { diff --git a/tests/transportpce_tests/2.2.1/test_otn_end2end.py b/tests/transportpce_tests/2.2.1/test_otn_end2end.py index 0e6acc1f7..2d59e1dd3 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py @@ -20,6 +20,110 @@ class TransportPCEtesting(unittest.TestCase): processes = None WAITING = 20 # nominal value is 300 + cr_serv_sample_data = {"input": { + "sdnc-request-header": { + "request-id": "request-1", + "rpc-action": "service-create", + "request-system-id": "appname" + }, + "service-name": "service1-OCH-OTU4", + "common-id": "commonId", + "connection-type": "infrastructure", + "service-a-end": { + "service-rate": "100", + "node-id": "SPDR-SA1", + "service-format": "OTU", + "otu-service-rate": "org-openroadm-otn-common-types:OTU4", + "clli": "NodeSA", + "subrate-eth-sla": { + "subrate-eth-sla": { + "committed-info-rate": "100000", + "committed-burst-size": "64" + } + }, + "tx-direction": { + "port": { + "port-device-name": "SPDR-SA1-XPDR1", + "port-type": "fixed", + "port-name": "XPDR1-NETWORK1", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" + }, + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } + }, + "rx-direction": { + "port": { + "port-device-name": "SPDR-SA1-XPDR1", + "port-type": "fixed", + "port-name": "XPDR1-NETWORK1", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" + }, + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } + }, + "optic-type": "gray" + }, + "service-z-end": { + "service-rate": "100", + "node-id": "SPDR-SC1", + "service-format": "OTU", + "otu-service-rate": "org-openroadm-otn-common-types:OTU4", + "clli": "NodeSC", + "subrate-eth-sla": { + "subrate-eth-sla": { + "committed-info-rate": "100000", + "committed-burst-size": "64" + } + }, + "tx-direction": { + "port": { + "port-device-name": "SPDR-SC1-XPDR1", + "port-type": "fixed", + "port-name": "XPDR1-NETWORK1", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" + }, + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } + }, + "rx-direction": { + "port": { + "port-device-name": "SPDR-SC1-XPDR1", + "port-type": "fixed", + "port-name": "XPDR1-NETWORK1", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" + }, + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } + }, + "optic-type": "gray" + }, + "due-date": "2018-06-15T00:00:01Z", + "operator-contact": "pw1234" + } + } + + + @classmethod def setUpClass(cls): cls.processes = test_utils.start_tpce() @@ -121,110 +225,9 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(nbNode, 4) self.assertNotIn('ietf-network-topology:link', res['network'][0]) + def test_12_create_OCH_OTU4_service(self): - url = "{}/operations/org-openroadm-service:service-create" - data = {"input": { - "sdnc-request-header": { - "request-id": "request-1", - "rpc-action": "service-create", - "request-system-id": "appname" - }, - "service-name": "service1-OCH-OTU4", - "common-id": "commonId", - "connection-type": "infrastructure", - "service-a-end": { - "service-rate": "100", - "node-id": "SPDR-SA1", - "service-format": "OTU", - "otu-service-rate": "org-openroadm-otn-common-types:OTU4", - "clli": "NodeSA", - "subrate-eth-sla": { - "subrate-eth-sla": { - "committed-info-rate": "100000", - "committed-burst-size": "64" - } - }, - "tx-direction": { - "port": { - "port-device-name": "SPDR-SA1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "SPDR-SA1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "SPDR-SC1", - "service-format": "OTU", - "otu-service-rate": "org-openroadm-otn-common-types:OTU4", - "clli": "NodeSC", - "subrate-eth-sla": { - "subrate-eth-sla": { - "committed-info-rate": "100000", - "committed-burst-size": "64" - } - }, - "tx-direction": { - "port": { - "port-device-name": "SPDR-SC1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "SPDR-SC1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2018-06-15T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -232,8 +235,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(self.WAITING) def test_13_get_OCH_OTU4_service1(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1-OCH-OTU4" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1-OCH-OTU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -402,109 +404,15 @@ class TransportPCEtesting(unittest.TestCase): # test service-create for ODU4 service from spdr to spdr def test_23_create_ODU4_service(self): - url = "{}/operations/org-openroadm-service:service-create" - data = {"input": { - "sdnc-request-header": { - "request-id": "request-1", - "rpc-action": "service-create", - "request-system-id": "appname" - }, - "service-name": "service1-ODU4", - "common-id": "commonId", - "connection-type": "infrastructure", - "service-a-end": { - "service-rate": "100", - "node-id": "SPDR-SA1", - "service-format": "ODU", - "odu-service-rate": "org-openroadm-otn-common-types:ODU4", - "clli": "NodeSA", - "subrate-eth-sla": { - "subrate-eth-sla": { - "committed-info-rate": "100000", - "committed-burst-size": "64" - } - }, - "tx-direction": { - "port": { - "port-device-name": "SPDR-SA1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "SPDR-SA1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "SPDR-SC1", - "service-format": "ODU", - "odu-service-rate": "org-openroadm-otn-common-types:ODU4", - "clli": "NodeSC", - "subrate-eth-sla": { - "subrate-eth-sla": { - "committed-info-rate": "100000", - "committed-burst-size": "64" - } - }, - "tx-direction": { - "port": { - "port-device-name": "SPDR-SC1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "SPDR-SC1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2018-06-15T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.post_request(url, data) + self.cr_serv_sample_data["input"]["service-name"] = "service1-ODU4" + self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "ODU" + del self.cr_serv_sample_data["input"]["service-a-end"]["otu-service-rate"] + self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4" + self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "ODU" + del self.cr_serv_sample_data["input"]["service-z-end"]["otu-service-rate"] + self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4" + + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -512,8 +420,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(self.WAITING) def test_24_get_ODU4_service1(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1-ODU4" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -622,107 +529,19 @@ class TransportPCEtesting(unittest.TestCase): # test service-create for 10GE service from spdr to spdr def test_29_create_10GE_service(self): - url = "{}/operations/org-openroadm-service:service-create" - data = {"input": { - "sdnc-request-header": { - "request-id": "request-1", - "rpc-action": "service-create", - "request-system-id": "appname" - }, - "service-name": "service1-10GE", - "common-id": "commonId", - "connection-type": "service", - "service-a-end": { - "service-rate": "10", - "node-id": "SPDR-SA1", - "service-format": "Ethernet", - "clli": "NodeSA", - "subrate-eth-sla": { - "subrate-eth-sla": { - "committed-info-rate": "100000", - "committed-burst-size": "64" - } - }, - "tx-direction": { - "port": { - "port-device-name": "SPDR-SA1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-CLIENT1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "SPDR-SA1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-CLIENT1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "10", - "node-id": "SPDR-SC1", - "service-format": "Ethernet", - "clli": "NodeSC", - "subrate-eth-sla": { - "subrate-eth-sla": { - "committed-info-rate": "100000", - "committed-burst-size": "64" - } - }, - "tx-direction": { - "port": { - "port-device-name": "SPDR-SC1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-CLIENT1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "SPDR-SC1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-CLIENT1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2018-06-15T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.post_request(url, data) + self.cr_serv_sample_data["input"]["service-name"] = "service1-10GE" + self.cr_serv_sample_data["input"]["connection-type"] = "service" + self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "10" + self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet" + del self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "10" + self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet" + del self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -730,8 +549,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(self.WAITING) def test_30_get_10GE_service1(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1-10GE" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1-10GE") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -973,8 +791,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(20) def test_42_check_service_list(self): - url = "{}/operational/org-openroadm-service:service-list" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(len(res['service-list']['services']), 2) @@ -1047,8 +864,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(20) def test_50_check_service_list(self): - url = "{}/operational/org-openroadm-service:service-list" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(len(res['service-list']['services']), 1) @@ -1096,8 +912,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(20) def test_55_get_no_service(self): - url = "{}/operational/org-openroadm-service:service-list" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index 2abe3ee76..a8985fb97 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -40,6 +40,8 @@ URL_CONFIG_OTN_TOPO = "{}/config/ietf-network:networks/network/otn-topology/" URL_CONFIG_CLLI_NET = "{}/config/ietf-network:networks/network/clli-network/" URL_CONFIG_ORDM_NET = "{}/config/ietf-network:networks/network/openroadm-network/" URL_PORTMAPPING = "{}/config/transportpce-portmapping:network/nodes/" +URL_OPER_SERV_LIST = "{}/operational/org-openroadm-service:service-list/" +URL_SERV_CREATE = "{}/operations/org-openroadm-service:service-create" TYPE_APPLICATION_JSON = {'Content-Type': 'application/json', 'Accept': 'application/json'} TYPE_APPLICATION_XML = {'Content-Type': 'application/xml', 'Accept': 'application/xml'} @@ -313,6 +315,13 @@ def portmapping_request(suffix: str): url = URL_PORTMAPPING + suffix return get_request(url) +def get_service_list_request(suffix: str): + url = URL_OPER_SERV_LIST + suffix + return get_request(url) + +def service_create_request(attr): + return post_request(URL_SERV_CREATE, attr) + def shutdown_process(process): if process is not None: -- 2.36.6