Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Modify OpenRoadmInterfaces implementations
[transportpce.git]
/
tests
/
transportpce_tests
/
hybrid
/
test02_B100G_end2end.py
diff --git
a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
index b6d2612ec63c3d989ac819e75d7e0946136cfdc1..2d7232eb572c7418cb2eee937c4de7984e181808 100644
(file)
--- a/
tests/transportpce_tests/hybrid/test02_B100G_end2end.py
+++ b/
tests/transportpce_tests/hybrid/test02_B100G_end2end.py
@@
-151,7
+151,7
@@
class TransportPCEtesting(unittest.TestCase):
print("all processes killed")
def setUp(self):
print("all processes killed")
def setUp(self):
- time.sleep(
5
)
+ time.sleep(
2
)
def test_01_connect_xpdra2(self):
response = test_utils.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71))
def test_01_connect_xpdra2(self):
response = test_utils.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71))
@@
-336,9
+336,7
@@
class TransportPCEtesting(unittest.TestCase):
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'L1'
}
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'L1'
}
- input_dict_2 = {'tx-sapi': 'LY9PxYJqUbw=',
- 'expected-dapi': 'LY9PxYJqUbw=',
- 'rate': 'org-openroadm-otn-common-types:OTUCn',
+ input_dict_2 = {'rate': 'org-openroadm-otn-common-types:OTUCn',
'degthr-percentage': 100,
'degm-intervals': 2,
'otucn-n-rate': 4
'degthr-percentage': 100,
'degm-intervals': 2,
'otucn-n-rate': 4
@@
-402,11
+400,7
@@
class TransportPCEtesting(unittest.TestCase):
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'L1'
}
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'L1'
}
- input_dict_2 = {'tx-dapi': 'LY9PxYJqUbw=',
- 'expected-sapi': 'LY9PxYJqUbw=',
- 'tx-sapi': 'Nmbu2MNHvc4=',
- 'expected-dapi': 'Nmbu2MNHvc4=',
- 'rate': 'org-openroadm-otn-common-types:OTUCn',
+ input_dict_2 = {'rate': 'org-openroadm-otn-common-types:OTUCn',
'degthr-percentage': 100,
'degm-intervals': 2,
'otucn-n-rate': 4
'degthr-percentage': 100,
'degm-intervals': 2,
'otucn-n-rate': 4
@@
-589,7
+583,7
@@
class TransportPCEtesting(unittest.TestCase):
response = test_utils.get_otn_topo_request()
res = response.json()
for node in res['network'][0]['node']:
response = test_utils.get_otn_topo_request()
res = response.json()
for node in res['network'][0]['node']:
- if node['node-id']
== 'XPDR-A2-XPDR2' or 'XPDR-C2-XPDR2'
:
+ if node['node-id']
in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2')
:
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
if tp['tp-id'] == 'XPDR2-NETWORK1':
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
if tp['tp-id'] == 'XPDR2-NETWORK1':
@@
-845,7
+839,7
@@
class TransportPCEtesting(unittest.TestCase):
response = test_utils.get_otn_topo_request()
res = response.json()
for node in res['network'][0]['node']:
response = test_utils.get_otn_topo_request()
res = response.json()
for node in res['network'][0]['node']:
- if node['node-id']
== 'XPDR-A2-XPDR2' or 'XPDR-C2-XPDR2'
:
+ if node['node-id']
in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2')
:
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
if tp['tp-id'] == 'XPDR2-NETWORK1':
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
if tp['tp-id'] == 'XPDR2-NETWORK1':
@@
-919,7
+913,7
@@
class TransportPCEtesting(unittest.TestCase):
response = test_utils.get_otn_topo_request()
res = response.json()
for node in res['network'][0]['node']:
response = test_utils.get_otn_topo_request()
res = response.json()
for node in res['network'][0]['node']:
- if node['node-id']
== 'XPDR-A2-XPDR2' or 'XPDR-C2-XPDR2'
:
+ if node['node-id']
in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2')
:
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
if tp['tp-id'] == 'XPDR2-NETWORK1':
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
if tp['tp-id'] == 'XPDR2-NETWORK1':
@@
-997,7
+991,7
@@
class TransportPCEtesting(unittest.TestCase):
response = test_utils.get_otn_topo_request()
res = response.json()
for node in res['network'][0]['node']:
response = test_utils.get_otn_topo_request()
res = response.json()
for node in res['network'][0]['node']:
- if
(node['node-id'] == 'XPDR-A2-XPDR2' or
'XPDR-C2-XPDR2'):
+ if
node['node-id'] in ('XPDR-A2-XPDR2',
'XPDR-C2-XPDR2'):
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
if tp['tp-id'] == 'XPDR2-NETWORK1':
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
if tp['tp-id'] == 'XPDR2-NETWORK1':
@@
-1033,7
+1027,7
@@
class TransportPCEtesting(unittest.TestCase):
response = test_utils.get_otn_topo_request()
res = response.json()
for node in res['network'][0]['node']:
response = test_utils.get_otn_topo_request()
res = response.json()
for node in res['network'][0]['node']:
- if node['node-id']
== 'XPDR-A2-XPDR2' or 'XPDR-C2-XPDR2'
:
+ if node['node-id']
in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2')
:
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
if tp['tp-id'] == 'XPDR2-NETWORK1':
tpList = node['ietf-network-topology:termination-point']
for tp in tpList:
if tp['tp-id'] == 'XPDR2-NETWORK1':
@@
-1136,11
+1130,7
@@
class TransportPCEtesting(unittest.TestCase):
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"
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"]["port"]["port-name"] = "XPDR1-CLIENT1"
- self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1"
self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "400"
self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "400"
- self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1"
- self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1"
response = test_utils.service_create_request(self.cr_serv_sample_data)
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
response = test_utils.service_create_request(self.cr_serv_sample_data)
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
@@
-1406,8
+1396,7
@@
class TransportPCEtesting(unittest.TestCase):
res = response.json()
links = res['network'][0]['ietf-network-topology:link']
for link in links:
res = response.json()
links = res['network'][0]['ietf-network-topology:link']
for link in links:
- if (link["org-openroadm-common-network:link-type"] == "XPONDER-OUTPUT" or
- link["org-openroadm-common-network:link-type"] == "XPONDER-INPUT"):
+ 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)
link_name = link["link-id"]
response = test_utils.delete_request(url+link_name)
self.assertEqual(response.status_code, requests.codes.ok)