import subprocess
import time
import unittest
+import test_utils
class TransportPCEFulltesting(unittest.TestCase):
honeynode_process3 = None
honeynode_process4 = None
restconf_baseurl = "http://localhost:8181/restconf"
- WAITING = 20 #nominal value is 300
+ WAITING = 20 # nominal value is 300
-#START_IGNORE_XTESTING
+# START_IGNORE_XTESTING
@classmethod
- def __start_honeynode1(cls):
- executable = ("./honeynode/2.2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc"
- "/honeynode-distribution-1.18.01/honeycomb-tpce")
- if os.path.isfile(executable):
- with open('honeynode1.log', 'w') as outfile:
- cls.honeynode_process1 = subprocess.Popen(
- [executable, "17840", "sample_configs/openroadm/2.2.1/oper-XPDRA.xml"],
- stdout=outfile)
-
- @classmethod
- def __start_honeynode2(cls):
- executable = ("./honeynode/2.2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc"
- "/honeynode-distribution-1.18.01/honeycomb-tpce")
- if os.path.isfile(executable):
- with open('honeynode2.log', 'w') as outfile:
- cls.honeynode_process2 = subprocess.Popen(
- [executable, "17841", "sample_configs/openroadm/2.2.1/oper-ROADMA.xml"],
- stdout=outfile)
+ def setUpClass(cls):
+ print("starting honeynode1...")
+ cls.honeynode_process1 = test_utils.start_xpdra_honeynode()
+ time.sleep(20)
- @classmethod
- def __start_honeynode3(cls):
- executable = ("./honeynode/2.2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc"
- "/honeynode-distribution-1.18.01/honeycomb-tpce")
- if os.path.isfile(executable):
- with open('honeynode3.log', 'w') as outfile:
- cls.honeynode_process3 = subprocess.Popen(
- [executable, "17843", "sample_configs/openroadm/2.2.1/oper-ROADMC.xml"],
- stdout=outfile)
+ print("starting honeynode2...")
+ cls.honeynode_process2 = test_utils.start_roadma_honeynode()
+ time.sleep(20)
- @classmethod
- def __start_honeynode4(cls):
- executable = ("./honeynode/2.2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc"
- "/honeynode-distribution-1.18.01/honeycomb-tpce")
- if os.path.isfile(executable):
- with open('honeynode4.log', 'w') as outfile:
- cls.honeynode_process4 = subprocess.Popen(
- [executable, "17844", "sample_configs/openroadm/2.2.1/oper-XPDRC.xml"],
- stdout=outfile)
+ print("starting honeynode3...")
+ cls.honeynode_process3 = test_utils.start_roadmc_honeynode()
+ time.sleep(20)
- @classmethod
- def __start_odl(cls):
- executable = "../karaf/target/assembly/bin/karaf"
- with open('odl.log', 'w') as outfile:
- cls.odl_process = subprocess.Popen(
- ["bash", executable, "server"], stdout=outfile,
- stdin=open(os.devnull))
+ print("starting honeynode4...")
+ cls.honeynode_process4 = test_utils.start_xpdrc_honeynode()
+ time.sleep(20)
+ print("all honeynodes started")
- @classmethod
- def setUpClass(cls):
- print ("starting honeynode1")
- cls.__start_honeynode1()
- time.sleep(40)
- print ("starting honeynode2")
- cls.__start_honeynode2()
- time.sleep(40)
- print ("starting honeynode3")
- cls.__start_honeynode3()
- time.sleep(40)
- print ("starting honeynode4")
- cls.__start_honeynode4()
- time.sleep(40)
- print ("starting opendaylight")
- cls.__start_odl()
+ print("starting opendaylight...")
+ cls.odl_process = test_utils.start_tpce()
time.sleep(80)
+ print("opendaylight started")
@classmethod
def tearDownClass(cls):
child.wait()
cls.honeynode_process4.send_signal(signal.SIGINT)
cls.honeynode_process4.wait()
- print ("all processes killed")
+ print("all processes killed")
def setUp(self): # instruction executed before each test method
- print ("execution of {}".format(self.id().split(".")[-1]))
+ print("execution of {}".format(self.id().split(".")[-1]))
-#END_IGNORE_XTESTING
+# END_IGNORE_XTESTING
# connect netconf devices
def test_01_connect_xpdrA(self):
url = ("{}/config/network-topology:"
"network-topology/topology/topology-netconf/node/XPDR-A1"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"node": [{
"node-id": "XPDR-A1",
"netconf-node-topology:username": "admin",
def test_02_connect_xpdrC(self):
url = ("{}/config/network-topology:"
"network-topology/topology/topology-netconf/node/XPDR-C1"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"node": [{
"node-id": "XPDR-C1",
"netconf-node-topology:username": "admin",
"network-topology/topology/topology-netconf/node/ROADM-A1"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADM-A1",
- "netconf-node-topology:username": "admin",
- "netconf-node-topology:password": "admin",
- "netconf-node-topology:host": "127.0.0.1",
- "netconf-node-topology:port": "17841",
- "netconf-node-topology:tcp-only": "false",
- "netconf-node-topology:pass-through": {}}]}
+ "node-id": "ROADM-A1",
+ "netconf-node-topology:username": "admin",
+ "netconf-node-topology:password": "admin",
+ "netconf-node-topology:host": "127.0.0.1",
+ "netconf-node-topology:port": "17841",
+ "netconf-node-topology:tcp-only": "false",
+ "netconf-node-topology:pass-through": {}}]}
headers = {'content-type': 'application/json'}
response = requests.request(
- "PUT", url, data=json.dumps(data), headers=headers,
- auth=('admin', 'admin'))
+ "PUT", url, data=json.dumps(data), headers=headers,
+ auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.created)
time.sleep(20)
"network-topology/topology/topology-netconf/node/ROADM-C1"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADM-C1",
- "netconf-node-topology:username": "admin",
- "netconf-node-topology:password": "admin",
- "netconf-node-topology:host": "127.0.0.1",
- "netconf-node-topology:port": "17843",
- "netconf-node-topology:tcp-only": "false",
- "netconf-node-topology:pass-through": {}}]}
+ "node-id": "ROADM-C1",
+ "netconf-node-topology:username": "admin",
+ "netconf-node-topology:password": "admin",
+ "netconf-node-topology:host": "127.0.0.1",
+ "netconf-node-topology:port": "17843",
+ "netconf-node-topology:tcp-only": "false",
+ "netconf-node-topology:pass-through": {}}]}
headers = {'content-type': 'application/json'}
response = requests.request(
- "PUT", url, data=json.dumps(data), headers=headers,
- auth=('admin', 'admin'))
+ "PUT", url, data=json.dumps(data), headers=headers,
+ auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.created)
time.sleep(20)
}
headers = {'content-type': 'application/json'}
response = requests.request(
- "POST", url, data=json.dumps(data),
- headers=headers, auth=('admin', 'admin'))
+ "POST", url, data=json.dumps(data),
+ headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
}
headers = {'content-type': 'application/json'}
response = requests.request(
- "POST", url, data=json.dumps(data),
- headers=headers, auth=('admin', 'admin'))
+ "POST", url, data=json.dumps(data),
+ headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
time.sleep(2)
-
def test_07_connect_xprdC_N1_to_roadmC_PP1(self):
url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(self.restconf_baseurl)
data = {
}
headers = {'content-type': 'application/json'}
response = requests.request(
- "POST", url, data=json.dumps(data),
- headers=headers, auth=('admin', 'admin'))
+ "POST", url, data=json.dumps(data),
+ headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
time.sleep(2)
-
def test_08_connect_roadmC_PP1_to_xpdrC_N1(self):
url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(self.restconf_baseurl)
data = {
}
headers = {'content-type': 'application/json'}
response = requests.request(
- "POST", url, data=json.dumps(data),
- headers=headers, auth=('admin', 'admin'))
+ "POST", url, data=json.dumps(data),
+ headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
time.sleep(2)
+ def test_09_add_omsAttributes_ROADMA_ROADMC(self):
+ # Config ROADMA-ROADMC oms-attributes
+ url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
+ "link/ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
+ "OMS-attributes/span"
+ .format(self.restconf_baseurl))
+ data = {"span": {
+ "auto-spanloss": "true",
+ "spanloss-base": 11.4,
+ "spanloss-current": 12,
+ "engineered-spanloss": 12.2,
+ "link-concatenation": [{
+ "SRLG-Id": 0,
+ "fiber-type": "smf",
+ "SRLG-length": 100000,
+ "pmd": 0.5}]}}
+ headers = {'content-type': 'application/json'}
+ response = requests.request(
+ "PUT", url, data=json.dumps(data), headers=headers,
+ auth=('admin', 'admin'))
+ self.assertEqual(response.status_code, requests.codes.created)
+
+ def test_10_add_omsAttributes_ROADMC_ROADMA(self):
+ # Config ROADMC-ROADMA oms-attributes
+ url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
+ "link/ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
+ "OMS-attributes/span"
+ .format(self.restconf_baseurl))
+ data = {"span": {
+ "auto-spanloss": "true",
+ "spanloss-base": 11.4,
+ "spanloss-current": 12,
+ "engineered-spanloss": 12.2,
+ "link-concatenation": [{
+ "SRLG-Id": 0,
+ "fiber-type": "smf",
+ "SRLG-length": 100000,
+ "pmd": 0.5}]}}
+ headers = {'content-type': 'application/json'}
+ response = requests.request(
+ "PUT", url, data=json.dumps(data), headers=headers,
+ auth=('admin', 'admin'))
+ self.assertEqual(response.status_code, requests.codes.created)
-#test service-create for Eth service from xpdr to xpdr
- def test_09_create_eth_service1(self):
+# test service-create for Eth service from xpdr to xpdr
+ def test_11_create_eth_service1(self):
url = ("{}/operations/org-openroadm-service:service-create"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"input": {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
},
"due-date": "2016-11-28T00:00:01Z",
"operator-contact": "pw1234"
- }
- }
+ }
+ }
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"POST", url, data=json.dumps(data), headers=headers,
auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ res['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
- def test_10_get_eth_service1(self):
+ def test_12_get_eth_service1(self):
url = ("{}/operational/org-openroadm-service:service-list/services/service1"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertEqual(
- res['services'][0]['administrative-state'],
- 'inService')
+ res['services'][0]['administrative-state'], 'inService')
self.assertEqual(
res['services'][0]['service-name'], 'service1')
self.assertEqual(
res['services'][0]['lifecycle-state'], 'planned')
time.sleep(2)
- def test_11_check_xc1_ROADMA(self):
+ def test_13_check_xc1_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
"node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
- "GET", url, headers=headers, auth=('admin', 'admin'))
+ "GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertDictContainsSubset(
- {'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1',
- 'opticalControlMode': 'gainLoss',
- 'target-output-power': -3.0},
- res['roadm-connections'][0])
+ {'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1',
+ 'opticalControlMode': 'gainLoss',
+ 'target-output-power': -3.0},
+ res['roadm-connections'][0])
self.assertDictEqual(
- {'src-if': 'SRG1-PP1-TXRX-nmc-1'},
- res['roadm-connections'][0]['source'])
+ {'src-if': 'SRG1-PP1-TXRX-nmc-1'},
+ res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'DEG2-TTP-TXRX-nmc-1'},
- res['roadm-connections'][0]['destination'])
+ {'dst-if': 'DEG2-TTP-TXRX-nmc-1'},
+ res['roadm-connections'][0]['destination'])
time.sleep(5)
- def test_12_check_xc1_ROADMC(self):
+ def test_14_check_xc1_ROADMC(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
"node/ROADM-C1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
- "GET", url, headers=headers, auth=('admin', 'admin'))
+ "GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertDictContainsSubset(
- {'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1',
- 'opticalControlMode': 'gainLoss',
- 'target-output-power': -3.0},
- res['roadm-connections'][0])
+ {'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1',
+ 'opticalControlMode': 'gainLoss',
+ 'target-output-power': -3.0},
+ res['roadm-connections'][0])
self.assertDictEqual(
- {'src-if': 'SRG1-PP1-TXRX-nmc-1'},
- res['roadm-connections'][0]['source'])
+ {'src-if': 'SRG1-PP1-TXRX-nmc-1'},
+ res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'DEG1-TTP-TXRX-nmc-1'},
- res['roadm-connections'][0]['destination'])
+ {'dst-if': 'DEG1-TTP-TXRX-nmc-1'},
+ res['roadm-connections'][0]['destination'])
time.sleep(5)
- def test_13_check_topo_XPDRA(self):
+ def test_15_check_topo_XPDRA(self):
url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
response = requests.request(
- "GET", url1, auth=('admin', 'admin'))
+ "GET", url1, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
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.099999999999994315658113919198513031005859375,
- u'width': 1528.76999999999998181010596454143524169921875},
- 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-CLIENT2' or ele['tp-id'] == 'XPDR1-CLIENT1':
- self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-client-attributes']))
+ self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
if ele['tp-id'] == 'XPDR1-NETWORK2':
- self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes']))
+ self.assertNotIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele))
time.sleep(3)
- def test_14_check_topo_ROADMA_SRG1(self):
+ def test_16_check_topo_ROADMA_SRG1(self):
url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
response = requests.request(
- "GET", url1, auth=('admin', 'admin'))
+ "GET", url1, auth=('admin', 'admin'))
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': 1},
+ res['node'][0][u'org-openroadm-network-topology:srg-attributes']['available-wavelengths'])
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}, ele['org-openroadm-network-topology:pp-attributes']['used-wavelength'])
+ self.assertIn({u'index': 1, u'frequency': 196.1,
+ u'width': 40},
+ ele['org-openroadm-network-topology:pp-attributes']['used-wavelength'])
if ele['tp-id'] == 'SRG1-PP2-TXRX':
self.assertNotIn('used-wavelength', dict.keys(ele))
time.sleep(3)
- def test_15_check_topo_ROADMA_DEG1(self):
+ def test_17_check_topo_ROADMA_DEG1(self):
url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
response = requests.request(
- "GET", url1, auth=('admin', 'admin'))
+ "GET", url1, auth=('admin', 'admin'))
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': 1},
+ res['node'][0][u'org-openroadm-network-topology:degree-attributes']['available-wavelengths'])
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'index': 1}, ele['org-openroadm-network-topology:ctp-attributes']['used-wavelengths'])
+ 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'] == 'DEG2-TTP-TXRX':
- self.assertIn({u'index': 1}, ele['org-openroadm-network-topology:tx-ttp-attributes']['used-wavelengths'])
+ self.assertIn({u'index': 1, u'frequency': 196.1,
+ u'width': 40},
+ ele['org-openroadm-network-topology:tx-ttp-attributes']['used-wavelengths'])
time.sleep(3)
- def test_16_connect_xprdA_N2_to_roadmA_PP2(self):
+ def test_18_connect_xprdA_N2_to_roadmA_PP2(self):
url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(self.restconf_baseurl)
data = {
"networkutils:input": {
}
headers = {'content-type': 'application/json'}
response = requests.request(
- "POST", url, data=json.dumps(data),
- headers=headers, auth=('admin', 'admin'))
+ "POST", url, data=json.dumps(data),
+ headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
time.sleep(2)
- def test_17_connect_roadmA_PP2_to_xpdrA_N2(self):
+ def test_19_connect_roadmA_PP2_to_xpdrA_N2(self):
url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(self.restconf_baseurl)
data = {
"networkutils:input": {
}
headers = {'content-type': 'application/json'}
response = requests.request(
- "POST", url, data=json.dumps(data),
- headers=headers, auth=('admin', 'admin'))
+ "POST", url, data=json.dumps(data),
+ headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
time.sleep(2)
- def test_18_connect_xprdC_N2_to_roadmC_PP2(self):
+ def test_20_connect_xprdC_N2_to_roadmC_PP2(self):
url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(self.restconf_baseurl)
data = {
"networkutils:input": {
}
headers = {'content-type': 'application/json'}
response = requests.request(
- "POST", url, data=json.dumps(data),
- headers=headers, auth=('admin', 'admin'))
+ "POST", url, data=json.dumps(data),
+ headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
time.sleep(2)
- def test_19_connect_roadmC_PP2_to_xpdrC_N2(self):
+ def test_21_connect_roadmC_PP2_to_xpdrC_N2(self):
url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(self.restconf_baseurl)
data = {
"networkutils:input": {
}
headers = {'content-type': 'application/json'}
response = requests.request(
- "POST", url, data=json.dumps(data),
- headers=headers, auth=('admin', 'admin'))
+ "POST", url, data=json.dumps(data),
+ headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
time.sleep(2)
- def test_20_create_eth_service2(self):
+ def test_22_create_eth_service2(self):
url = ("{}/operations/org-openroadm-service:service-create"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"input": {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
},
"due-date": "2016-11-28T00:00:01Z",
"operator-contact": "pw1234"
- }
- }
+ }
+ }
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"POST", url, data=json.dumps(data), headers=headers,
auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ res['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
- def test_21_get_eth_service2(self):
+ def test_23_get_eth_service2(self):
url = ("{}/operational/org-openroadm-service:service-list/services/service2"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res['services'][0]['lifecycle-state'], 'planned')
time.sleep(1)
- def test_22_check_xc2_ROADMA(self):
+ def test_24_check_xc2_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
"node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/DEG2-TTP-TXRX-SRG1-PP2-TXRX-2"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
- "GET", url, headers=headers, auth=('admin', 'admin'))
+ "GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertDictContainsSubset(
- {'connection-name': 'DEG2-TTP-TXRX-SRG1-PP2-TXRX-2',
- 'opticalControlMode': 'power'},
- res['roadm-connections'][0])
+ {'connection-name': 'DEG2-TTP-TXRX-SRG1-PP2-TXRX-2',
+ 'opticalControlMode': 'power'},
+ res['roadm-connections'][0])
self.assertDictEqual(
- {'src-if': 'DEG2-TTP-TXRX-nmc-2'},
- res['roadm-connections'][0]['source'])
+ {'src-if': 'DEG2-TTP-TXRX-nmc-2'},
+ res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'SRG1-PP2-TXRX-nmc-2'},
- res['roadm-connections'][0]['destination'])
+ {'dst-if': 'SRG1-PP2-TXRX-nmc-2'},
+ res['roadm-connections'][0]['destination'])
- def test_23_check_topo_XPDRA(self):
+ def test_25_check_topo_XPDRA(self):
url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
response = requests.request(
- "GET", url1, auth=('admin', 'admin'))
+ "GET", url1, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
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.099999999999994315658113919198513031005859375,
- u'width': 1528.76999999999998181010596454143524169921875},
- 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.04999999999998,
- u'width': 1529.16},
- ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+ 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('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-client-attributes']))
+ self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
time.sleep(10)
- def test_24_check_topo_ROADMA_SRG1(self):
+ def test_26_check_topo_ROADMA_SRG1(self):
url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
response = requests.request(
- "GET", url1, auth=('admin', 'admin'))
+ "GET", url1, auth=('admin', 'admin'))
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'])
+ 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'])
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}, ele['org-openroadm-network-topology:pp-attributes']['used-wavelength'])
- self.assertNotIn({u'index': 2}, ele['org-openroadm-network-topology:pp-attributes']['used-wavelength'])
+ 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'])
if ele['tp-id'] == 'SRG1-PP2-TXRX':
- self.assertIn({u'index': 2}, ele['org-openroadm-network-topology:pp-attributes']['used-wavelength'])
- self.assertNotIn({u'index': 1}, ele['org-openroadm-network-topology:pp-attributes']['used-wavelength'])
+ 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'])
if ele['tp-id'] == 'SRG1-PP3-TXRX':
self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
time.sleep(10)
-
- def test_25_check_topo_ROADMA_DEG2(self):
+ def test_27_check_topo_ROADMA_DEG2(self):
url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
response = requests.request(
- "GET", url1, auth=('admin', 'admin'))
+ "GET", url1, auth=('admin', 'admin'))
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'])
+ 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'])
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'index': 1}, ele['org-openroadm-network-topology:ctp-attributes']['used-wavelengths'])
- self.assertIn({u'index': 2}, ele['org-openroadm-network-topology:ctp-attributes']['used-wavelengths'])
+ 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'] == 'DEG2-TTP-TXRX':
- self.assertIn({u'index': 1}, ele['org-openroadm-network-topology:tx-ttp-attributes']['used-wavelengths'])
- self.assertIn({u'index': 2}, ele['org-openroadm-network-topology:tx-ttp-attributes']['used-wavelengths'])
+ 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'])
time.sleep(10)
# creation service test on a non-available resource
- def test_26_create_eth_service3(self):
+ def test_28_create_eth_service3(self):
url = ("{}/operations/org-openroadm-service:service-create"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"input": {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
},
"due-date": "2016-11-28T00:00:01Z",
"operator-contact": "pw1234"
- }
- }
+ }
+ }
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"POST", url, data=json.dumps(data), headers=headers,
auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ res['output']['configuration-response-common']['response-message'])
self.assertIn('200', res['output']['configuration-response-common']['response-code'])
time.sleep(self.WAITING)
# add a test that check the openroadm-service-list still only contains 2 elements
-
- def test_27_delete_eth_service3(self):
+ def test_29_delete_eth_service3(self):
url = ("{}/operations/org-openroadm-service:service-delete"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"input": {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
"service-name": "service3",
"tail-retention": "no"
}
- }
- }
+ }
+ }
headers = {'content-type': 'application/json'}
response = requests.request(
"POST", url, data=json.dumps(data), headers=headers,
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Service \'service3\' does not exist in datastore',
- res['output']['configuration-response-common']['response-message'])
+ res['output']['configuration-response-common']['response-message'])
self.assertIn('500', res['output']['configuration-response-common']['response-code'])
time.sleep(20)
- def test_28_delete_eth_service1(self):
+ def test_30_delete_eth_service1(self):
url = ("{}/operations/org-openroadm-service:service-delete"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"input": {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
"service-name": "service1",
"tail-retention": "no"
}
- }
- }
+ }
+ }
headers = {'content-type': 'application/json'}
response = requests.request(
"POST", url, data=json.dumps(data), headers=headers,
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Renderer service delete in progress',
- res['output']['configuration-response-common']['response-message'])
+ res['output']['configuration-response-common']['response-message'])
time.sleep(20)
- def test_29_delete_eth_service2(self):
+ def test_31_delete_eth_service2(self):
url = ("{}/operations/org-openroadm-service:service-delete"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"input": {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
"service-name": "service2",
"tail-retention": "no"
}
- }
- }
+ }
+ }
headers = {'content-type': 'application/json'}
response = requests.request(
"POST", url, data=json.dumps(data), headers=headers,
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Renderer service delete in progress',
- res['output']['configuration-response-common']['response-message'])
+ res['output']['configuration-response-common']['response-message'])
time.sleep(20)
- def test_30_check_no_xc_ROADMA(self):
+ def test_32_check_no_xc_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
"node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
.format(self.restconf_baseurl))
response = requests.request(
- "GET", url, auth=('admin', 'admin'))
+ "GET", url, auth=('admin', 'admin'))
res = response.json()
self.assertEqual(response.status_code, requests.codes.ok)
self.assertNotIn('roadm-connections', dict.keys(res['org-openroadm-device']))
time.sleep(2)
- def test_31_check_topo_XPDRA(self):
+ def test_33_check_topo_XPDRA(self):
url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
response = requests.request(
- "GET", url1, auth=('admin', 'admin'))
+ "GET", url1, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
liste_tp = res['node'][0]['ietf-network-topology:termination-point']
for ele in liste_tp:
- if ele[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-CLIENT':
- self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-client-attributes']))
- elif ele[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-NETWORK':
- self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes']))
+ if ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT':
+ self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
+ elif (ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK'):
+ self.assertIn(u'tail-equipment-id',
+ dict.keys(ele[u'org-openroadm-network-topology:xpdr-network-attributes']))
+ self.assertNotIn('wavelength', dict.keys(
+ ele[u'org-openroadm-network-topology:xpdr-network-attributes']))
time.sleep(10)
- def test_32_check_topo_ROADMA_SRG1(self):
+ def test_34_check_topo_ROADMA_SRG1(self):
url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
response = requests.request(
- "GET", url1, auth=('admin', 'admin'))
+ "GET", url1, auth=('admin', 'admin'))
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'])
+ 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'])
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))
time.sleep(10)
- def test_33_check_topo_ROADMA_DEG2(self):
+ def test_35_check_topo_ROADMA_DEG2(self):
url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
response = requests.request(
- "GET", url1, auth=('admin', 'admin'))
+ "GET", url1, auth=('admin', 'admin'))
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'])
+ 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'])
liste_tp = res['node'][0]['ietf-network-topology:termination-point']
for ele in liste_tp:
if ele['tp-id'] == 'DEG2-CTP-TXRX':
- self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
+ self.assertNotIn('org-openroadm-network-topology:ctp-attributes', dict.keys(ele))
if ele['tp-id'] == 'DEG2-TTP-TXRX':
- self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
+ self.assertNotIn('org-openroadm-network-topology:tx-ttp-attributes', dict.keys(ele))
time.sleep(10)
-
# test service-create for Optical Channel (OC) service from srg-pp to srg-pp
- def test_34_create_oc_service1(self):
+ def test_36_create_oc_service1(self):
url = ("{}/operations/org-openroadm-service:service-create"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"input": {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
},
"due-date": "2016-11-28T00:00:01Z",
"operator-contact": "pw1234"
- }
- }
+ }
+ }
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"POST", url, data=json.dumps(data), headers=headers,
auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ res['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
- def test_35_get_oc_service1(self):
+ def test_37_get_oc_service1(self):
url = ("{}/operational/org-openroadm-service:service-list/services/service1"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res['services'][0]['lifecycle-state'], 'planned')
time.sleep(1)
- def test_36_check_xc1_ROADMA(self):
+ def test_38_check_xc1_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
"node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
- "GET", url, headers=headers, auth=('admin', 'admin'))
+ "GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertDictContainsSubset(
- {'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1',
- 'opticalControlMode': 'gainLoss',
- 'target-output-power': -3.0},
- res['roadm-connections'][0])
+ {'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1',
+ 'opticalControlMode': 'gainLoss',
+ 'target-output-power': -3.0},
+ res['roadm-connections'][0])
self.assertDictEqual(
- {'src-if': 'SRG1-PP1-TXRX-nmc-1'},
- res['roadm-connections'][0]['source'])
+ {'src-if': 'SRG1-PP1-TXRX-nmc-1'},
+ res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'DEG2-TTP-TXRX-nmc-1'},
- res['roadm-connections'][0]['destination'])
+ {'dst-if': 'DEG2-TTP-TXRX-nmc-1'},
+ res['roadm-connections'][0]['destination'])
time.sleep(7)
- def test_37_check_xc1_ROADMC(self):
+ def test_39_check_xc1_ROADMC(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
"node/ROADM-C1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
- "GET", url, headers=headers, auth=('admin', 'admin'))
+ "GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertDictContainsSubset(
- {'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1',
- 'opticalControlMode': 'gainLoss',
- 'target-output-power': -3.0},
- res['roadm-connections'][0])
+ {'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1',
+ 'opticalControlMode': 'gainLoss',
+ 'target-output-power': -3.0},
+ res['roadm-connections'][0])
self.assertDictEqual(
- {'src-if': 'SRG1-PP1-TXRX-nmc-1'},
- res['roadm-connections'][0]['source'])
+ {'src-if': 'SRG1-PP1-TXRX-nmc-1'},
+ res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'DEG1-TTP-TXRX-nmc-1'},
- res['roadm-connections'][0]['destination'])
+ {'dst-if': 'DEG1-TTP-TXRX-nmc-1'},
+ res['roadm-connections'][0]['destination'])
time.sleep(7)
- def test_38_create_oc_service2(self):
+ def test_40_create_oc_service2(self):
url = ("{}/operations/org-openroadm-service:service-create"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"input": {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
},
"due-date": "2016-11-28T00:00:01Z",
"operator-contact": "pw1234"
- }
- }
+ }
+ }
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"POST", url, data=json.dumps(data), headers=headers,
auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('PCE calculation in progress',
- res['output']['configuration-response-common']['response-message'])
+ res['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
- def test_39_get_oc_service2(self):
+ def test_41_get_oc_service2(self):
url = ("{}/operational/org-openroadm-service:service-list/services/service2"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res['services'][0]['lifecycle-state'], 'planned')
time.sleep(2)
- def test_40_check_xc2_ROADMA(self):
+ def test_42_check_xc2_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
"node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP2-TXRX-DEG2-TTP-TXRX-2"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
- "GET", url, headers=headers, auth=('admin', 'admin'))
+ "GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertDictContainsSubset(
- {'connection-name': 'SRG1-PP2-TXRX-DEG2-TTP-TXRX-2',
- 'opticalControlMode': 'gainLoss',
- 'target-output-power': -3.0},
- res['roadm-connections'][0])
+ {'connection-name': 'SRG1-PP2-TXRX-DEG2-TTP-TXRX-2',
+ 'opticalControlMode': 'gainLoss',
+ 'target-output-power': -3.0},
+ res['roadm-connections'][0])
self.assertDictEqual(
- {'src-if': 'SRG1-PP2-TXRX-nmc-2'},
- res['roadm-connections'][0]['source'])
+ {'src-if': 'SRG1-PP2-TXRX-nmc-2'},
+ res['roadm-connections'][0]['source'])
self.assertDictEqual(
- {'dst-if': 'DEG2-TTP-TXRX-nmc-2'},
- res['roadm-connections'][0]['destination'])
+ {'dst-if': 'DEG2-TTP-TXRX-nmc-2'},
+ res['roadm-connections'][0]['destination'])
time.sleep(2)
- def test_41_check_topo_ROADMA(self):
- self.test_24_check_topo_ROADMA_SRG1()
- self.test_25_check_topo_ROADMA_DEG2()
+ def test_43_check_topo_ROADMA(self):
+ self.test_26_check_topo_ROADMA_SRG1()
+ self.test_27_check_topo_ROADMA_DEG2()
time.sleep(3)
-
- def test_42_delete_oc_service1(self):
+ def test_44_delete_oc_service1(self):
url = ("{}/operations/org-openroadm-service:service-delete"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"input": {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
"service-name": "service1",
"tail-retention": "no"
}
- }
- }
+ }
+ }
headers = {'content-type': 'application/json'}
response = requests.request(
"POST", url, data=json.dumps(data), headers=headers,
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Renderer service delete in progress',
- res['output']['configuration-response-common']['response-message'])
+ res['output']['configuration-response-common']['response-message'])
time.sleep(20)
- def test_43_delete_oc_service2(self):
+ def test_45_delete_oc_service2(self):
url = ("{}/operations/org-openroadm-service:service-delete"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
data = {"input": {
"sdnc-request-header": {
"request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
"service-name": "service2",
"tail-retention": "no"
}
- }
- }
+ }
+ }
headers = {'content-type': 'application/json'}
response = requests.request(
"POST", url, data=json.dumps(data), headers=headers,
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertIn('Renderer service delete in progress',
- res['output']['configuration-response-common']['response-message'])
+ res['output']['configuration-response-common']['response-message'])
time.sleep(20)
- def test_44_get_no_oc_services(self):
- print ("start test")
+ def test_46_get_no_oc_services(self):
+ print("start test")
url = ("{}/operational/org-openroadm-service:service-list"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.not_found)
res = response.json()
self.assertIn(
- {"error-type":"application", "error-tag":"data-missing",
- "error-message":"Request could not be completed because the relevant data model content does not exist"},
+ {"error-type": "application", "error-tag": "data-missing",
+ "error-message": "Request could not be completed because the relevant data model content does not exist"},
res['errors']['error'])
time.sleep(1)
- def test_45_get_no_xc_ROADMA(self):
+ def test_47_get_no_xc_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf"
"/node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
- .format(self.restconf_baseurl))
+ .format(self.restconf_baseurl))
headers = {'content-type': 'application/json',
- "Accept": "application/json"}
+ "Accept": "application/json"}
response = requests.request(
"GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device'])
time.sleep(1)
- def test_46_check_topo_ROADMA(self):
- self.test_32_check_topo_ROADMA_SRG1()
- self.test_33_check_topo_ROADMA_DEG2()
+ def test_48_check_topo_ROADMA(self):
+ self.test_34_check_topo_ROADMA_SRG1()
+ self.test_35_check_topo_ROADMA_DEG2()
- @unittest.expectedFailure
- def test_47_loop_create_eth_service(self):
- for i in range(1,6):
- print ("trial number {}".format(i))
+ def test_49_loop_create_eth_service(self):
+ for i in range(1, 6):
+ print("trial number {}".format(i))
print("eth service creation")
- self.test_09_create_eth_service1()
- print ("check xc in ROADM-A1")
- self.test_11_check_xc1_ROADMA()
- print ("check xc in ROADM-C1")
- self.test_12_check_xc1_ROADMC()
- print ("eth service deletion\n")
- self.test_28_delete_eth_service1()
-
- @unittest.expectedFailure
- def test_48_loop_create_oc_service(self):
+ self.test_11_create_eth_service1()
+ print("check xc in ROADM-A1")
+ self.test_13_check_xc1_ROADMA()
+ print("check xc in ROADM-C1")
+ self.test_14_check_xc1_ROADMC()
+ print("eth service deletion\n")
+ self.test_30_delete_eth_service1()
+
+ def test_50_loop_create_oc_service(self):
url = ("{}/operational/org-openroadm-service:service-list/services/service1"
.format(self.restconf_baseurl))
response = requests.request("GET", url, auth=('admin', 'admin'))
"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"
- }
}
}
+ }
headers = {'content-type': 'application/json'}
requests.request("POST", url, data=json.dumps(data), headers=headers, auth=('admin', 'admin'))
time.sleep(5)
- for i in range(1,6):
- print ("trial number {}".format(i))
+ for i in range(1, 6):
+ print("trial number {}".format(i))
print("oc service creation")
- self.test_34_create_oc_service1()
- print ("check xc in ROADM-A1")
- self.test_36_check_xc1_ROADMA()
- print ("check xc in ROADM-C1")
- self.test_37_check_xc1_ROADMC()
- print ("oc service deletion\n")
- self.test_42_delete_oc_service1()
-
-
- def test_49_disconnect_XPDRA(self):
+ self.test_36_create_oc_service1()
+ print("check xc in ROADM-A1")
+ self.test_38_check_xc1_ROADMA()
+ print("check xc in ROADM-C1")
+ self.test_39_check_xc1_ROADMC()
+ print("oc service deletion\n")
+ self.test_44_delete_oc_service1()
+
+ def test_51_disconnect_XPDRA(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDR-A1"
+ "network-topology/topology/topology-netconf/node/XPDR-A1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
- "DELETE", url, headers=headers,
- auth=('admin', 'admin'))
+ "DELETE", url, headers=headers,
+ auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(10)
- def test_50_disconnect_XPDRC(self):
+ def test_52_disconnect_XPDRC(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDR-C1"
+ "network-topology/topology/topology-netconf/node/XPDR-C1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
- "DELETE", url, headers=headers,
- auth=('admin', 'admin'))
+ "DELETE", url, headers=headers,
+ auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(10)
- def test_51_disconnect_ROADMA(self):
+ def test_53_disconnect_ROADMA(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADM-A1"
+ "network-topology/topology/topology-netconf/node/ROADM-A1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
- "DELETE", url, headers=headers,
- auth=('admin', 'admin'))
+ "DELETE", url, headers=headers,
+ auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(10)
- def test_52_disconnect_ROADMC(self):
+ def test_54_disconnect_ROADMC(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADM-C1"
+ "network-topology/topology/topology-netconf/node/ROADM-C1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
- "DELETE", url, headers=headers,
- auth=('admin', 'admin'))
+ "DELETE", url, headers=headers,
+ auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
time.sleep(10)
Code Review / transportpce.git / blobdiff