Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Manage ODU4 services over multiple OTU4
[transportpce.git]
/
tests
/
transportpce_tests
/
2.2.1
/
test07_otn_renderer.py
diff --git
a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
index d6f47f7d74bf5f423b003ec4f3e582069a486fa7..7cf133da3c63522005fd82242e5a720ef8b46a0a 100644
(file)
--- a/
tests/transportpce_tests/2.2.1/test07_otn_renderer.py
+++ b/
tests/transportpce_tests/2.2.1/test07_otn_renderer.py
@@
-15,9
+15,12
@@
import unittest
import time
import requests
import unittest
import time
import requests
+# pylint: disable=wrong-import-order
import sys
sys.path.append('transportpce_tests/common/')
import sys
sys.path.append('transportpce_tests/common/')
-import test_utils
+# pylint: disable=wrong-import-position
+# pylint: disable=import-error
+import test_utils # nopep8
class TransportPCEtesting(unittest.TestCase):
class TransportPCEtesting(unittest.TestCase):
@@
-107,6
+110,7
@@
class TransportPCEtesting(unittest.TestCase):
response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-NETWORK1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-NETWORK1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
+ self.NETWORK1_CHECK_DICT["supporting-otu4"] = "XPDR1-NETWORK1-OTU"
self.assertIn(
self.NETWORK1_CHECK_DICT,
res['mapping'])
self.assertIn(
self.NETWORK1_CHECK_DICT,
res['mapping'])
@@
-125,8
+129,8
@@
class TransportPCEtesting(unittest.TestCase):
res['interface'][0])
self.assertDictEqual(
res['interface'][0])
self.assertDictEqual(
- {
u'frequency': 196.1, u'rate': u
'org-openroadm-common-types:R100G',
-
u'transmit-power': -5, u
'modulation-format': 'dp-qpsk'},
+ {
'frequency': 196.1, 'rate':
'org-openroadm-common-types:R100G',
+
'transmit-power': -5,
'modulation-format': 'dp-qpsk'},
res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
def test_07_check_interface_OTU(self):
res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
def test_07_check_interface_OTU(self):
@@
-141,11
+145,7
@@
class TransportPCEtesting(unittest.TestCase):
'supporting-port': 'CP1-CFP0-P1'
}
'supporting-port': 'CP1-CFP0-P1'
}
- input_dict_2 = {'tx-dapi': 'Swfw02qXGyI=',
- 'expected-sapi': 'Swfw02qXGyI=',
- 'tx-sapi': 'Swfw02qXGyI=',
- 'expected-dapi': 'Swfw02qXGyI=',
- 'rate': 'org-openroadm-otn-common-types:OTU4',
+ input_dict_2 = {'rate': 'org-openroadm-otn-common-types:OTU4',
'fec': 'scfec'
}
'fec': 'scfec'
}
@@
-172,6
+172,7
@@
class TransportPCEtesting(unittest.TestCase):
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.NETWORK1_CHECK_DICT["supporting-odu4"] = "XPDR1-NETWORK1-ODU4"
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.NETWORK1_CHECK_DICT["supporting-odu4"] = "XPDR1-NETWORK1-ODU4"
+ self.NETWORK1_CHECK_DICT["supporting-otu4"] = "XPDR1-NETWORK1-OTU"
self.assertIn(
self.NETWORK1_CHECK_DICT,
res['mapping'])
self.assertIn(
self.NETWORK1_CHECK_DICT,
res['mapping'])
@@
-185,11
+186,7
@@
class TransportPCEtesting(unittest.TestCase):
'type': 'org-openroadm-interfaces:otnOdu',
'supporting-port': 'CP1-CFP0-P1'}
input_dict_2 = {'odu-function': 'org-openroadm-otn-common-types:ODU-TTP',
'type': 'org-openroadm-interfaces:otnOdu',
'supporting-port': 'CP1-CFP0-P1'}
input_dict_2 = {'odu-function': 'org-openroadm-otn-common-types:ODU-TTP',
- 'rate': 'org-openroadm-otn-common-types:ODU4',
- 'expected-dapi': 'Swfw02qXGyI=',
- 'expected-sapi': 'Swfw02qXGyI=',
- 'tx-dapi': 'Swfw02qXGyI=',
- 'tx-sapi': 'Swfw02qXGyI='}
+ 'rate': 'org-openroadm-otn-common-types:ODU4'}
self.assertDictEqual(dict(res['interface'][0], **input_dict_1),
res['interface'][0])
self.assertDictEqual(dict(res['interface'][0], **input_dict_1),
res['interface'][0])
@@
-199,7
+196,7
@@
class TransportPCEtesting(unittest.TestCase):
res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
)
self.assertDictEqual(
res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
)
self.assertDictEqual(
- {
u'payload-type': u'21', u'exp-payload-type': u
'21'},
+ {
'payload-type': '21', 'exp-payload-type':
'21'},
res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
def test_11_otn_service_path_create_10GE(self):
res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
def test_11_otn_service_path_create_10GE(self):
@@
-233,7
+230,7
@@
class TransportPCEtesting(unittest.TestCase):
self.assertDictEqual(dict(res['interface'][0], **input_dict),
res['interface'][0])
self.assertDictEqual(
self.assertDictEqual(dict(res['interface'][0], **input_dict),
res['interface'][0])
self.assertDictEqual(
- {
u
'speed': 10000},
+ {'speed': 10000},
res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
def test_13_check_interface_ODU2E_CLIENT(self):
res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
def test_13_check_interface_ODU2E_CLIENT(self):
@@
-258,7
+255,7
@@
class TransportPCEtesting(unittest.TestCase):
**input_dict_2),
res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual(
**input_dict_2),
res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual(
- {
u'payload-type': u'03', u'exp-payload-type': u
'03'},
+ {
'payload-type': '03', 'exp-payload-type':
'03'},
res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
def test_14_check_interface_ODU2E_NETWORK(self):
res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
def test_14_check_interface_ODU2E_NETWORK(self):
@@
-306,9
+303,9
@@
class TransportPCEtesting(unittest.TestCase):
self.assertDictEqual(dict(res['odu-connection'][0], **input_dict_1),
res['odu-connection'][0])
self.assertDictEqual(dict(res['odu-connection'][0], **input_dict_1),
res['odu-connection'][0])
- self.assertDictEqual({
u'dst-if': u
'XPDR1-NETWORK1-ODU2e-service1'},
+ self.assertDictEqual({
'dst-if':
'XPDR1-NETWORK1-ODU2e-service1'},
res['odu-connection'][0]['destination'])
res['odu-connection'][0]['destination'])
- self.assertDictEqual({
u'src-if': u
'XPDR1-CLIENT4-ODU2e-service1'},
+ self.assertDictEqual({
'src-if':
'XPDR1-CLIENT4-ODU2e-service1'},
res['odu-connection'][0]['source'])
def test_16_otn_service_path_delete_10GE(self):
res['odu-connection'][0]['source'])
def test_16_otn_service_path_delete_10GE(self):