X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_end2end.py;h=759fdbaa0f2161ac30dbf795281586adcb787904;hb=f4addc552d711cd1a6fb52fe2d27a92f86f95410;hp=ebacc286857167fb1263a397070f8e01d5640732;hpb=e83596bba80ba7eca2d0fa7d814d6d0b055f4255;p=transportpce.git diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py index ebacc2868..759fdbaa0 100644 --- a/tests/transportpce_tests/1.2.1/test_end2end.py +++ b/tests/transportpce_tests/1.2.1/test_end2end.py @@ -8,20 +8,118 @@ # 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 +from common.flexgrid_utils import INDEX_1_USED_FREQ_MAP, INDEX_1_2_USED_FREQ_MAP, AVAILABLE_FREQ_MAP, check_freq_map class TransportPCEFulltesting(unittest.TestCase): - - WAITING = 20 # nominal value is 300 - + 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" + }, + "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" + }, + "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" + }, + "due-date": "2016-11-28T00:00:01Z", + "operator-contact": "pw1234" + } + } processes = None + WAITING = 20 @classmethod def setUpClass(cls): @@ -30,6 +128,7 @@ class TransportPCEFulltesting(unittest.TestCase): @classmethod def tearDownClass(cls): + # pylint: disable=not-an-iterable for process in cls.processes: test_utils.shutdown_process(process) print("all processes killed") @@ -64,20 +163,6 @@ class TransportPCEFulltesting(unittest.TestCase): 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) @@ -107,7 +192,6 @@ class TransportPCEFulltesting(unittest.TestCase): 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, @@ -123,7 +207,6 @@ class TransportPCEFulltesting(unittest.TestCase): 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, @@ -138,105 +221,8 @@ class TransportPCEFulltesting(unittest.TestCase): # test service-create for Eth service from xpdr to xpdr def test_11_create_eth_service1(self): - 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" - }, - "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" - }, - "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" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.service_create_request(data) + 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() self.assertIn('PCE calculation in progress', @@ -326,10 +312,10 @@ class TransportPCEFulltesting(unittest.TestCase): 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[0], 0, "Index 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': @@ -345,18 +331,18 @@ class TransportPCEFulltesting(unittest.TestCase): 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[0], 0, "Index 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}, + 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'][ - 'used-wavelengths']) + 'avail-freq-maps']) if ele['tp-id'] == 'DEG1-TTP-TXRX': self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, ele['org-openroadm-network-topology:' @@ -401,105 +387,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_22_create_eth_service2(self): - 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": "service2", - "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" - }, - "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" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.service_create_request(data) + self.cr_serv_sample_data["input"]["service-name"] = "service2" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -529,10 +418,10 @@ class TransportPCEFulltesting(unittest.TestCase): # 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-2', + 'wavelength-number': 2, + 'opticalControlMode': 'power' + }, **res['roadm-connections'][0]), res['roadm-connections'][0] ) self.assertDictEqual( @@ -559,7 +448,7 @@ class TransportPCEFulltesting(unittest.TestCase): 'xpdr-network-attributes'][ 'wavelength']) if ele['tp-id'] == 'XPDR1-CLIENT1' or \ - ele['tp-id'] == 'XPDR1-CLIENT3': + ele['tp-id'] == 'XPDR1-CLIENT3': self.assertNotIn( 'org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele)) @@ -569,12 +458,11 @@ class TransportPCEFulltesting(unittest.TestCase): 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[0], 0, "Index 1 should not be available") + self.assertEqual(freq_map_array[1], 0, "Index 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': @@ -602,21 +490,19 @@ class TransportPCEFulltesting(unittest.TestCase): 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[0], 0, "Index 1 should not be available") + self.assertEqual(freq_map_array[1], 0, "Index 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}, + 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_2_USED_FREQ_MAP}, ele['org-openroadm-network-topology:' - 'ctp-attributes']['used-wavelengths']) + 'ctp-attributes'][ + 'avail-freq-maps']) if ele['tp-id'] == 'DEG1-TTP-TXRX': self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, ele['org-openroadm-network-topology:' @@ -628,105 +514,8 @@ class TransportPCEFulltesting(unittest.TestCase): # creation service test on a non-available resource def test_28_create_eth_service3(self): - 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": "service3", - "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" - }, - "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" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.service_create_request(data) + self.cr_serv_sample_data["input"]["service-name"] = "service3" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -740,22 +529,7 @@ class TransportPCEFulltesting(unittest.TestCase): # 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', @@ -766,22 +540,7 @@ class TransportPCEFulltesting(unittest.TestCase): 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', @@ -790,22 +549,7 @@ class TransportPCEFulltesting(unittest.TestCase): 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', @@ -829,8 +573,8 @@ class TransportPCEFulltesting(unittest.TestCase): 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)) @@ -848,38 +592,26 @@ class TransportPCEFulltesting(unittest.TestCase): 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']) + self.assertTrue(check_freq_map(freq_map), "Index 1 and 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)) - 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']) + self.assertTrue(check_freq_map(freq_map), "Index 1 and 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)) + self.assertEqual(ele['org-openroadm-network-topology:ctp-attributes']['avail-freq-maps'][0]['freq-map'], + AVAILABLE_FREQ_MAP) if ele['tp-id'] == 'DEG1-TTP-TXRX': self.assertNotIn('org-openroadm-network-topology:' 'tx-ttp-attributes', dict.keys(ele)) @@ -887,105 +619,13 @@ class TransportPCEFulltesting(unittest.TestCase): # test service-create for Optical Channel (OC) service from srg-pp to srg-pp def test_36_create_oc_service1(self): - 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": "roadm-line", - "service-a-end": { - "service-rate": "100", - "node-id": "ROADMA01", - "service-format": "OC", - "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" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "ROADMC01", - "service-format": "OC", - "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" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.service_create_request(data) + self.cr_serv_sample_data["input"]["service-name"] = "service1" + self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line" + self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "ROADMA01" + self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OC" + self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "ROADMC01" + self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OC" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1053,105 +693,13 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(7) def test_40_create_oc_service2(self): - 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": "service2", - "common-id": "ASATT1234567", - "connection-type": "roadm-line", - "service-a-end": { - "service-rate": "100", - "node-id": "ROADMA01", - "service-format": "OC", - "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" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "ROADMC01", - "service-format": "OC", - "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" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.service_create_request(data) + self.cr_serv_sample_data["input"]["service-name"] = "service2" + self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line" + self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "ROADMA01" + self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OC" + self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "ROADMC01" + self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OC" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1202,22 +750,7 @@ class TransportPCEFulltesting(unittest.TestCase): 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', @@ -1226,22 +759,7 @@ class TransportPCEFulltesting(unittest.TestCase): 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', @@ -1252,7 +770,7 @@ class TransportPCEFulltesting(unittest.TestCase): 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( { @@ -1291,22 +809,7 @@ class TransportPCEFulltesting(unittest.TestCase): 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):