# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+# pylint: disable=no-member
+# pylint: disable=too-many-public-methods
-import json
+import base64
import time
import unittest
import requests
from common import test_utils
-
class TransportPCEFulltesting(unittest.TestCase):
-
- cr_serv_sample_data = { "input": {
- "sdnc-request-header": {
- "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
- "rpc-action": "service-create",
- "request-system-id": "appname",
- "notification-url":
- "http://localhost:8585/NotificationServer/notify"
+ cr_serv_sample_data = {"input": {
+ "sdnc-request-header": {
+ "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+ "rpc-action": "service-create",
+ "request-system-id": "appname",
+ "notification-url":
+ "http://localhost:8585/NotificationServer/notify"
+ },
+ "service-name": "service1",
+ "common-id": "ASATT1234567",
+ "connection-type": "service",
+ "service-a-end": {
+ "service-rate": "100",
+ "node-id": "XPDRA01",
+ "service-format": "Ethernet",
+ "clli": "SNJSCAMCJP8",
+ "tx-direction": {
+ "port": {
+ "port-device-name":
+ "ROUTER_SNJSCAMCJP8_000000.00_00",
+ "port-type": "router",
+ "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0",
+ "port-rack": "000000.00",
+ "port-shelf": "00"
},
- "service-name": "service1",
- "common-id": "ASATT1234567",
- "connection-type": "service",
- "service-a-end": {
- "service-rate": "100",
- "node-id": "XPDRA01",
- "service-format": "Ethernet",
- "clli": "SNJSCAMCJP8",
- "tx-direction": {
- "port": {
- "port-device-name":
- "ROUTER_SNJSCAMCJP8_000000.00_00",
- "port-type": "router",
- "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0",
- "port-rack": "000000.00",
- "port-shelf": "00"
- },
- "lgx": {
- "lgx-device-name":
- "LGX Panel_SNJSCAMCJP8_000000.00_00",
- "lgx-port-name": "LGX Back.3",
- "lgx-port-rack": "000000.00",
- "lgx-port-shelf": "00"
- }
- },
- "rx-direction": {
- "port": {
- "port-device-name":
- "ROUTER_SNJSCAMCJP8_000000.00_00",
- "port-type": "router",
- "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0",
- "port-rack": "000000.00",
- "port-shelf": "00"
- },
- "lgx": {
- "lgx-device-name":
- "LGX Panel_SNJSCAMCJP8_000000.00_00",
- "lgx-port-name": "LGX Back.4",
- "lgx-port-rack": "000000.00",
- "lgx-port-shelf": "00"
- }
- },
- "optic-type": "gray"
+ "lgx": {
+ "lgx-device-name":
+ "LGX Panel_SNJSCAMCJP8_000000.00_00",
+ "lgx-port-name": "LGX Back.3",
+ "lgx-port-rack": "000000.00",
+ "lgx-port-shelf": "00"
+ }
+ },
+ "rx-direction": {
+ "port": {
+ "port-device-name":
+ "ROUTER_SNJSCAMCJP8_000000.00_00",
+ "port-type": "router",
+ "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0",
+ "port-rack": "000000.00",
+ "port-shelf": "00"
},
- "service-z-end": {
- "service-rate": "100",
- "node-id": "XPDRC01",
- "service-format": "Ethernet",
- "clli": "SNJSCAMCJT4",
- "tx-direction": {
- "port": {
- "port-device-name":
- "ROUTER_SNJSCAMCJT4_000000.00_00",
- "port-type": "router",
- "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0",
- "port-rack": "000000.00",
- "port-shelf": "00"
- },
- "lgx": {
- "lgx-device-name":
- "LGX Panel_SNJSCAMCJT4_000000.00_00",
- "lgx-port-name": "LGX Back.29",
- "lgx-port-rack": "000000.00",
- "lgx-port-shelf": "00"
- }
- },
- "rx-direction": {
- "port": {
- "port-device-name":
- "ROUTER_SNJSCAMCJT4_000000.00_00",
- "port-type": "router",
- "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0",
- "port-rack": "000000.00",
- "port-shelf": "00"
- },
- "lgx": {
- "lgx-device-name":
- "LGX Panel_SNJSCAMCJT4_000000.00_00",
- "lgx-port-name": "LGX Back.30",
- "lgx-port-rack": "000000.00",
- "lgx-port-shelf": "00"
- }
- },
- "optic-type": "gray"
+ "lgx": {
+ "lgx-device-name":
+ "LGX Panel_SNJSCAMCJP8_000000.00_00",
+ "lgx-port-name": "LGX Back.4",
+ "lgx-port-rack": "000000.00",
+ "lgx-port-shelf": "00"
+ }
+ },
+ "optic-type": "gray"
+ },
+ "service-z-end": {
+ "service-rate": "100",
+ "node-id": "XPDRC01",
+ "service-format": "Ethernet",
+ "clli": "SNJSCAMCJT4",
+ "tx-direction": {
+ "port": {
+ "port-device-name":
+ "ROUTER_SNJSCAMCJT4_000000.00_00",
+ "port-type": "router",
+ "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0",
+ "port-rack": "000000.00",
+ "port-shelf": "00"
+ },
+ "lgx": {
+ "lgx-device-name":
+ "LGX Panel_SNJSCAMCJT4_000000.00_00",
+ "lgx-port-name": "LGX Back.29",
+ "lgx-port-rack": "000000.00",
+ "lgx-port-shelf": "00"
+ }
+ },
+ "rx-direction": {
+ "port": {
+ "port-device-name":
+ "ROUTER_SNJSCAMCJT4_000000.00_00",
+ "port-type": "router",
+ "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0",
+ "port-rack": "000000.00",
+ "port-shelf": "00"
},
- "due-date": "2016-11-28T00:00:01Z",
- "operator-contact": "pw1234"
- }
- }
+ "lgx": {
+ "lgx-device-name":
+ "LGX Panel_SNJSCAMCJT4_000000.00_00",
+ "lgx-port-name": "LGX Back.30",
+ "lgx-port-rack": "000000.00",
+ "lgx-port-shelf": "00"
+ }
+ },
+ "optic-type": "gray"
+ },
+ "due-date": "2016-11-28T00:00:01Z",
+ "operator-contact": "pw1234"
+ }
+ }
processes = None
WAITING = 20
@classmethod
def tearDownClass(cls):
+ # pylint: disable=not-an-iterable
for process in cls.processes:
test_utils.shutdown_process(process)
print("all processes killed")
time.sleep(2)
def test_06_connect_roadmA_PP1_to_xpdrA_N1(self):
- url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links"
- data = {
- "networkutils:input": {
- "networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA01",
- "networkutils:xpdr-num": "1",
- "networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMA01",
- "networkutils:srg-num": "1",
- "networkutils:termination-point-num": "SRG1-PP1-TXRX"
- }
- }
- }
- response = test_utils.post_request(url, data)
response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "1",
"ROADMA01", "1", "SRG1-PP1-TXRX")
self.assertEqual(response.status_code, requests.codes.ok)
def test_09_add_omsAttributes_ROADMA_ROADMC(self):
# Config ROADMA-ROADMC oms-attributes
data = {"span": {
- "clfi": "fiber1",
"auto-spanloss": "true",
"spanloss-base": 11.4,
"spanloss-current": 12,
def test_10_add_omsAttributes_ROADMC_ROADMA(self):
# Config ROADMC-ROADMA oms-attributes
data = {"span": {
- "clfi": "fiber1",
"auto-spanloss": "true",
"spanloss-base": 11.4,
"spanloss-current": 12,
time.sleep(2)
def test_13_check_xc1_ROADMA(self):
- response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1")
+ response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
- 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1',
+ 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768',
'wavelength-number': 1,
'opticalControlMode': 'gainLoss',
'target-output-power': -3.0
res['roadm-connections'][0]
)
self.assertDictEqual(
- {'src-if': 'SRG1-PP1-TXRX-1'},
+ {'src-if': 'SRG1-PP1-TXRX-761:768'},
res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'DEG1-TTP-TXRX-1'},
+ {'dst-if': 'DEG1-TTP-TXRX-761:768'},
res['roadm-connections'][0]['destination'])
time.sleep(5)
def test_14_check_xc1_ROADMC(self):
- response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1")
+ response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
- 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1',
+ 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768',
'wavelength-number': 1,
'opticalControlMode': 'gainLoss',
'target-output-power': 2.0
res['roadm-connections'][0]
)
self.assertDictEqual(
- {'src-if': 'SRG1-PP1-TXRX-1'},
+ {'src-if': 'SRG1-PP1-TXRX-761:768'},
res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'DEG2-TTP-TXRX-1'},
+ {'dst-if': 'DEG2-TTP-TXRX-761:768'},
res['roadm-connections'][0]['destination'])
time.sleep(5)
liste_tp = res['node'][0]['ietf-network-topology:termination-point']
for ele in liste_tp:
if ele['tp-id'] == 'XPDR1-NETWORK1':
- self.assertEqual({u'frequency': 196.1, u'width': 40},
+ self.assertEqual({u'frequency': 196.1,
+ u'width': 40},
ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
- if ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT3':
- self.assertNotIn(
- 'org-openroadm-network-topology:xpdr-client-attributes',
- dict.keys(ele))
+ if ele['tp-id'] == 'XPDR1-CLIENT2' or ele['tp-id'] == 'XPDR1-CLIENT1':
+ self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
if ele['tp-id'] == 'XPDR1-NETWORK2':
- self.assertNotIn(
- 'org-openroadm-network-topology:xpdr-network-attributes',
- dict.keys(ele))
+ self.assertNotIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele))
time.sleep(3)
def test_16_check_topo_ROADMA_SRG1(self):
response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertNotIn({u'index': 1},
- res['node'][0][
- u'org-openroadm-network-topology:srg-attributes'][
- 'available-wavelengths'])
+ 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[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_17_check_topo_ROADMA_DEG1(self):
response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertNotIn({u'index': 1},
- res['node'][0][
- u'org-openroadm-network-topology:'
- u'degree-attributes'][
- 'available-wavelengths'])
+ 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[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'] == 'DEG1-CTP-TXRX':
- self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40},
- ele['org-openroadm-network-topology:'
- 'ctp-attributes'][
- 'used-wavelengths'])
- if ele['tp-id'] == 'DEG1-TTP-TXRX':
- self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40},
- ele['org-openroadm-network-topology:'
- 'tx-ttp-attributes'][
- 'used-wavelengths'])
+ if ele['tp-id'] == 'DEG2-CTP-TXRX':
+ 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':
+ 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_18_connect_xprdA_N2_to_roadmA_PP2(self):
time.sleep(1)
def test_24_check_xc2_ROADMA(self):
- response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-2")
+ response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-753:760")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
- 'connection-number': 'DEG1-TTP-TXRX-SRG1-PP2-TXRX-2',
- 'wavelength-number': 2,
- 'opticalControlMode': 'power'
- }, **res['roadm-connections'][0]),
+ 'connection-number': 'DEG1-TTP-TXRX-SRG1-PP2-TXRX-753:760',
+ 'wavelength-number': 2,
+ 'opticalControlMode': 'power'
+ }, **res['roadm-connections'][0]),
res['roadm-connections'][0]
)
self.assertDictEqual(
- {'src-if': 'DEG1-TTP-TXRX-2'},
+ {'src-if': 'DEG1-TTP-TXRX-753:760'},
res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'SRG1-PP2-TXRX-2'},
+ {'dst-if': 'SRG1-PP2-TXRX-753:760'},
res['roadm-connections'][0]['destination'])
def test_25_check_topo_XPDRA(self):
liste_tp = res['node'][0]['ietf-network-topology:termination-point']
for ele in liste_tp:
if ele['tp-id'] == 'XPDR1-NETWORK1':
- self.assertEqual({u'frequency': 196.1, u'width': 40},
- ele['org-openroadm-network-topology:'
- 'xpdr-network-attributes'][
- 'wavelength'])
+ self.assertEqual({u'frequency': 196.1,
+ u'width': 40},
+ ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
if ele['tp-id'] == 'XPDR1-NETWORK2':
- self.assertEqual({u'frequency': 196.05, u'width': 40},
- ele['org-openroadm-network-topology:'
- 'xpdr-network-attributes'][
- 'wavelength'])
- if ele['tp-id'] == 'XPDR1-CLIENT1' or \
- ele['tp-id'] == 'XPDR1-CLIENT3':
- self.assertNotIn(
- 'org-openroadm-network-topology:xpdr-client-attributes',
- dict.keys(ele))
+ self.assertEqual({u'frequency': 196.05,
+ u'width': 40},
+ ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+ if ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT2':
+ self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
time.sleep(10)
def test_26_check_topo_ROADMA_SRG1(self):
response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertNotIn({u'index': 1}, res['node'][0][
- u'org-openroadm-network-topology:srg-attributes'][
- 'available-wavelengths'])
- self.assertNotIn({u'index': 2}, res['node'][0][
- u'org-openroadm-network-topology:srg-attributes'][
- 'available-wavelengths'])
+ 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[95], 0, "Lambda 1 should not be available")
+ self.assertEqual(freq_map_array[94], 0, "Lambda 2 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'])
- self.assertNotIn({u'index': 2, u'frequency': 196.05,
- 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")
+ self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
if ele['tp-id'] == 'SRG1-PP2-TXRX':
- self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40},
- ele['org-openroadm-network-topology:'
- 'pp-attributes']['used-wavelength'])
- self.assertNotIn({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], 255, "Lambda 1 should be available")
+ self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
if ele['tp-id'] == 'SRG1-PP3-TXRX':
- self.assertNotIn('org-openroadm-network-topology:pp-attributes',
- dict.keys(ele))
+ self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
time.sleep(10)
def test_27_check_topo_ROADMA_DEG1(self):
response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertNotIn({u'index': 1}, res['node'][0][
- u'org-openroadm-network-topology:degree-attributes'][
- 'available-wavelengths'])
- self.assertNotIn({u'index': 2}, res['node'][0][
- u'org-openroadm-network-topology:degree-attributes'][
- 'available-wavelengths'])
+ 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[95], 0, "Lambda 1 should not be available")
+ self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
liste_tp = res['node'][0]['ietf-network-topology:termination-point']
for ele in liste_tp:
- if ele['tp-id'] == 'DEG1-CTP-TXRX':
- self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40},
- ele['org-openroadm-network-topology:'
- 'ctp-attributes']['used-wavelengths'])
- self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40},
- ele['org-openroadm-network-topology:'
- 'ctp-attributes']['used-wavelengths'])
- if ele['tp-id'] == 'DEG1-TTP-TXRX':
- self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40},
- ele['org-openroadm-network-topology:'
- 'tx-ttp-attributes']['used-wavelengths'])
- self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40},
- ele['org-openroadm-network-topology:'
- 'tx-ttp-attributes']['used-wavelengths'])
+ if ele['tp-id'] == 'DEG2-CTP-TXRX':
+ 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")
+ self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
+ if ele['tp-id'] == 'DEG2-TTP-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, "Lambda 1 should not be available")
+ self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
time.sleep(10)
# creation service test on a non-available resource
# contains 2 elements
def test_29_delete_eth_service3(self):
- url = "{}/operations/org-openroadm-service:service-delete"
- data = {"input": {
- "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": "service3",
- "tail-retention": "no"
- }
- }
- }
- response = test_utils.post_request(url, data)
+ response = test_utils.service_delete_request("service3")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Service \'service3\' does not exist in datastore',
time.sleep(20)
def test_30_delete_eth_service1(self):
- url = "{}/operations/org-openroadm-service:service-delete"
- data = {"input": {
- "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": "service1",
- "tail-retention": "no"
- }
- }
- }
- response = test_utils.post_request(url, data)
+ response = test_utils.service_delete_request("service1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Renderer service delete in progress',
time.sleep(20)
def test_31_delete_eth_service2(self):
- url = "{}/operations/org-openroadm-service:service-delete"
- data = {"input": {
- "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": "service2",
- "tail-retention": "no"
- }
- }
- }
- response = test_utils.post_request(url, data)
+ response = test_utils.service_delete_request("service2")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Renderer service delete in progress',
for ele in liste_tp:
if ((ele[u'org-openroadm-common-network:tp-type'] ==
'XPONDER-CLIENT')
- and (ele['tp-id'] == 'XPDR1-CLIENT1' or ele[
- 'tp-id'] == 'XPDR1-CLIENT3')):
+ and (ele['tp-id'] == 'XPDR1-CLIENT1' or ele[
+ 'tp-id'] == 'XPDR1-CLIENT3')):
self.assertNotIn(
'org-openroadm-network-topology:xpdr-client-attributes',
dict.keys(ele))
response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertIn({u'index': 1}, res['node'][0][
- u'org-openroadm-network-topology:srg-attributes'][
- 'available-wavelengths'])
- self.assertIn({u'index': 2}, res['node'][0][
- u'org-openroadm-network-topology:srg-attributes'][
- 'available-wavelengths'])
+ 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[95], 255, "Lambda 1 should be available")
+ self.assertEqual(freq_map_array[94], 255, "Lambda 2 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' or \
- ele['tp-id'] == 'SRG1-PP1-TXRX':
- self.assertNotIn('org-openroadm-network-topology:pp-attributes',
- dict.keys(ele))
+ if ele['tp-id'] == 'SRG1-PP1-TXRX' or ele['tp-id'] == 'SRG1-PP2-TXRX':
+ 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")
+ self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
+ elif ele['tp-id'] == 'SRG1-CP-TXRX':
+ freq_map = base64.b64decode(
+ ele['org-openroadm-network-topology:cp-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")
+ self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
else:
- self.assertNotIn('org-openroadm-network-topology:pp-attributes',
- dict.keys(ele))
+ self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
time.sleep(10)
def test_35_check_topo_ROADMA_DEG1(self):
response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertIn({u'index': 1}, res['node'][0][
- u'org-openroadm-network-topology:degree-attributes'][
- 'available-wavelengths'])
- self.assertIn({u'index': 2}, res['node'][0][
- u'org-openroadm-network-topology:degree-attributes'][
- 'available-wavelengths'])
+ 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[95], 255, "Lambda 1 should be available")
+ self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
liste_tp = res['node'][0]['ietf-network-topology:termination-point']
for ele in liste_tp:
- if ele['tp-id'] == 'DEG1-CTP-TXRX':
- self.assertNotIn('org-openroadm-network-topology:'
- 'ctp-attributes', dict.keys(ele))
- if ele['tp-id'] == 'DEG1-TTP-TXRX':
- self.assertNotIn('org-openroadm-network-topology:'
- 'tx-ttp-attributes', dict.keys(ele))
+ if ele['tp-id'] == 'DEG2-CTP-TXRX':
+ 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")
+ self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
+ if ele['tp-id'] == 'DEG2-TTP-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], 255, "Lambda 1 should be available")
+ self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
time.sleep(10)
# test service-create for Optical Channel (OC) service from srg-pp to srg-pp
time.sleep(1)
def test_38_check_xc1_ROADMA(self):
- response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1")
+ response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
- 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1',
+ 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768',
'wavelength-number': 1,
'opticalControlMode': 'gainLoss',
'target-output-power': -3.0
res['roadm-connections'][0]
)
self.assertDictEqual(
- {'src-if': 'SRG1-PP1-TXRX-1'},
+ {'src-if': 'SRG1-PP1-TXRX-761:768'},
res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'DEG1-TTP-TXRX-1'},
+ {'dst-if': 'DEG1-TTP-TXRX-761:768'},
res['roadm-connections'][0]['destination'])
time.sleep(7)
def test_39_check_xc1_ROADMC(self):
- response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1")
+ response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
- 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1',
+ 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768',
'wavelength-number': 1,
'opticalControlMode': 'gainLoss',
'target-output-power': 2.0
res['roadm-connections'][0]
)
self.assertDictEqual(
- {'src-if': 'SRG1-PP1-TXRX-1'},
+ {'src-if': 'SRG1-PP1-TXRX-761:768'},
res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'DEG2-TTP-TXRX-1'},
+ {'dst-if': 'DEG2-TTP-TXRX-761:768'},
res['roadm-connections'][0]['destination'])
time.sleep(7)
time.sleep(2)
def test_42_check_xc2_ROADMA(self):
- response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-2")
+ response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-753:760")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
- 'connection-number': 'SRG1-PP2-TXRX-DEG1-TTP-TXRX-2',
+ 'connection-number': 'SRG1-PP2-TXRX-DEG1-TTP-TXRX-753:760',
'wavelength-number': 2,
'opticalControlMode': 'gainLoss',
'target-output-power': -3.0
res['roadm-connections'][0]
)
self.assertDictEqual(
- {'src-if': 'SRG1-PP2-TXRX-2'},
+ {'src-if': 'SRG1-PP2-TXRX-753:760'},
res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'DEG1-TTP-TXRX-2'},
+ {'dst-if': 'DEG1-TTP-TXRX-753:760'},
res['roadm-connections'][0]['destination'])
time.sleep(2)
time.sleep(3)
def test_44_delete_oc_service1(self):
- url = "{}/operations/org-openroadm-service:service-delete"
- data = {"input": {
- "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": "service1",
- "tail-retention": "no"
- }
- }
- }
- response = test_utils.post_request(url, data)
+ response = test_utils.service_delete_request("service1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Renderer service delete in progress',
time.sleep(20)
def test_45_delete_oc_service2(self):
- url = "{}/operations/org-openroadm-service:service-delete"
- data = {"input": {
- "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": "service2",
- "tail-retention": "no"
- }
- }
- }
- response = test_utils.post_request(url, data)
+ response = test_utils.service_delete_request("service2")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Renderer service delete in progress',
def test_46_get_no_oc_services(self):
print("start test")
response = test_utils.get_service_list_request("")
- self.assertEqual(response.status_code, requests.codes.not_found)
+ self.assertEqual(response.status_code, requests.codes.conflict)
res = response.json()
self.assertIn(
{
def test_50_loop_create_oc_service(self):
response = test_utils.get_service_list_request("services/service1")
if response.status_code != 404:
- url = "{}/operations/org-openroadm-service:service-delete"
- data = {"input": {
- "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": "service1",
- "tail-retention": "no"
- }
- }
- }
- test_utils.post_request(url, data)
+ response = test_utils.service_delete_request("service1")
time.sleep(5)
for i in range(1, 6):
Code Review / transportpce.git / blobdiff