sys.path.append('transportpce_tests/common/')
# pylint: disable=wrong-import-position
# pylint: disable=import-error
-import test_utils # nopep8
+import test_utils_rfc8040 # nopep8
class TransportPCEFulltesting(unittest.TestCase):
processes = None
- cr_serv_sample_data = {"input": {
+ cr_serv_input_data = {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
"rpc-action": "service-create",
"due-date": "2016-11-28T00:00:01Z",
"operator-contact": "pw1234"
}
+
+ del_serv_input_data = {
+ "sdnc-request-header": {
+ "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+ "rpc-action": "service-delete",
+ "request-system-id": "appname",
+ "notification-url": "http://localhost:8585/NotificationServer/notify"},
+ "service-delete-req-info": {
+ "service-name": "TBD",
+ "tail-retention": "no"}
}
WAITING = 25 # nominal value is 300
@classmethod
def setUpClass(cls):
- cls.processes = test_utils.start_tpce()
- cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION_121),
- ('roadma', cls.NODE_VERSION_221),
- ('roadmc', cls.NODE_VERSION_221),
- ('xpdrc', cls.NODE_VERSION_71)])
+ cls.processes = test_utils_rfc8040.start_tpce()
+ cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION_121),
+ ('roadma', cls.NODE_VERSION_221),
+ ('roadmc', cls.NODE_VERSION_221),
+ ('xpdrc', cls.NODE_VERSION_71)])
@classmethod
def tearDownClass(cls):
# pylint: disable=not-an-iterable
for process in cls.processes:
- test_utils.shutdown_process(process)
+ test_utils_rfc8040.shutdown_process(process)
print("all processes killed")
- time.sleep(10)
+ time.sleep(3)
def setUp(self): # instruction executed before each test method
# pylint: disable=consider-using-f-string
print("execution of {}".format(self.id().split(".")[-1]))
def test_01_connect_xpdrA(self):
- response = test_utils.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION_121))
- self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ response = test_utils_rfc8040.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION_121))
+ self.assertEqual(response.status_code,
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_02_connect_xpdrC(self):
- response = test_utils.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION_71))
- self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ response = test_utils_rfc8040.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION_71))
+ self.assertEqual(response.status_code,
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_03_connect_rdmA(self):
- response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
- self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
+ self.assertEqual(response.status_code,
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_04_connect_rdmC(self):
- response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
- self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
+ self.assertEqual(response.status_code,
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_05_connect_xprdA_N1_to_roadmA_PP1(self):
- response = test_utils.connect_xpdr_to_rdm_request("XPDRA01", "1", "1",
- "ROADM-A1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-xpdr-rdm-links',
+ {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
def test_06_connect_roadmA_PP1_to_xpdrA_N1(self):
- response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "1",
- "ROADM-A1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-rdm-xpdr-links',
+ {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
def test_07_connect_xprdC_N1_to_roadmC_PP1(self):
- response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "1",
- "ROADM-C1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-xpdr-rdm-links',
+ {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
def test_08_connect_roadmC_PP1_to_xpdrC_N1(self):
- response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "1",
- "ROADM-C1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-rdm-xpdr-links',
+ {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
def test_09_add_omsAttributes_ROADMA_ROADMC(self):
# Config ROADMA-ROADMC oms-attributes
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
+ response = test_utils_rfc8040.add_oms_attr_request(
+ "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
def test_10_add_omsAttributes_ROADMC_ROADMA(self):
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
+ response = test_utils_rfc8040.add_oms_attr_request(
+ "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
# test service-create for Eth service from xpdr to xpdr
def test_11_create_eth_service1(self):
- self.cr_serv_sample_data["input"]["service-name"] = "service1"
- response = test_utils.service_create_request(self.cr_serv_sample_data)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-create',
+ self.cr_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_12_get_eth_service1(self):
- response = test_utils.get_service_list_request("services/service1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual(
- res['services'][0]['administrative-state'], 'inService')
- self.assertEqual(
- res['services'][0]['service-name'], 'service1')
- self.assertEqual(
- res['services'][0]['connection-type'], 'service')
- self.assertEqual(
- res['services'][0]['lifecycle-state'], 'planned')
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_attr_request(
+ "services", "service1")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['connection-type'], 'service')
+ self.assertEqual(response['services'][0]['service-name'], 'service1')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+ time.sleep(1)
def test_13_change_status_line_port_xpdra(self):
url = "{}/config/org-openroadm-device:org-openroadm-device/circuit-packs/1%2F0%2F1-PLUG-NET/ports/1"
"administrative-state": "outOfService",
"port-qual": "xpdr-network"}]}
response = requests.request("PUT", url.format("http://127.0.0.1:8130/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(2)
def test_14_check_update_portmapping(self):
- response = test_utils.portmapping_request("XPDRA01")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- mapping_list = res['nodes'][0]['mapping']
+ response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", None, None)
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ mapping_list = response['nodes'][0]['mapping']
for mapping in mapping_list:
if mapping['logical-connection-point'] == 'XPDR1-NETWORK1':
self.assertEqual(mapping['port-oper-state'], 'OutOfService',
time.sleep(1)
def test_15_check_update_openroadm_topo(self):
- url = test_utils.URL_CONFIG_ORDM_TOPO
- response = test_utils.get_request(url)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- node_list = res['network'][0]['node']
+ response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ node_list = response['network'][0]['node']
nb_updated_tp = 0
for node in node_list:
self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
self.assertEqual(nb_updated_tp, 1, "Only one termination-point should have been modified")
- link_list = res['network'][0]['ietf-network-topology:link']
+ link_list = response['network'][0]['ietf-network-topology:link']
updated_links = ['XPDRA01-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX',
'ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1']
nb_updated_link = 0
time.sleep(1)
def test_16_check_update_service1(self):
- response = test_utils.get_service_list_request("services/service1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual(res['services'][0]['operational-state'], 'outOfService')
- self.assertEqual(res['services'][0]['administrative-state'], 'inService')
+ response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['operational-state'], 'outOfService')
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
time.sleep(1)
def test_17_restore_status_line_port_xpdra(self):
"administrative-state": "inService",
"port-qual": "xpdr-network"}]}
response = requests.request("PUT", url.format("http://127.0.0.1:8130/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(2)
def test_18_check_update_portmapping_ok(self):
- response = test_utils.portmapping_request("XPDRA01")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- mapping_list = res['nodes'][0]['mapping']
+ response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", None, None)
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ mapping_list = response['nodes'][0]['mapping']
for mapping in mapping_list:
self.assertEqual(mapping['port-oper-state'], 'InService',
"Operational State should be 'InService'")
time.sleep(1)
def test_19_check_update_openroadm_topo_ok(self):
- url = test_utils.URL_CONFIG_ORDM_TOPO
- response = test_utils.get_request(url)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- node_list = res['network'][0]['node']
+ response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ node_list = response['network'][0]['node']
for node in node_list:
self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
self.assertEqual(node['org-openroadm-common-network:administrative-state'], 'inService')
self.assertEqual(tp['org-openroadm-common-network:operational-state'], 'inService')
self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
- link_list = res['network'][0]['ietf-network-topology:link']
+ link_list = response['network'][0]['ietf-network-topology:link']
for link in link_list:
self.assertEqual(link['org-openroadm-common-network:operational-state'], 'inService')
self.assertEqual(link['org-openroadm-common-network:administrative-state'], 'inService')
"administrative-state": "outOfService",
"port-qual": "roadm-external"}]}
response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(2)
def test_22_check_update_portmapping(self):
- response = test_utils.portmapping_request("ROADM-A1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- mapping_list = res['nodes'][0]['mapping']
+ response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", None, None)
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ mapping_list = response['nodes'][0]['mapping']
for mapping in mapping_list:
if mapping['logical-connection-point'] == 'SRG1-PP1-TXRX':
self.assertEqual(mapping['port-oper-state'], 'OutOfService',
time.sleep(1)
def test_23_check_update_openroadm_topo(self):
- url = test_utils.URL_CONFIG_ORDM_TOPO
- response = test_utils.get_request(url)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- node_list = res['network'][0]['node']
+ response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ node_list = response['network'][0]['node']
nb_updated_tp = 0
for node in node_list:
self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
self.assertEqual(nb_updated_tp, 1, "Only one termination-point should have been modified")
- link_list = res['network'][0]['ietf-network-topology:link']
+ link_list = response['network'][0]['ietf-network-topology:link']
updated_links = ['XPDRA01-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX',
'ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1']
nb_updated_link = 0
"administrative-state": "inService",
"port-qual": "roadm-external"}]}
response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(2)
"administrative-state": "outOfService",
"port-qual": "roadm-external"}]}
response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(2)
def test_29_check_update_portmapping(self):
- response = test_utils.portmapping_request("ROADM-A1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- mapping_list = res['nodes'][0]['mapping']
+ response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", None, None)
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ mapping_list = response['nodes'][0]['mapping']
for mapping in mapping_list:
if mapping['logical-connection-point'] == 'DEG2-TTP-TXRX':
self.assertEqual(mapping['port-oper-state'], 'OutOfService',
time.sleep(1)
def test_30_check_update_openroadm_topo(self):
- url = test_utils.URL_CONFIG_ORDM_TOPO
- response = test_utils.get_request(url)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- node_list = res['network'][0]['node']
+ response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ node_list = response['network'][0]['node']
nb_updated_tp = 0
for node in node_list:
self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
self.assertEqual(nb_updated_tp, 1, "Only one termination-point should have been modified")
- link_list = res['network'][0]['ietf-network-topology:link']
+ link_list = response['network'][0]['ietf-network-topology:link']
updated_links = ['ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX',
'ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX']
nb_updated_link = 0
"administrative-state": "inService",
"port-qual": "roadm-external"}]}
response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(2)
"administrative-state": "outOfService",
"port-qual": "xpdr-network"}]}
response = requests.request("PUT", url.format("http://127.0.0.1:8154/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(2)
def test_36_check_update_portmapping(self):
- response = test_utils.portmapping_request("XPDR-C1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- mapping_list = res['nodes'][0]['mapping']
+ response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-C1", None, None)
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ mapping_list = response['nodes'][0]['mapping']
for mapping in mapping_list:
if mapping['logical-connection-point'] == 'XPDR1-NETWORK1':
self.assertEqual(mapping['port-oper-state'], 'OutOfService',
time.sleep(1)
def test_37_check_update_openroadm_topo(self):
- url = test_utils.URL_CONFIG_ORDM_TOPO
- response = test_utils.get_request(url)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- node_list = res['network'][0]['node']
+ response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ node_list = response['network'][0]['node']
nb_updated_tp = 0
for node in node_list:
self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
self.assertEqual(nb_updated_tp, 1, "Only one termination-point should have been modified")
- link_list = res['network'][0]['ietf-network-topology:link']
+ link_list = response['network'][0]['ietf-network-topology:link']
updated_links = ['XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX',
'ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1']
nb_updated_link = 0
"administrative-state": "inService",
"port-qual": "xpdr-network"}]}
response = requests.request("PUT", url.format("http://127.0.0.1:8154/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(2)
"administrative-state": "outOfService",
"port-qual": "roadm-external"}]}
response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(2)
def test_43_check_update_portmapping(self):
- response = test_utils.portmapping_request("ROADM-A1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- mapping_list = res['nodes'][0]['mapping']
+ response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", None, None)
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ mapping_list = response['nodes'][0]['mapping']
for mapping in mapping_list:
if mapping['logical-connection-point'] == 'SRG1-PP2-TXRX':
self.assertEqual(mapping['port-oper-state'], 'OutOfService',
time.sleep(1)
def test_44_check_update_openroadm_topo(self):
- url = test_utils.URL_CONFIG_ORDM_TOPO
- response = test_utils.get_request(url)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- node_list = res['network'][0]['node']
+ response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ node_list = response['network'][0]['node']
nb_updated_tp = 0
for node in node_list:
self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
self.assertEqual(nb_updated_tp, 1, "Only one termination-point should have been modified")
- link_list = res['network'][0]['ietf-network-topology:link']
+ link_list = response['network'][0]['ietf-network-topology:link']
nb_updated_link = 0
for link in link_list:
self.assertEqual(link['org-openroadm-common-network:operational-state'], 'inService')
self.test_12_get_eth_service1()
def test_46_delete_eth_service1(self):
- response = test_utils.service_delete_request("service1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-delete',
+ self.del_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Renderer service delete in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_47_disconnect_xponders_from_roadm(self):
- url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
- response = test_utils.get_ordm_topo_request("")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- links = res['network'][0]['ietf-network-topology:link']
+ response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ links = response['network'][0]['ietf-network-topology:link']
for link in links:
if link["org-openroadm-common-network:link-type"] in ('XPONDER-OUTPUT', 'XPONDER-INPUT'):
- link_name = link["link-id"]
- response = test_utils.delete_request(url+link_name)
- self.assertEqual(response.status_code, requests.codes.ok)
+ response = test_utils_rfc8040.del_ietf_network_link_request(
+ 'openroadm-topology', link['link-id'], 'config')
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_48_disconnect_XPDRA(self):
- response = test_utils.unmount_device("XPDRA01")
- self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("XPDRA01")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_49_disconnect_XPDRC(self):
- response = test_utils.unmount_device("XPDR-C1")
- self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("XPDR-C1")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_50_disconnect_ROADMA(self):
- response = test_utils.unmount_device("ROADM-A1")
- self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("ROADM-A1")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_51_disconnect_ROADMC(self):
- response = test_utils.unmount_device("ROADM-C1")
- self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("ROADM-C1")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
if __name__ == "__main__":
sys.path.append('transportpce_tests/common/')
# pylint: disable=wrong-import-position
# pylint: disable=import-error
-import test_utils # nopep8
+import test_utils_rfc8040 # nopep8
class TransportPCEtesting(unittest.TestCase):
NODE_VERSION_221 = '2.2.1'
NODE_VERSION_71 = '7.1'
- cr_serv_sample_data = {"input": {
+ cr_serv_input_data = {
"sdnc-request-header": {
"request-id": "request-1",
"rpc-action": "service-create",
"due-date": "2018-06-15T00:00:01Z",
"operator-contact": "pw1234"
}
+
+ del_serv_input_data = {
+ "sdnc-request-header": {
+ "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+ "rpc-action": "service-delete",
+ "request-system-id": "appname",
+ "notification-url": "http://localhost:8585/NotificationServer/notify"},
+ "service-delete-req-info": {
+ "service-name": "TBD",
+ "tail-retention": "no"}
}
@classmethod
def setUpClass(cls):
- cls.processes = test_utils.start_tpce()
- cls.processes = test_utils.start_sims([('xpdra2', cls.NODE_VERSION_71),
- ('roadma', cls.NODE_VERSION_221),
- ('roadmc', cls.NODE_VERSION_221),
- ('xpdrc2', cls.NODE_VERSION_71)])
+ cls.processes = test_utils_rfc8040.start_tpce()
+ cls.processes = test_utils_rfc8040.start_sims([('xpdra2', cls.NODE_VERSION_71),
+ ('roadma', cls.NODE_VERSION_221),
+ ('roadmc', cls.NODE_VERSION_221),
+ ('xpdrc2', cls.NODE_VERSION_71)])
@classmethod
def tearDownClass(cls):
# pylint: disable=not-an-iterable
for process in cls.processes:
- test_utils.shutdown_process(process)
+ test_utils_rfc8040.shutdown_process(process)
print("all processes killed")
def setUp(self):
- time.sleep(2)
+ time.sleep(1)
def test_01_connect_xpdra2(self):
- response = test_utils.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71))
+ response = test_utils_rfc8040.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71))
self.assertEqual(response.status_code,
- requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_02_connect_xpdrc2(self):
- response = test_utils.mount_device("XPDR-C2", ('xpdrc2', self.NODE_VERSION_71))
+ response = test_utils_rfc8040.mount_device("XPDR-C2", ('xpdrc2', self.NODE_VERSION_71))
self.assertEqual(response.status_code,
- requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_03_connect_rdma(self):
- response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
+ response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
self.assertEqual(response.status_code,
- requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_04_connect_rdmc(self):
- response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
+ response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
self.assertEqual(response.status_code,
- requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_05_connect_xprda2_2_N1_to_roadma_PP2(self):
- response = test_utils.connect_xpdr_to_rdm_request("XPDR-A2", "2", "1",
- "ROADM-A1", "1", "SRG1-PP2-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Xponder Roadm Link created successfully',
- res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-xpdr-rdm-links',
+ {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '2', 'network-num': '1',
+ 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
def test_06_connect_roadma_PP2_to_xpdra2_2_N1(self):
- response = test_utils.connect_rdm_to_xpdr_request("XPDR-A2", "2", "1",
- "ROADM-A1", "1", "SRG1-PP2-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Roadm Xponder links created successfully',
- res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-rdm-xpdr-links',
+ {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '2', 'network-num': '1',
+ 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
def test_07_connect_xprdc2_2_N1_to_roadmc_PP2(self):
- response = test_utils.connect_xpdr_to_rdm_request("XPDR-C2", "2", "1",
- "ROADM-C1", "1", "SRG1-PP2-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Xponder Roadm Link created successfully',
- res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-xpdr-rdm-links',
+ {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '2', 'network-num': '1',
+ 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
def test_08_connect_roadmc_PP2_to_xpdrc2_2_N1(self):
- response = test_utils.connect_rdm_to_xpdr_request("XPDR-C2", "2", "1",
- "ROADM-C1", "1", "SRG1-PP2-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Roadm Xponder links created successfully',
- res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-rdm-xpdr-links',
+ {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '2', 'network-num': '1',
+ 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
def test_09_add_omsAttributes_roadma_roadmc(self):
# Config ROADMA-ROADMC oms-attributes
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request(
+ response = test_utils_rfc8040.add_oms_attr_request(
"ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request(
+ response = test_utils_rfc8040.add_oms_attr_request(
"ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
-# test service-create for OCH-OTU4 service from xpdra2 to xpdrc2
+ # test service-create for OCH-OTU4 service from xpdra2 to xpdrc2
def test_11_check_otn_topology(self):
- response = test_utils.get_otn_topo_request()
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- nbNode = len(res['network'][0]['node'])
- self.assertEqual(nbNode, 6, 'There should be 6 nodes')
- self.assertNotIn('ietf-network-topology:link', res['network'][0])
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(len(response['network'][0]['node']), 6, 'There should be 6 nodes')
+ self.assertNotIn('ietf-network-topology:link', response['network'][0])
def test_12_create_OTUC4_service(self):
- response = test_utils.service_create_request(self.cr_serv_sample_data)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-create',
+ self.cr_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_13_get_OTUC4_service1(self):
- response = test_utils.get_service_list_request(
- "services/service1-OTUC4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual(
- res['services'][0]['administrative-state'], 'inService')
- self.assertEqual(
- res['services'][0]['service-name'], 'service1-OTUC4')
- self.assertEqual(
- res['services'][0]['connection-type'], 'infrastructure')
- self.assertEqual(
- res['services'][0]['lifecycle-state'], 'planned')
- self.assertEqual(
- res['services'][0]['service-layer'], 'wdm')
- self.assertEqual(
- res['services'][0]['service-a-end']['service-rate'], 400)
- self.assertEqual(
- res['services'][0]['service-a-end']['otu-service-rate'], 'org-openroadm-otn-common-types:OTUCn')
- time.sleep(2)
- self.assertEqual(
- res['services'][0]['service-z-end']['otu-service-rate'], 'org-openroadm-otn-common-types:OTUCn')
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_attr_request(
+ "services", "service1-OTUC4")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['service-name'], 'service1-OTUC4')
+ self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+ self.assertEqual(response['services'][0]['service-layer'], 'wdm')
+ self.assertEqual(response['services'][0]['service-a-end']['service-rate'], 400)
+ self.assertEqual(response['services'][0]['service-a-end']['otu-service-rate'],
+ 'org-openroadm-otn-common-types:OTUCn')
+ self.assertEqual(response['services'][0]['service-z-end']['otu-service-rate'],
+ 'org-openroadm-otn-common-types:OTUCn')
# Check correct configuration of devices
def test_14_check_interface_otsi_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-755:768')
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-755:768',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'type': 'org-openroadm-interfaces:otsi',
'supporting-port': 'L1'
- }, **res['interface'][0]),
- res['interface'][0])
-
+ }, **response['interface'][0]),
+ response['interface'][0])
self.assertDictEqual(
dict({'frequency': 196.0812, 'otsi-rate': 'org-openroadm-common-optical-channel-types:R400G-otsi',
'transmit-power': -5, 'modulation-format': 'dp-qam16'},
- **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
- res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
+ **response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
+ response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
def test_15_check_interface_OTSI_GROUP_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTSIGROUP-400G')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-400G',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
input_dict_2 = {"group-id": 1,
"group-rate": "org-openroadm-common-optical-channel-types:R400G-otsi"
}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
- self.assertDictEqual(dict(input_dict_2, **res['interface'][0]
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
+ self.assertDictEqual(dict(input_dict_2, **response['interface'][0]
['org-openroadm-otsi-group-interfaces:otsi-group']),
- res['interface'][0]
+ response['interface'][0]
['org-openroadm-otsi-group-interfaces:otsi-group'])
def test_16_check_interface_OTUC4_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTUC4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-NETWORK1-OTUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'degm-intervals': 2,
'otucn-n-rate': 4
}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
- self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
- res['interface'][0]
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
+ self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+ response['interface'][0]
['org-openroadm-otn-otu-interfaces:otu'])
def test_17_check_interface_otsi_xpdrc2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-C2", "interface/XPDR2-NETWORK1-755:768")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-755:768')
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-755:768',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'type': 'org-openroadm-interfaces:otsi',
'supporting-port': 'L1'
- }, **res['interface'][0]),
- res['interface'][0])
+ }, **response['interface'][0]),
+ response['interface'][0])
self.assertDictEqual(
dict({'frequency': 196.0812, 'otsi-rate': 'org-openroadm-common-optical-channel-types:R400G-otsi',
'transmit-power': -5, 'modulation-format': 'dp-qam16'},
- **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
- res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
+ **response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
+ response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
def test_18_check_interface_OTSI_GROUP_xpdrc2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-C2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-OTSIGROUP-400G')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-400G',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
input_dict_2 = {"group-id": 1,
"group-rate": "org-openroadm-common-optical-channel-types:R400G-otsi"
}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
- self.assertDictEqual(dict(input_dict_2, **res['interface'][0]
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
+ self.assertDictEqual(dict(input_dict_2, **response['interface'][0]
['org-openroadm-otsi-group-interfaces:otsi-group']),
- res['interface'][0]
+ response['interface'][0]
['org-openroadm-otsi-group-interfaces:otsi-group'])
def test_19_check_interface_OTUC4_xpdrc2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-C2", "interface/XPDR2-NETWORK1-OTUC4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-OTUC4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR1-NETWORK1-OTUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'otucn-n-rate': 4
}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
- self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
- res['interface'][0]
+ self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+ response['interface'][0]
['org-openroadm-otn-otu-interfaces:otu'])
def test_20_check_no_interface_ODUC4_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn(
- {"error-type": "application", "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODUC4')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_21_check_openroadm_topo_xpdra2(self):
- response = test_utils.get_ordm_topo_request("node/XPDR-A2-XPDR2")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- ele = res['node'][0]['ietf-network-topology:termination-point'][0]
+ response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDR-A2-XPDR2', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ ele = response['node']['ietf-network-topology:termination-point'][0]
self.assertEqual('XPDR2-NETWORK1', ele['tp-id'])
- self.assertEqual({'frequency': 196.08125,
- 'width': 75},
- ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
- time.sleep(3)
+ self.assertEqual(
+ 196.08125,
+ float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+ self.assertEqual(
+ 75.0,
+ float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
def test_22_check_otn_topo_OTUC4_links(self):
- response = test_utils.get_otn_topo_request()
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- nb_links = len(res['network'][0]['ietf-network-topology:link'])
- self.assertEqual(nb_links, 2)
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 2)
listLinkId = ['OTUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1',
'OTUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1']
- for link in res['network'][0]['ietf-network-topology:link']:
+ for link in response['network'][0]['ietf-network-topology:link']:
self.assertIn(link['link-id'], listLinkId)
- self.assertEqual(
- link['transportpce-networkutils:otn-link-type'], 'OTUC4')
- self.assertEqual(
- link['org-openroadm-common-network:link-type'], 'OTN-LINK')
- self.assertEqual(
- link['org-openroadm-otn-network-topology:available-bandwidth'], 400000)
- self.assertEqual(
- link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
- self.assertIn(
- link['org-openroadm-common-network:opposite-link'], listLinkId)
-
-# test service-create for ODU4 service from xpdra2 to xpdrc2
+ self.assertEqual(link['transportpce-networkutils:otn-link-type'], 'OTUC4')
+ self.assertEqual(link['org-openroadm-common-network:link-type'], 'OTN-LINK')
+ self.assertEqual(link['org-openroadm-otn-network-topology:available-bandwidth'], 400000)
+ self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
+ self.assertIn(link['org-openroadm-common-network:opposite-link'], listLinkId)
+
+ # test service-create for ODU4 service from xpdra2 to xpdrc2
def test_23_create_ODUC4_service(self):
- self.cr_serv_sample_data["input"]["service-name"] = "service1-ODUC4"
- 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:ODUCn"
- 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:ODUCn"
-
- response = test_utils.service_create_request(self.cr_serv_sample_data)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ self.cr_serv_input_data["service-name"] = "service1-ODUC4"
+ self.cr_serv_input_data["service-a-end"]["service-format"] = "ODU"
+ del self.cr_serv_input_data["service-a-end"]["otu-service-rate"]
+ self.cr_serv_input_data["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODUCn"
+ self.cr_serv_input_data["service-z-end"]["service-format"] = "ODU"
+ del self.cr_serv_input_data["service-z-end"]["otu-service-rate"]
+ self.cr_serv_input_data["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODUCn"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-create',
+ self.cr_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_24_get_ODUC4_service1(self):
- response = test_utils.get_service_list_request(
- "services/service1-ODUC4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual(
- res['services'][0]['administrative-state'], 'inService')
- self.assertEqual(
- res['services'][0]['service-name'], 'service1-ODUC4')
- self.assertEqual(
- res['services'][0]['connection-type'], 'infrastructure')
- self.assertEqual(
- res['services'][0]['lifecycle-state'], 'planned')
- self.assertEqual(
- res['services'][0]['service-layer'], 'wdm')
- self.assertEqual(
- res['services'][0]['service-a-end']['service-rate'], 400)
- self.assertEqual(
- res['services'][0]['service-a-end']['odu-service-rate'], 'org-openroadm-otn-common-types:ODUCn')
- self.assertEqual(
- res['services'][0]['service-z-end']['odu-service-rate'], 'org-openroadm-otn-common-types:ODUCn')
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_attr_request(
+ "services", "service1-ODUC4")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['service-name'], 'service1-ODUC4')
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+ self.assertEqual(response['services'][0]['service-layer'], 'wdm')
+ self.assertEqual(response['services'][0]['service-a-end']['service-rate'], 400)
+ self.assertEqual(response['services'][0]['service-a-end']['odu-service-rate'],
+ 'org-openroadm-otn-common-types:ODUCn')
+ self.assertEqual(response['services'][0]['service-z-end']['odu-service-rate'],
+ 'org-openroadm-otn-common-types:ODUCn')
def test_25_check_interface_ODUC4_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODUC4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-NETWORK1-ODUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'tx-dapi': 'Nmbu2MNHvc4=',
'tx-sapi': 'LY9PxYJqUbw='}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
- self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
+ self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual(
{'payload-type': '22', 'exp-payload-type': '22'},
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
def test_26_check_interface_ODUC4_xpdrc2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-C2", "interface/XPDR2-NETWORK1-ODUC4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-ODUC4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-NETWORK1-ODUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'expected-sapi': 'LY9PxYJqUbw=',
'expected-dapi': 'LY9PxYJqUbw='
}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
- self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
+ self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual(
{'payload-type': '22', 'exp-payload-type': '22'},
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
def test_27_check_otn_topo_links(self):
- response = test_utils.get_otn_topo_request()
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- nb_links = len(res['network'][0]['ietf-network-topology:link'])
- self.assertEqual(nb_links, 4)
- for link in res['network'][0]['ietf-network-topology:link']:
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
+ for link in response['network'][0]['ietf-network-topology:link']:
linkId = link['link-id']
if (linkId in ('OTUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1',
'OTUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')):
self.fail("this link should not exist")
def test_28_check_otn_topo_tp(self):
- response = test_utils.get_otn_topo_request()
- res = response.json()
- for node in res['network'][0]['node']:
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ for node in response['network'][0]['node']:
if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'):
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
self.assertEqual(xpdrTpPortConAt['odtu-tpn-pool'][0]['odtu-type'],
'org-openroadm-otn-common-types:ODTU4.ts-Allocated')
-# test service-create for 100GE service 1 from xpdra2 to xpdrc2
+ # test service-create for 100GE service 1 from xpdra2 to xpdrc2
def test_29_create_100GE_service_1(self):
- self.cr_serv_sample_data["input"]["service-name"] = "service-100GE"
- self.cr_serv_sample_data["input"]["connection-type"] = "service"
- self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100"
- 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"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
- self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
- self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "100"
- 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"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
- self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
- response = test_utils.service_create_request(self.cr_serv_sample_data)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ self.cr_serv_input_data["service-name"] = "service-100GE"
+ self.cr_serv_input_data["connection-type"] = "service"
+ self.cr_serv_input_data["service-a-end"]["service-rate"] = "100"
+ self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet"
+ del self.cr_serv_input_data["service-a-end"]["odu-service-rate"]
+ self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+ self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+ self.cr_serv_input_data["service-z-end"]["service-rate"] = "100"
+ self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet"
+ del self.cr_serv_input_data["service-z-end"]["odu-service-rate"]
+ self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+ self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-create',
+ self.cr_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_30_get_100GE_service_1(self):
- response = test_utils.get_service_list_request(
- "services/service-100GE")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual(
- res['services'][0]['administrative-state'], 'inService')
- self.assertEqual(
- res['services'][0]['service-name'], 'service-100GE')
- self.assertEqual(
- res['services'][0]['connection-type'], 'service')
- self.assertEqual(
- res['services'][0]['lifecycle-state'], 'planned')
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_attr_request(
+ "services", "service-100GE")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['service-name'], 'service-100GE')
+ self.assertEqual(response['services'][0]['connection-type'], 'service')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
def test_31_check_interface_100GE_CLIENT_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ETHERNET-100G')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET-100G',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
'supporting-port': 'C1'
}
input_dict_2 = {'speed': 100000}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
- self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
- res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
+ self.assertDictEqual(
+ dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
+ response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
def test_32_check_interface_ODU4_CLIENT_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
'rate': 'org-openroadm-otn-common-types:ODU4',
'monitoring-mode': 'terminated'}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
self.assertDictEqual(dict(input_dict_2,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual(
{'payload-type': '07', 'exp-payload-type': '07'},
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
def test_33_check_interface_ODU4_NETWORK_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'monitoring-mode': 'not-terminated'}
input_dict_3 = {'trib-port-number': 1}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
self.assertDictEqual(dict(input_dict_2,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual(dict(input_dict_3,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
'parent-odu-allocation']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
- self.assertIn('1.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
+ self.assertIn('1.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
['opucn-trib-slots'])
- self.assertIn('1.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+ self.assertIn('1.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
['opucn-trib-slots'])
def test_34_check_ODU4_connection_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2",
- "odu-connection/XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'odu-connection', 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {
'connection-name':
'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4',
'direction': 'bidirectional'
}
- self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
- res['odu-connection'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+ response['odu-connection'][0])
self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'},
- res['odu-connection'][0]['destination'])
+ response['odu-connection'][0]['destination'])
self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'},
- res['odu-connection'][0]['source'])
+ response['odu-connection'][0]['source'])
def test_35_check_interface_100GE_CLIENT_xpdrc2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-C2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-C2', 'interface', 'XPDR2-CLIENT1-ETHERNET-100G')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET-100G',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
'supporting-port': 'C1'
}
input_dict_2 = {'speed': 100000}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
- self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
- res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
+ self.assertDictEqual(
+ dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
+ response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
def test_36_check_interface_ODU4_CLIENT_xpdrc2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-C2", "interface/XPDR2-CLIENT1-ODU4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-C2', 'interface', 'XPDR2-CLIENT1-ODU4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
'rate': 'org-openroadm-otn-common-types:ODU4',
'monitoring-mode': 'terminated'}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
self.assertDictEqual(dict(input_dict_2,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual(
{'payload-type': '07', 'exp-payload-type': '07'},
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
def test_37_check_interface_ODU4_NETWORK_xpdrc2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-C2", "interface/XPDR2-NETWORK1-ODU4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-ODU4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
input_dict_3 = {'trib-port-number': 1}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
self.assertDictEqual(dict(input_dict_2,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual(dict(input_dict_3,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
'parent-odu-allocation']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
'parent-odu-allocation'])
self.assertIn('1.1',
- res['interface'][0][
+ response['interface'][0][
'org-openroadm-otn-odu-interfaces:odu'][
'parent-odu-allocation']['opucn-trib-slots'])
self.assertIn('1.20',
- res['interface'][0][
+ response['interface'][0][
'org-openroadm-otn-odu-interfaces:odu'][
'parent-odu-allocation']['opucn-trib-slots'])
def test_38_check_ODU4_connection_xpdrc2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-C2",
- "odu-connection/XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-C2', 'odu-connection', 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {
'connection-name':
'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4',
'direction': 'bidirectional'
}
- self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
- res['odu-connection'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+ response['odu-connection'][0])
self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'},
- res['odu-connection'][0]['destination'])
+ response['odu-connection'][0]['destination'])
self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'},
- res['odu-connection'][0]['source'])
+ response['odu-connection'][0]['source'])
def test_39_check_otn_topo_links(self):
- response = test_utils.get_otn_topo_request()
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- nb_links = len(res['network'][0]['ietf-network-topology:link'])
- self.assertEqual(nb_links, 4)
- for link in res['network'][0]['ietf-network-topology:link']:
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
+ for link in response['network'][0]['ietf-network-topology:link']:
linkId = link['link-id']
if (linkId in ('ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1',
'ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')):
link['org-openroadm-otn-network-topology:used-bandwidth'], 100000)
def test_40_check_otn_topo_tp(self):
- response = test_utils.get_otn_topo_request()
- res = response.json()
- for node in res['network'][0]['node']:
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ for node in response['network'][0]['node']:
if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'):
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
self.assertNotIn(
1, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool'])
-# test service-create for 100GE service 2 from xpdra2 to xpdrc2
+ # test service-create for 100GE service 2 from xpdra2 to xpdrc2
def test_41_create_100GE_service_2(self):
- self.cr_serv_sample_data["input"]["service-name"] = "service-100GE2"
- self.cr_serv_sample_data["input"]["connection-type"] = "service"
- self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100"
- self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet"
- self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
- self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
- self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "100"
- self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet"
- self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
- self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
- response = test_utils.service_create_request(self.cr_serv_sample_data)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ self.cr_serv_input_data["service-name"] = "service-100GE2"
+ self.cr_serv_input_data["connection-type"] = "service"
+ self.cr_serv_input_data["service-a-end"]["service-rate"] = "100"
+ self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet"
+ self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
+ self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
+ self.cr_serv_input_data["service-z-end"]["service-rate"] = "100"
+ self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet"
+ self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
+ self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-create',
+ self.cr_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_42_get_100GE_service_2(self):
- response = test_utils.get_service_list_request(
- "services/service-100GE2")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual(
- res['services'][0]['administrative-state'], 'inService')
- self.assertEqual(
- res['services'][0]['service-name'], 'service-100GE2')
- self.assertEqual(
- res['services'][0]['connection-type'], 'service')
- self.assertEqual(
- res['services'][0]['lifecycle-state'], 'planned')
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-100GE2")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['service-name'], 'service-100GE2')
+ self.assertEqual(response['services'][0]['connection-type'], 'service')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+ time.sleep(1)
def test_43_check_service_list(self):
- 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']), 4)
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_request()
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(len(response['service-list']['services']), 4)
def test_44_check_otn_topo_links(self):
- response = test_utils.get_otn_topo_request()
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- nb_links = len(res['network'][0]['ietf-network-topology:link'])
- self.assertEqual(nb_links, 4)
- for link in res['network'][0]['ietf-network-topology:link']:
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
+ for link in response['network'][0]['ietf-network-topology:link']:
linkId = link['link-id']
if (linkId in ('ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1',
'ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')):
link['org-openroadm-otn-network-topology:used-bandwidth'], 200000)
def test_45_check_otn_topo_tp(self):
- response = test_utils.get_otn_topo_request()
- res = response.json()
- for node in res['network'][0]['node']:
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ for node in response['network'][0]['node']:
if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'):
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
2, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool'])
def test_46_delete_100GE_service_2(self):
- response = test_utils.service_delete_request("service-100GE2")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-100GE2"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-delete',
+ self.del_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Renderer service delete in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_47_delete_100GE_service_1(self):
- response = test_utils.service_delete_request("service-100GE")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-100GE"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-delete',
+ self.del_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Renderer service delete in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_48_check_service_list(self):
- 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)
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_request()
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(len(response['service-list']['services']), 2)
def test_49_check_no_ODU4_connection_xpdra2(self):
- response = test_utils.check_netconf_node_request("XPDR-A2", "")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertNotIn(['odu-connection'][0], res['org-openroadm-device'])
- time.sleep(1)
+ response = test_utils_rfc8040.check_node_request("XPDR-A2")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertNotIn(['odu-connection'][0], response['org-openroadm-device'])
def test_50_check_no_interface_ODU4_NETWORK_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_51_check_no_interface_ODU4_CLIENT_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_52_check_no_interface_100GE_CLIENT_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ETHERNET-100G')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_53_check_otn_topo_links(self):
- response = test_utils.get_otn_topo_request()
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- nb_links = len(res['network'][0]['ietf-network-topology:link'])
- self.assertEqual(nb_links, 4)
- for link in res['network'][0]['ietf-network-topology:link']:
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
+ for link in response['network'][0]['ietf-network-topology:link']:
linkId = link['link-id']
if (linkId in ('ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1',
'ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')):
link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
def test_54_check_otn_topo_tp(self):
- response = test_utils.get_otn_topo_request()
- res = response.json()
- for node in res['network'][0]['node']:
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ for node in response['network'][0]['node']:
if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'):
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 4)
def test_55_delete_ODUC4_service(self):
- response = test_utils.service_delete_request("service1-ODUC4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1-ODUC4"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-delete',
+ self.del_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Renderer service delete in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_56_check_service_list(self):
- 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)
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_request()
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(len(response['service-list']['services']), 1)
def test_57_check_no_interface_ODU4_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODUC4')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_58_check_otn_topo_links(self):
self.test_22_check_otn_topo_OTUC4_links()
def test_59_check_otn_topo_tp(self):
- response = test_utils.get_otn_topo_request()
- res = response.json()
- for node in res['network'][0]['node']:
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ for node in response['network'][0]['node']:
if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'):
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
dict.keys(tp))
def test_60_delete_OTUC4_service(self):
- response = test_utils.service_delete_request("service1-OTUC4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1-OTUC4"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-delete',
+ self.del_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Renderer service delete in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_61_get_no_service(self):
- response = test_utils.get_service_list_request("")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn(
- {"error-type": "application", "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
- time.sleep(1)
+ response = test_utils_rfc8040.get_ordm_serv_list_request()
+ self.assertEqual(response['status_code'], requests.codes.conflict)
+ self.assertIn(response['service-list'], (
+ {
+ "error-type": "protocol",
+ "error-tag": "data-missing",
+ "error-message":
+ "Request could not be completed because the relevant data "
+ "model content does not exist"
+ }, {
+ "error-type": "application",
+ "error-tag": "data-missing",
+ "error-message":
+ "Request could not be completed because the relevant data "
+ "model content does not exist"
+ }))
def test_62_check_no_interface_OTUC4_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTUC4')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_63_check_no_interface_OTSI_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-755:768')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_64_check_no_interface_OTSIG_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTSIGROUP-400G')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_65_getLinks_OtnTopology(self):
- response = test_utils.get_otn_topo_request()
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertNotIn('ietf-network-topology:link', res['network'][0])
+ response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertNotIn('ietf-network-topology:link', response['network'][0])
def test_66_check_openroadm_topo_xpdra2(self):
- response = test_utils.get_ordm_topo_request("node/XPDR-A2-XPDR2")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- tp = res['node'][0]['ietf-network-topology:termination-point'][0]
+ response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDR-A2-XPDR2', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ tp = response['node']['ietf-network-topology:termination-point'][0]
self.assertEqual('XPDR2-NETWORK1', tp['tp-id'])
self.assertNotIn('wavelength', dict.keys(
tp['org-openroadm-network-topology:xpdr-network-attributes']))
- time.sleep(3)
def test_67_check_openroadm_topology(self):
- response = test_utils.get_ordm_topo_request("")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- links = res['network'][0]['ietf-network-topology:link']
+ response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ links = response['network'][0]['ietf-network-topology:link']
self.assertEqual(22, len(links), 'Topology should contain 22 links')
def test_68_connect_xprda2_1_N1_to_roadma_PP2(self):
- response = test_utils.connect_xpdr_to_rdm_request("XPDR-A2", "1", "1",
- "ROADM-A1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Xponder Roadm Link created successfully',
- res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-xpdr-rdm-links',
+ {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
def test_69_connect_roadma_PP2_to_xpdra2_1_N1(self):
- response = test_utils.connect_rdm_to_xpdr_request("XPDR-A2", "1", "1",
- "ROADM-A1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Roadm Xponder links created successfully',
- res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-rdm-xpdr-links',
+ {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
def test_70_connect_xprdc2_1_N1_to_roadmc_PP2(self):
- response = test_utils.connect_xpdr_to_rdm_request("XPDR-C2", "1", "1",
- "ROADM-C1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Xponder Roadm Link created successfully',
- res["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-xpdr-rdm-links',
+ {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
def test_71_connect_roadmc_PP2_to_xpdrc2_1_N1(self):
- response = test_utils.connect_rdm_to_xpdr_request("XPDR-C2", "1", "1",
- "ROADM-C1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Roadm Xponder links created successfully',
- res["output"]["result"])
- time.sleep(2)
-
-
-# test service-create for 400GE service from xpdra2 to xpdrc2
-
-
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-rdm-xpdr-links',
+ {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
+
+ # test service-create for 400GE service from xpdra2 to xpdrc2
def test_72_create_400GE_service(self):
- self.cr_serv_sample_data["input"]["service-name"] = "service-400GE"
- self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "400"
- self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
- self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
- self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "400"
- del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"]
- del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"]
- del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"]
- del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"]
- del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"]
- del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"]
- del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"]
- del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"]
- response = test_utils.service_create_request(self.cr_serv_sample_data)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ self.cr_serv_input_data["service-name"] = "service-400GE"
+ self.cr_serv_input_data["service-a-end"]["service-rate"] = "400"
+ self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+ self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+ self.cr_serv_input_data["service-z-end"]["service-rate"] = "400"
+ del self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"]
+ del self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"]
+ del self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"]
+ del self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"]
+ del self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"]
+ del self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"]
+ del self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"]
+ del self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"]
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-create',
+ self.cr_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ time.sleep(self.WAITING)
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_73_get_400GE_service(self):
- response = test_utils.get_service_list_request(
- "services/service-400GE")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual(
- res['services'][0]['administrative-state'], 'inService')
- self.assertEqual(
- res['services'][0]['service-name'], 'service-400GE')
- self.assertEqual(
- res['services'][0]['connection-type'], 'service')
- self.assertEqual(
- res['services'][0]['lifecycle-state'], 'planned')
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-400GE")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['service-name'], 'service-400GE')
+ self.assertEqual(response['services'][0]['connection-type'], 'service')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+ time.sleep(1)
def test_74_check_xc1_roadma(self):
- response = test_utils.check_netconf_node_request(
- "ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-755:768")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
+ response = test_utils_rfc8040.check_node_attribute_request(
+ "ROADM-A1", "roadm-connections", "SRG1-PP1-TXRX-DEG2-TTP-TXRX-755:768")
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertDictEqual(
dict({
'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768',
'opticalControlMode': 'gainLoss',
'target-output-power': -3.0
- }, **res['roadm-connections'][0]),
- res['roadm-connections'][0]
- )
- self.assertDictEqual(
- {'src-if': 'SRG1-PP1-TXRX-nmc-755:768'},
- res['roadm-connections'][0]['source'])
- self.assertDictEqual(
- {'dst-if': 'DEG2-TTP-TXRX-nmc-755:768'},
- res['roadm-connections'][0]['destination'])
- time.sleep(5)
+ }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+ self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-nmc-755:768'}, response['roadm-connections'][0]['source'])
+ self.assertDictEqual({'dst-if': 'DEG2-TTP-TXRX-nmc-755:768'}, response['roadm-connections'][0]['destination'])
+ time.sleep(1)
def test_75_check_topo_xpdra2(self):
- response = test_utils.get_ordm_topo_request("node/XPDR-A2-XPDR1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+ response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDR-A2-XPDR1', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ liste_tp = response['node']['ietf-network-topology:termination-point']
for ele in liste_tp:
if ele['tp-id'] == 'XPDR1-NETWORK1':
- self.assertEqual({'frequency': 196.08125,
- 'width': 75},
- ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+ self.assertEqual(
+ 196.08125,
+ float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+ self.assertEqual(
+ 75.0,
+ float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
if ele['tp-id'] == 'XPDR1-CLIENT1':
self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
- time.sleep(3)
+ time.sleep(1)
def test_76_check_topo_roadma_SRG1(self):
- response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-SRG1', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
freq_map = base64.b64decode(
- res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+ response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
freq_map_array = [int(x) for x in freq_map]
self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
- liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+ liste_tp = response['node']['ietf-network-topology:termination-point']
for ele in liste_tp:
if ele['tp-id'] == 'SRG1-PP1-TXRX':
freq_map = base64.b64decode(
self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
if ele['tp-id'] == 'SRG1-PP2-TXRX':
self.assertNotIn('avail-freq-maps', dict.keys(ele))
- time.sleep(3)
+ time.sleep(1)
def test_77_check_topo_roadma_DEG1(self):
- response = test_utils.get_ordm_topo_request("node/ROADM-A1-DEG2")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-DEG2', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
freq_map = base64.b64decode(
- res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+ response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
freq_map_array = [int(x) for x in freq_map]
self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
- liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+ liste_tp = response['node']['ietf-network-topology:termination-point']
for ele in liste_tp:
if ele['tp-id'] == 'DEG2-CTP-TXRX':
freq_map = base64.b64decode(
ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
freq_map_array = [int(x) for x in freq_map]
self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
- time.sleep(3)
+ time.sleep(1)
def test_78_check_interface_400GE_CLIENT_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-CLIENT1-ETHERNET")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-CLIENT1-ETHERNET')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR1-CLIENT1-ETHERNET',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/1/1-PLUG-CLIENT',
'supporting-port': 'C1'
}
input_dict_2 = {'speed': 400000}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
- self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
- res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
+ self.assertDictEqual(
+ dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
+ response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
def test_79_check_interface_OTSI_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-755:768")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-755:768')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR1-NETWORK1-755:768',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
"provision-mode": "explicit",
"modulation-format": "dp-qam16"}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
- self.assertDictEqual(dict(input_dict_2,
- **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
- res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
- self.assertDictEqual({"foic-type": "org-openroadm-common-optical-channel-types:foic4.8", "iid": [1, 2, 3, 4]},
- res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']['flexo'])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
+ self.assertDictEqual(
+ dict(input_dict_2, **response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
+ response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
+ self.assertDictEqual(
+ {"foic-type": "org-openroadm-common-optical-channel-types:foic4.8", "iid": [1, 2, 3, 4]},
+ response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']['flexo'])
def test_80_check_interface_OTSI_GROUP_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-OTSIGROUP-400G")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTSIGROUP-400G')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR1-NETWORK1-OTSIGROUP-400G',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
input_dict_2 = {"group-id": 1,
"group-rate": "org-openroadm-common-optical-channel-types:R400G-otsi"}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
self.assertDictEqual(dict(input_dict_2,
- **res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']),
- res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group'])
+ **response['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']),
+ response['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group'])
def test_81_check_interface_OTUC4_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-OTUC4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTUC4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR1-NETWORK1-OTUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
"otucn-n-rate": 4,
"degm-intervals": 2}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
self.assertDictEqual(dict(input_dict_2,
- **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
- res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+ **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+ response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
def test_82_check_interface_ODUC4_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-ODUC4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-ODUC4')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR1-NETWORK1-ODUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
"oducn-n-rate": 4}
input_dict_3 = {"exp-payload-type": "22", "payload-type": "22"}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
self.assertDictEqual(dict(input_dict_2,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual(dict(input_dict_3,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
- self.assertEqual('XPDR1-NETWORK1-OTUC4', res['interface'][0]['supporting-interface-list'][0])
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+ self.assertEqual('XPDR1-NETWORK1-OTUC4', response['interface'][0]['supporting-interface-list'][0])
def test_82a_check_interface_ODUFLEX_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-ODUFLEX")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-ODUFLEX')
+ self.assertEqual(response['status_code'], requests.codes.ok)
input_dict_1 = {'name': 'XPDR1-NETWORK1-ODUFLEX',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
input_dict_3 = {"exp-payload-type": "32", "payload-type": "32"}
input_dict_4 = {'trib-port-number': 1}
- self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
- res['interface'][0])
+ self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+ response['interface'][0])
self.assertDictEqual(dict(input_dict_2,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual(dict(input_dict_3,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
self.assertDictEqual(dict(input_dict_4,
- **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
'parent-odu-allocation']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
- self.assertIn('1.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
+ self.assertIn('1.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
['opucn-trib-slots'])
- self.assertIn('1.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+ self.assertIn('1.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
['opucn-trib-slots'])
- self.assertIn('2.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+ self.assertIn('2.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
['opucn-trib-slots'])
- self.assertIn('2.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+ self.assertIn('2.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
['opucn-trib-slots'])
- self.assertIn('3.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+ self.assertIn('3.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
['opucn-trib-slots'])
- self.assertIn('3.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+ self.assertIn('3.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
['opucn-trib-slots'])
- self.assertIn('4.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+ self.assertIn('4.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
['opucn-trib-slots'])
- self.assertIn('4.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+ self.assertIn('4.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
['opucn-trib-slots'])
- self.assertEqual('XPDR1-NETWORK1-ODUC4', res['interface'][0]['supporting-interface-list'][0])
+ self.assertEqual('XPDR1-NETWORK1-ODUC4', response['interface'][0]['supporting-interface-list'][0])
def test_83_delete_400GE_service(self):
- response = test_utils.service_delete_request("service-400GE")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-400GE"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-delete',
+ self.del_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Renderer service delete in progress',
- res['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_84_get_no_service(self):
- response = test_utils.get_service_list_request("")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn(
- {"error-type": "application", "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils_rfc8040.get_ordm_serv_list_request()
+ self.assertEqual(response['status_code'], requests.codes.conflict)
+ self.assertIn(response['service-list'], (
+ {
+ "error-type": "protocol",
+ "error-tag": "data-missing",
+ "error-message":
+ "Request could not be completed because the relevant data "
+ "model content does not exist"
+ }, {
+ "error-type": "application",
+ "error-tag": "data-missing",
+ "error-message":
+ "Request could not be completed because the relevant data "
+ "model content does not exist"
+ }))
time.sleep(1)
def test_85_check_no_interface_ODUC4_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-ODUC4")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-ODUC4')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_86_check_no_interface_OTUC4_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-OTUC4")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTUC4')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_87_check_no_interface_OTSI_GROUP_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-OTSIGROUP-400G")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTSIGROUP-400G')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_88_check_no_interface_OTSI_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-755:768")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-755:768')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_89_check_no_interface_400GE_CLIENT_xpdra2(self):
- response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-CLIENT1-ETHERNET")
- self.assertEqual(response.status_code, requests.codes.conflict)
+ response = test_utils_rfc8040.check_node_attribute_request(
+ 'XPDR-A2', 'interface', 'XPDR1-CLIENT1-ETHERNET')
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_90_disconnect_xponders_from_roadm(self):
- url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
- response = test_utils.get_ordm_topo_request("")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- links = res['network'][0]['ietf-network-topology:link']
+ response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ links = response['network'][0]['ietf-network-topology:link']
for link in links:
if link["org-openroadm-common-network:link-type"] in ('XPONDER-OUTPUT', 'XPONDER-INPUT'):
- link_name = link["link-id"]
- response = test_utils.delete_request(url+link_name)
- self.assertEqual(response.status_code, requests.codes.ok)
+ response = test_utils_rfc8040.del_ietf_network_link_request(
+ 'openroadm-topology', link['link-id'], 'config')
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_91_disconnect_xpdra2(self):
- response = test_utils.unmount_device("XPDR-A2")
- self.assertEqual(response.status_code, requests.codes.ok,
- test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("XPDR-A2")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_92_disconnect_xpdrc2(self):
- response = test_utils.unmount_device("XPDR-C2")
- self.assertEqual(response.status_code, requests.codes.ok,
- test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("XPDR-C2")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_93_disconnect_roadmA(self):
- response = test_utils.unmount_device("ROADM-A1")
- self.assertEqual(response.status_code, requests.codes.ok,
- test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("ROADM-A1")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_94_disconnect_roadmC(self):
- response = test_utils.unmount_device("ROADM-C1")
- self.assertEqual(response.status_code, requests.codes.ok,
- test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("ROADM-C1")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
if __name__ == "__main__":
sys.path.append('transportpce_tests/common/')
# pylint: disable=wrong-import-position
# pylint: disable=import-error
-import test_utils # nopep8
+import test_utils_rfc8040 # nopep8
class TransportPCEtesting(unittest.TestCase):
NODE_VERSION_221 = '2.2.1'
NODE_VERSION_71 = '7.1'
- cr_serv_sample_data = {
- "input": {
- "sdnc-request-header": {
- "request-id": "request-1",
- "rpc-action": "service-create",
- "request-system-id": "appname"
- },
- "service-name": "service1",
- "common-id": "commonId",
- "connection-type": "service",
- "service-resiliency": {
- "resiliency": "org-openroadm-common-service-types:restorable"
- },
- "service-a-end": {
- "service-rate": "400",
- "node-id": "XPDR-A2",
- "service-format": "Ethernet",
- "clli": "NodeA",
- "tx-direction": [
- {
- "index": 0
- }
- ],
- "rx-direction": [
- {
- "index": 0
- }
- ],
- "optic-type": "gray"
- },
- "service-z-end": {
- "service-rate": "400",
- "node-id": "XPDR-C2",
- "service-format": "Ethernet",
- "clli": "NodeC",
- "tx-direction": [
- {
- "index": 0
- }
- ],
- "rx-direction": [
- {
- "index": 0
- }
- ],
- "optic-type": "gray"
- },
- "due-date": "2018-06-15T00:00:01Z",
- "operator-contact": "pw1234"
- }
+ cr_serv_input_data = {
+ "sdnc-request-header": {
+ "request-id": "request-1",
+ "rpc-action": "service-create",
+ "request-system-id": "appname"
+ },
+ "service-name": "service1",
+ "common-id": "commonId",
+ "connection-type": "service",
+ "service-resiliency": {
+ "resiliency": "org-openroadm-common-service-types:restorable"
+ },
+ "service-a-end": {
+ "service-rate": "400",
+ "node-id": "XPDR-A2",
+ "service-format": "Ethernet",
+ "clli": "NodeA",
+ "tx-direction": [
+ {
+ "index": 0
+ }
+ ],
+ "rx-direction": [
+ {
+ "index": 0
+ }
+ ],
+ "optic-type": "gray"
+ },
+ "service-z-end": {
+ "service-rate": "400",
+ "node-id": "XPDR-C2",
+ "service-format": "Ethernet",
+ "clli": "NodeC",
+ "tx-direction": [
+ {
+ "index": 0
+ }
+ ],
+ "rx-direction": [
+ {
+ "index": 0
+ }
+ ],
+ "optic-type": "gray"
+ },
+ "due-date": "2018-06-15T00:00:01Z",
+ "operator-contact": "pw1234"
+ }
+
+ del_serv_input_data = {
+ "sdnc-request-header": {
+ "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+ "rpc-action": "service-delete",
+ "request-system-id": "appname",
+ "notification-url": "http://localhost:8585/NotificationServer/notify"},
+ "service-delete-req-info": {
+ "service-name": "TBD",
+ "tail-retention": "no"}
}
service_path_service_1_AtoZ = [
@classmethod
def setUpClass(cls):
- cls.processes = test_utils.start_tpce()
- cls.processes = test_utils.start_sims([('xpdra2', cls.NODE_VERSION_71),
- ('roadma', cls.NODE_VERSION_221),
- ('roadmb', cls.NODE_VERSION_221),
- ('roadmc', cls.NODE_VERSION_221),
- ('xpdrc2', cls.NODE_VERSION_71)])
+ cls.processes = test_utils_rfc8040.start_tpce()
+ cls.processes = test_utils_rfc8040.start_sims([('xpdra2', cls.NODE_VERSION_71),
+ ('roadma', cls.NODE_VERSION_221),
+ ('roadmb', cls.NODE_VERSION_221),
+ ('roadmc', cls.NODE_VERSION_221),
+ ('xpdrc2', cls.NODE_VERSION_71)])
@classmethod
def tearDownClass(cls):
# pylint: disable=not-an-iterable
for process in cls.processes:
- test_utils.shutdown_process(process)
+ test_utils_rfc8040.shutdown_process(process)
print("all processes killed")
def setUp(self):
- time.sleep(2)
+ time.sleep(1)
def test_01_connect_xpdra2(self):
- response = test_utils.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71))
+ response = test_utils_rfc8040.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71))
self.assertEqual(response.status_code,
- requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_02_connect_xpdrc2(self):
- response = test_utils.mount_device("XPDR-C2", ('xpdrc2', self.NODE_VERSION_71))
+ response = test_utils_rfc8040.mount_device("XPDR-C2", ('xpdrc2', self.NODE_VERSION_71))
self.assertEqual(response.status_code,
- requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_03_connect_rdma(self):
- response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
+ response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
self.assertEqual(response.status_code,
- requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_04_connect_rdmb(self):
- response = test_utils.mount_device("ROADM-B1", ('roadmb', self.NODE_VERSION_221))
+ response = test_utils_rfc8040.mount_device("ROADM-B1", ('roadmb', self.NODE_VERSION_221))
self.assertEqual(response.status_code,
- requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_05_connect_rdmc(self):
- response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
+ response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
self.assertEqual(response.status_code,
- requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+ requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
def test_06_connect_xprda2_1_N1_to_roadma_PP1(self):
- response = test_utils.connect_xpdr_to_rdm_request("XPDR-A2", "1", "1",
- "ROADM-A1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertIn('Xponder Roadm Link created successfully',
- response.json()["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-xpdr-rdm-links',
+ {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
def test_07_connect_roadma_PP1_to_xpdra2_1_N1(self):
- response = test_utils.connect_rdm_to_xpdr_request("XPDR-A2", "1", "1",
- "ROADM-A1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertIn('Roadm Xponder links created successfully',
- response.json()["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-rdm-xpdr-links',
+ {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
def test_08_connect_xprdc2_1_N1_to_roadmc_PP1(self):
- response = test_utils.connect_xpdr_to_rdm_request("XPDR-C2", "1", "1",
- "ROADM-C1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertIn('Xponder Roadm Link created successfully',
- response.json()["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-xpdr-rdm-links',
+ {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
def test_09_connect_roadmc_PP1_to_xpdrc2_1_N1(self):
- response = test_utils.connect_rdm_to_xpdr_request("XPDR-C2", "1", "1",
- "ROADM-C1", "1", "SRG1-PP1-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertIn('Roadm Xponder links created successfully',
- response.json()["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-rdm-xpdr-links',
+ {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '1', 'network-num': '1',
+ 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
def test_10_connect_xprda2_3_N1_to_roadma_PP2(self):
- response = test_utils.connect_xpdr_to_rdm_request("XPDR-A2", "3", "1",
- "ROADM-A1", "1", "SRG1-PP2-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertIn('Xponder Roadm Link created successfully',
- response.json()["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-xpdr-rdm-links',
+ {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '3', 'network-num': '1',
+ 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
def test_11_connect_roadma_PP2_to_xpdra2_3_N1(self):
- response = test_utils.connect_rdm_to_xpdr_request("XPDR-A2", "3", "1",
- "ROADM-A1", "1", "SRG1-PP2-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertIn('Roadm Xponder links created successfully',
- response.json()["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-rdm-xpdr-links',
+ {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '3', 'network-num': '1',
+ 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
def test_12_connect_xprdc2_3_N1_to_roadmc_PP2(self):
- response = test_utils.connect_xpdr_to_rdm_request("XPDR-C2", "3", "1",
- "ROADM-C1", "1", "SRG1-PP2-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertIn('Xponder Roadm Link created successfully',
- response.json()["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-xpdr-rdm-links',
+ {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '3', 'network-num': '1',
+ 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
def test_13_connect_roadmc_PP2_to_xpdrc2_3_N1(self):
- response = test_utils.connect_rdm_to_xpdr_request("XPDR-C2", "3", "1",
- "ROADM-C1", "1", "SRG1-PP2-TXRX")
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertIn('Roadm Xponder links created successfully',
- response.json()["output"]["result"])
- time.sleep(2)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-networkutils', 'init-rdm-xpdr-links',
+ {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '3', 'network-num': '1',
+ 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
def test_14_add_omsAttributes_roadma_roadmc(self):
# Config ROADMA-ROADMC oms-attributes
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
+ response = test_utils_rfc8040.add_oms_attr_request(
+ "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
def test_15_add_omsAttributes_roadmc_roadma(self):
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
+ response = test_utils_rfc8040.add_oms_attr_request(
+ "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
def test_16_add_omsAttributes_roadma_roadmb(self):
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request("ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX", data)
+ response = test_utils_rfc8040.add_oms_attr_request(
+ "ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
def test_17_add_omsAttributes_roadmb_roadma(self):
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request("ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX", data)
+ response = test_utils_rfc8040.add_oms_attr_request(
+ "ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
def test_18_add_omsAttributes_roadmb_roadmc(self):
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request("ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX", data)
+ response = test_utils_rfc8040.add_oms_attr_request(
+ "ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
def test_19_add_omsAttributes_roadmc_roadmb(self):
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request("ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX", data)
+ response = test_utils_rfc8040.add_oms_attr_request(
+ "ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
def test_20_create_OTS_ROADMA_DEG1(self):
- response = test_utils.create_ots_oms_request("ROADM-A1", "DEG1-TTP-TXRX")
- time.sleep(5)
- self.assertEqual(response.status_code, requests.codes.ok)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-device-renderer', 'create-ots-oms',
+ {
+ 'node-id': 'ROADM-A1',
+ 'logical-connection-point': 'DEG1-TTP-TXRX'
+ })
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADM-A1',
- response.json()["output"]["result"])
+ response["output"]["result"])
def test_21_create_OTS_ROADMC_DEG2(self):
- response = test_utils.create_ots_oms_request("ROADM-C1", "DEG2-TTP-TXRX")
- time.sleep(5)
- self.assertEqual(response.status_code, requests.codes.ok)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-device-renderer', 'create-ots-oms',
+ {
+ 'node-id': 'ROADM-C1',
+ 'logical-connection-point': 'DEG2-TTP-TXRX'
+ })
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-C1',
- response.json()["output"]["result"])
+ response["output"]["result"])
def test_22_create_OTS_ROADMB_DEG1(self):
- response = test_utils.create_ots_oms_request("ROADM-B1", "DEG1-TTP-TXRX")
- time.sleep(5)
- self.assertEqual(response.status_code, requests.codes.ok)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-device-renderer', 'create-ots-oms',
+ {
+ 'node-id': 'ROADM-B1',
+ 'logical-connection-point': 'DEG1-TTP-TXRX'
+ })
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADM-B1',
- response.json()["output"]["result"])
+ response["output"]["result"])
def test_23_create_OTS_ROADMB_DEG2(self):
- response = test_utils.create_ots_oms_request("ROADM-B1", "DEG2-TTP-TXRX")
- time.sleep(5)
- self.assertEqual(response.status_code, requests.codes.ok)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-device-renderer', 'create-ots-oms',
+ {
+ 'node-id': 'ROADM-B1',
+ 'logical-connection-point': 'DEG2-TTP-TXRX'
+ })
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-B1',
- response.json()["output"]["result"])
+ response["output"]["result"])
def test_24_calculate_span_loss_base_all(self):
- data = {
- "input": {
- "src-type": "all"
- }
- }
- response = test_utils.post_request("{}/operations/transportpce-olm:calculate-spanloss-base", data)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Success',
- res["output"]["result"])
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'transportpce-olm', 'calculate-spanloss-base',
+ {
+ 'src-type': 'all'
+ })
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Success', response["output"]["result"])
self.assertIn({
"spanloss": "25.7",
"link-id": "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX"
- }, res["output"]["spans"])
+ }, response["output"]["spans"])
+ self.assertIn({
+ "spanloss": "17.6",
+ "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX"
+ }, response["output"]["spans"])
self.assertIn({
"spanloss": "23.6",
"link-id": "ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX"
- }, res["output"]["spans"])
+ }, response["output"]["spans"])
self.assertIn({
"spanloss": "23.6",
"link-id": "ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX"
- }, res["output"]["spans"])
- self.assertIn({
- "spanloss": "17.6",
- "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX"
- }, res["output"]["spans"])
+ }, response["output"]["spans"])
self.assertIn({
"spanloss": "25.7",
"link-id": "ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX"
- }, res["output"]["spans"])
+ }, response["output"]["spans"])
self.assertIn({
"spanloss": "17.6",
"link-id": "ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX"
- }, res["output"]["spans"])
+ }, response["output"]["spans"])
+ time.sleep(1)
# test service-create for Eth service from xpdr to xpdr with service-resiliency
def test_25_create_eth_service1_with_service_resiliency_restorable(self):
- self.cr_serv_sample_data["input"]["service-name"] = "service1"
- response = test_utils.service_create_request(self.cr_serv_sample_data)
- self.assertEqual(response.status_code, requests.codes.ok)
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-create',
+ self.cr_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('PCE calculation in progress',
- response.json()['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_26_get_eth_service1(self):
- response = test_utils.get_service_list_request("services/service1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual(
- res['services'][0]['operational-state'], 'inService')
+ response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['service-name'], 'service1')
+ self.assertEqual(response['services'][0]['connection-type'], 'service')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
self.assertEqual(
- res['services'][0]['administrative-state'], 'inService')
- self.assertEqual(
- res['services'][0]['service-name'], 'service1')
- self.assertEqual(
- res['services'][0]['connection-type'], 'service')
- self.assertEqual(
- res['services'][0]['lifecycle-state'], 'planned')
- self.assertEqual(
- res['services'][0]['service-resiliency']['resiliency'], 'org-openroadm-common-service-types:restorable')
- time.sleep(2)
+ response['services'][0]['service-resiliency']['resiliency'],
+ 'org-openroadm-common-service-types:restorable')
+ time.sleep(1)
def test_27_get_service_path_service_1(self):
- response = test_utils.get_service_path_list_request("service-paths/service1")
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertCountEqual(self.service_path_service_1_AtoZ,
- response.json()['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
+ response = test_utils_rfc8040.get_serv_path_list_attr("service-paths", "service1")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertCountEqual(
+ self.service_path_service_1_AtoZ,
+ response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
# test service-create for Eth service from xpdr to xpdr without service-resiliency
def test_28_create_eth_service2_without_service_resiliency(self):
- self.cr_serv_sample_data["input"]["service-name"] = "service2"
- del self.cr_serv_sample_data["input"]["service-resiliency"]
- response = test_utils.service_create_request(self.cr_serv_sample_data)
- self.assertEqual(response.status_code, requests.codes.ok)
+ self.cr_serv_input_data["service-name"] = "service2"
+ del self.cr_serv_input_data["service-resiliency"]
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-create',
+ self.cr_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('PCE calculation in progress',
- response.json()['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_29_get_eth_service2(self):
- response = test_utils.get_service_list_request("services/service2")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual(
- res['services'][0]['operational-state'], 'inService')
- self.assertEqual(
- res['services'][0]['administrative-state'], 'inService')
- self.assertEqual(
- res['services'][0]['service-name'], 'service2')
- self.assertEqual(
- res['services'][0]['connection-type'], 'service')
- self.assertEqual(
- res['services'][0]['lifecycle-state'], 'planned')
- self.assertNotIn('service-resiliency', res['services'][0])
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service2")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['service-name'], 'service2')
+ self.assertEqual(response['services'][0]['connection-type'], 'service')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+ self.assertNotIn('service-resiliency', response['services'][0])
+ time.sleep(1)
def test_30_get_service_path_service_2(self):
- response = test_utils.get_service_path_list_request("service-paths/service2")
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertCountEqual(self.service_path_service_2_AtoZ,
- response.json()['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
+ response = test_utils_rfc8040.get_serv_path_list_attr("service-paths", "service2")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertCountEqual(
+ self.service_path_service_2_AtoZ,
+ response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
# Degrade ROADM-A1-ROADM-C1 link
def test_31_set_pm_ROADMA_OTS_DEG2_TTP_TXRX_OpticalPowerInput(self):
}
}
response = requests.request("POST", url.format("http://127.0.0.1:8141/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
self.assertEqual(response.json()['output']['status-message'], "The PMs has been successfully set !")
time.sleep(self.WAITING * 2)
self.test_26_get_eth_service1()
def test_33_get_service_path_service_1(self):
- response = test_utils.get_service_path_list_request("service-paths/service1")
- self.assertEqual(response.status_code, requests.codes.ok)
- print(response.json())
- self.assertCountEqual(self.service_path_service_1_rerouted_AtoZ,
- response.json()['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
+ response = test_utils_rfc8040.get_serv_path_list_attr("service-paths", "service1")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertCountEqual(
+ self.service_path_service_1_rerouted_AtoZ,
+ response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
def test_34_get_eth_service2(self):
- response = test_utils.get_service_list_request("services/service2")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual(
- res['services'][0]['operational-state'], 'outOfService')
- self.assertEqual(
- res['services'][0]['administrative-state'], 'inService')
- self.assertEqual(
- res['services'][0]['service-name'], 'service2')
- self.assertEqual(
- res['services'][0]['connection-type'], 'service')
- self.assertEqual(
- res['services'][0]['lifecycle-state'], 'planned')
- self.assertNotIn('service-resiliency', res['services'][0])
- time.sleep(2)
+ response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service2")
+ self.assertEqual(response['services'][0]['operational-state'], 'outOfService')
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['service-name'], 'service2')
+ self.assertEqual(response['services'][0]['connection-type'], 'service')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+ self.assertNotIn('service-resiliency', response['services'])
+ time.sleep(1)
def test_35_get_service_path_service_2(self):
- response = test_utils.get_service_path_list_request("service-paths/service2")
+ response = test_utils_rfc8040.get_serv_path_list_attr("service-paths", "service2")
+ self.assertEqual(response['status_code'], requests.codes.ok)
index = self.service_path_service_2_AtoZ.index(
{
'id': '10',
'tp-node-id': 'ROADM-A1-DEG2'
}
}] + self.service_path_service_2_AtoZ[index + 1:]
- self.assertEqual(response.status_code, requests.codes.ok)
self.assertCountEqual(service_path_expected,
- response.json()['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
+ response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
# Restore ROADM-A1-ROADM-C1 link
def test_36_clear_pm_ROADMA_OTS_DEG2_TTP_TXRX_OpticalPowerInput(self):
}
}
response = requests.request("POST", url.format("http://127.0.0.1:8141/restconf"),
- data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
- auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
- timeout=test_utils.REQUEST_TIMEOUT)
+ data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+ auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+ timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
self.assertEqual(response.status_code, requests.codes.ok)
self.assertEqual(response.json()['output']['status-message'], "The PMs has been successfully released !")
time.sleep(2)
self.test_30_get_service_path_service_2()
def test_41_delete_eth_service2(self):
- response = test_utils.service_delete_request("service2")
- self.assertEqual(response.status_code, requests.codes.ok)
+ self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service2"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-delete',
+ self.del_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Renderer service delete in progress',
- response.json()['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_42_delete_eth_service1(self):
- response = test_utils.service_delete_request("service1")
- self.assertEqual(response.status_code, requests.codes.ok)
+ self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+ response = test_utils_rfc8040.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-delete',
+ self.del_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Renderer service delete in progress',
- response.json()['output']['configuration-response-common']['response-message'])
+ response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
def test_43_disconnect_xponders_from_roadm(self):
- url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
- response = test_utils.get_ordm_topo_request("")
- self.assertEqual(response.status_code, requests.codes.ok)
- links = response.json()['network'][0]['ietf-network-topology:link']
+ response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ links = response['network'][0]['ietf-network-topology:link']
for link in links:
if link["org-openroadm-common-network:link-type"] in ('XPONDER-OUTPUT', 'XPONDER-INPUT'):
- self.assertEqual(test_utils.delete_request(url + link["link-id"]).status_code, requests.codes.ok)
+ response = test_utils_rfc8040.del_ietf_network_link_request(
+ 'openroadm-topology', link['link-id'], 'config')
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_44_disconnect_xpdra2(self):
- response = test_utils.unmount_device("XPDR-A2")
- self.assertEqual(response.status_code, requests.codes.ok,
- test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("XPDR-A2")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_45_disconnect_xpdrc2(self):
- response = test_utils.unmount_device("XPDR-C2")
- self.assertEqual(response.status_code, requests.codes.ok,
- test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("XPDR-C2")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_46_disconnect_roadmA(self):
- response = test_utils.unmount_device("ROADM-A1")
- self.assertEqual(response.status_code, requests.codes.ok,
- test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("ROADM-A1")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_47_disconnect_roadmB(self):
- response = test_utils.unmount_device("ROADM-B1")
- self.assertEqual(response.status_code, requests.codes.ok,
- test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("ROADM-B1")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_48_disconnect_roadmC(self):
- response = test_utils.unmount_device("ROADM-C1")
- self.assertEqual(response.status_code, requests.codes.ok,
- test_utils.CODE_SHOULD_BE_200)
+ response = test_utils_rfc8040.unmount_device("ROADM-C1")
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
if __name__ == "__main__":
Code Review / transportpce.git / commitdiff