import unittest
import time
import requests
-from common import test_utils
-from common.flexgrid_utils import INDEX_1_USED_FREQ_MAP, INDEX_1_2_USED_FREQ_MAP, AVAILABLE_FREQ_MAP
+import sys
+sys.path.append('transportpce_tests/common/')
+import test_utils
class TransportPCEtesting(unittest.TestCase):
processes = None
WAITING = 20 # nominal value is 300
+ NODE_VERSION = '2.2.1'
cr_serv_sample_data = {"input": {
"sdnc-request-header": {
@classmethod
def setUpClass(cls):
cls.processes = test_utils.start_tpce()
- cls.processes = test_utils.start_sims(
- ['spdra', 'roadma', 'roadmc', 'spdrc'])
+ cls.processes = test_utils.start_sims([('spdra', cls.NODE_VERSION),
+ ('roadma', cls.NODE_VERSION),
+ ('roadmc', cls.NODE_VERSION),
+ ('spdrc', cls.NODE_VERSION)])
@classmethod
def tearDownClass(cls):
time.sleep(5)
def test_01_connect_spdrA(self):
- response = test_utils.mount_device("SPDR-SA1", 'spdra')
+ response = test_utils.mount_device("SPDR-SA1", ('spdra', self.NODE_VERSION))
self.assertEqual(response.status_code,
requests.codes.created, test_utils.CODE_SHOULD_BE_201)
def test_02_connect_spdrC(self):
- response = test_utils.mount_device("SPDR-SC1", 'spdrc')
+ response = test_utils.mount_device("SPDR-SC1", ('spdrc', self.NODE_VERSION))
self.assertEqual(response.status_code,
requests.codes.created, test_utils.CODE_SHOULD_BE_201)
def test_03_connect_rdmA(self):
- response = test_utils.mount_device("ROADM-A1", 'roadma')
+ response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
self.assertEqual(response.status_code,
requests.codes.created, test_utils.CODE_SHOULD_BE_201)
def test_04_connect_rdmC(self):
- response = test_utils.mount_device("ROADM-C1", 'roadmc')
+ response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
self.assertEqual(response.status_code,
requests.codes.created, test_utils.CODE_SHOULD_BE_201)
# Check correct configuration of devices
def test_14_check_interface_och_spdra(self):
response = test_utils.check_netconf_node_request(
- "SPDR-SA1", "interface/XPDR1-NETWORK1-1")
+ "SPDR-SA1", "interface/XPDR1-NETWORK1-761:768")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-1',
+ self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-761:768',
'administrative-state': 'inService',
'supporting-circuit-pack-name': 'CP1-CFP0',
'type': 'org-openroadm-interfaces:opticalChannel',
input_dict_1 = {'name': 'XPDR1-NETWORK1-OTU',
'administrative-state': 'inService',
'supporting-circuit-pack-name': 'CP1-CFP0',
- 'supporting-interface': 'XPDR1-NETWORK1-1',
+ 'supporting-interface': 'XPDR1-NETWORK1-761:768',
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'CP1-CFP0-P1'
}
def test_16_check_interface_och_spdrc(self):
response = test_utils.check_netconf_node_request(
- "SPDR-SC1", "interface/XPDR1-NETWORK1-1")
+ "SPDR-SC1", "interface/XPDR1-NETWORK1-761:768")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-1',
+ self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-761:768',
'administrative-state': 'inService',
'supporting-circuit-pack-name': 'CP1-CFP0',
'type': 'org-openroadm-interfaces:opticalChannel',
input_dict_1 = {'name': 'XPDR1-NETWORK1-OTU',
'administrative-state': 'inService',
'supporting-circuit-pack-name': 'CP1-CFP0',
- 'supporting-interface': 'XPDR1-NETWORK1-1',
+ 'supporting-interface': 'XPDR1-NETWORK1-761:768',
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'CP1-CFP0-P1'
}
freq_map = base64.b64decode(
res['node'][0]['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[0], 0, "Index 1 should not be available")
+ self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
liste_tp = res['node'][0]['ietf-network-topology:termination-point']
for ele in liste_tp:
if ele['tp-id'] == 'SRG1-PP1-TXRX':
- self.assertIn({u'index': 1, u'frequency': 196.1,
- u'width': 40},
- ele['org-openroadm-network-topology:pp-attributes']['used-wavelength'])
+ freq_map = base64.b64decode(
+ ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
+ freq_map_array = [int(x) for x in freq_map]
+ self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
if ele['tp-id'] == 'SRG1-PP2-TXRX':
- self.assertNotIn('used-wavelength', dict.keys(ele))
+ self.assertNotIn('avail-freq-maps', dict.keys(ele))
time.sleep(3)
def test_21_check_openroadm_topo_ROADMA_DEG(self):
freq_map = base64.b64decode(
res['node'][0]['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[0], 0, "Index 1 should not be available")
+ self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
liste_tp = res['node'][0]['ietf-network-topology:termination-point']
for ele in liste_tp:
if ele['tp-id'] == 'DEG2-CTP-TXRX':
- self.assertIn({u'map-name': 'cband', u'freq-map-granularity': 6.25, u'start-edge-freq': 191.325,
- u'effective-bits': 8, u'freq-map': INDEX_1_USED_FREQ_MAP},
- ele['org-openroadm-network-topology:ctp-attributes']['avail-freq-maps'])
+ freq_map = base64.b64decode(
+ ele['org-openroadm-network-topology:ctp-attributes']['avail-freq-maps'][0]['freq-map'])
+ freq_map_array = [int(x) for x in freq_map]
+ self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
if ele['tp-id'] == 'DEG2-TTP-TXRX':
- self.assertIn({u'index': 1, u'frequency': 196.1,
- u'width': 40},
- ele['org-openroadm-network-topology:tx-ttp-attributes']['used-wavelengths'])
+ 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, "Lambda 1 should not be available")
time.sleep(3)
def test_22_check_otn_topo_otu4_links(self):
freq_map = base64.b64decode(
res['node'][0]['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[0], 255, "Index 1 should be available")
+ self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
liste_tp = res['node'][0]['ietf-network-topology:termination-point']
for ele in liste_tp:
if ele['tp-id'] == 'SRG1-PP1-TXRX':
- self.assertNotIn(
- 'org-openroadm-network-topology:pp-attributes', dict.keys(ele))
+ freq_map = base64.b64decode(
+ ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
+ freq_map_array = [int(x) for x in freq_map]
+ self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
time.sleep(3)
def test_61_check_openroadm_topo_ROADMA_DEG(self):
response = test_utils.get_ordm_topo_request("node/ROADM-A1-DEG2")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- print(res)
freq_map = base64.b64decode(
res['node'][0]['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[0], 255, "Index 1 should be available")
+ self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
liste_tp = res['node'][0]['ietf-network-topology:termination-point']
for ele in liste_tp:
if ele['tp-id'] == 'DEG2-CTP-TXRX':
- self.assertEqual(ele['org-openroadm-network-topology:ctp-attributes']['avail-freq-maps'][0]['freq-map'],
- AVAILABLE_FREQ_MAP)
+ freq_map = base64.b64decode(
+ ele['org-openroadm-network-topology:ctp-attributes']['avail-freq-maps'][0]['freq-map'])
+ freq_map_array = [int(x) for x in freq_map]
+ self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
if ele['tp-id'] == 'DEG2-TTP-TXRX':
- self.assertNotIn(
- 'org-openroadm-network-topology:tx-ttp-attributes', dict.keys(ele))
+ 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], 255, "Lambda 1 should be available")
time.sleep(3)
def test_62_connect_sprdA_3_N1_to_roadmA_PP2(self):
Code Review / transportpce.git / blobdiff