import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
+import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import org.opendaylight.transportpce.common.ResponseCodes;
import org.opendaylight.transportpce.pce.service.PathComputationService;
import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
+import org.opendaylight.transportpce.servicehandler.ServiceInput;
import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl;
import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl;
import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl;
import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl;
import org.opendaylight.transportpce.servicehandler.utils.ServiceDataUtils;
import org.opendaylight.transportpce.test.AbstractTest;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.PathComputationRequestOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.PathComputationRerouteRequestOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.configuration.response.common.ConfigurationResponseCommonBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateInput;
import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateInputBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateOutput;
import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceDeleteOutput;
import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.delete.input.ServiceDeleteReqInfoBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.list.ServicesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.AToZDirectionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ZToADirectionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZ;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZKey;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.ResourceBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.TerminationPointBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.response.parameters.sp.ResponseParametersBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.response.parameters.sp.response.parameters.PathDescriptionBuilder;
import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.Uint32;
public class ServicehandlerImplTest extends AbstractTest {
result.addListener(() -> endSignal.countDown(), executorService);
endSignal.await();
+
+ Assert.assertEquals(ResponseCodes.RESPONSE_FAILED,
+ result.get().getResult().getConfigurationResponseCommon().getResponseCode());
}
@Test
result.addListener(() -> endSignal.countDown(), executorService);
endSignal.await();
+
+ Assert.assertEquals(ResponseCodes.RESPONSE_FAILED,
+ result.get().getResult().getConfigurationResponseCommon().getResponseCode());
}
@Test
public void serviceRerouteShouldBeSuccessForExistingService() throws ExecutionException, InterruptedException {
- //create service to be rerouted later
- ServicehandlerImpl servicehandlerImpl = new ServicehandlerImpl(getNewDataBroker(), pathComputationService,
- rendererServiceOperations, notificationPublishService, pceListenerImpl, rendererListenerImpl,
- networkModelListenerImpl, serviceDataStoreOperations);
- serviceDataStoreOperations.createService(serviceCreateInput);
+ Mockito.when(pathComputationService.pathComputationRerouteRequest(any()))
+ .thenReturn(Futures.immediateFuture(new PathComputationRerouteRequestOutputBuilder()
+ .setConfigurationResponseCommon(new ConfigurationResponseCommonBuilder()
+ .setResponseCode(ResponseCodes.RESPONSE_OK)
+ .build())
+ .build()));
+ Map<AToZKey, AToZ> atoz = Map.of(
+ new AToZKey("0"),
+ new AToZBuilder()
+ .setId("0")
+ .setResource(new ResourceBuilder()
+ .setResource(new TerminationPointBuilder()
+ .setTpNodeId("tpNodeIdC")
+ .setTpId("TpIdC1")
+ .build())
+ .setState(State.InService)
+ .build())
+ .build(),
+ new AToZKey("1"),
+ new AToZBuilder()
+ .setId("1")
+ .setResource(new ResourceBuilder()
+ .setResource(new TerminationPointBuilder()
+ .setTpNodeId("tpNodeIdD")
+ .setTpId("TpIdCD")
+ .build())
+ .setState(State.InService)
+ .build())
+ .build(), new AToZKey("2"),
+ new AToZBuilder()
+ .setId("2")
+ .setResource(new ResourceBuilder()
+ .setResource(new TerminationPointBuilder()
+ .setTpNodeId("tpNodeIdA")
+ .setTpId("TpIdA1")
+ .build())
+ .setState(State.InService)
+ .build())
+ .build()
+
+ );
+ serviceDataStoreOperations.createServicePath(new ServiceInput(serviceCreateInput),
+ new PathComputationRequestOutputBuilder()
+ .setResponseParameters(new ResponseParametersBuilder()
+ .setPathDescription(new PathDescriptionBuilder()
+ .setAToZDirection(new AToZDirectionBuilder()
+ .setAToZ(atoz)
+ .setRate(Uint32.valueOf(1))
+ .build())
+ .setZToADirection(new ZToADirectionBuilder()
+ .setRate(Uint32.valueOf(1))
+ .build())
+ .build())
+ .build())
+ .build());
- //service reroute test action
- //ServiceRerouteInput is created with the same service information that is created before
- ListenableFuture<RpcResult<ServiceRerouteOutput>> result = servicehandlerImpl.serviceReroute(
- serviceRerouteInput);
+ serviceDataStoreOperations.createService(serviceCreateInput);
+ ListenableFuture<RpcResult<ServiceRerouteOutput>> result = new ServicehandlerImpl(getNewDataBroker(),
+ pathComputationService, rendererServiceOperations, notificationPublishService, pceListenerImpl,
+ rendererListenerImpl, networkModelListenerImpl, serviceDataStoreOperations)
+ .serviceReroute(serviceRerouteInput);
result.addListener(() -> endSignal.countDown(), executorService);
endSignal.await();
+
+ Assert.assertEquals(
+ ResponseCodes.RESPONSE_OK, result.get().getResult().getConfigurationResponseCommon().getResponseCode());
}
@Test
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
- def test_10_connect_xprda2_3_N1_to_roadma_PP2(self):
+ def test_10_add_omsAttributes_roadma_roadmc(self):
+ # Config ROADMA-ROADMC oms-attributes
+ 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}]}}
+ response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
+ self.assertEqual(response.status_code, requests.codes.created)
+
+ def test_11_add_omsAttributes_roadmc_roadma(self):
+ # Config ROADMC-ROADMA oms-attributes
+ 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}]}}
+ response = test_utils.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
+ self.assertEqual(response.status_code, requests.codes.created)
+
+ # test service-create for Eth service from xpdr to xpdr with service-resiliency
+ def test_12_create_eth_service1_with_service_resiliency_restorable(self):
+ self.cr_serv_input_data["service-name"] = "service1"
+ response = test_utils.transportpce_api_rpc_request('org-openroadm-service', 'service-create',
+ self.cr_serv_input_data)
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('PCE calculation in progress',
+ response['output']['configuration-response-common']['response-message'])
+ time.sleep(self.WAITING)
+
+ def test_13_get_eth_service1(self):
+ response = test_utils.get_ordm_serv_list_attr_request("services", "service1")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['service-name'], 'service1')
+ self.assertEqual(response['services'][0]['connection-type'], 'service')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+ self.assertEqual(response['services'][0]['service-resiliency']['resiliency'],
+ 'org-openroadm-common-service-types:restorable')
+ time.sleep(1)
+
+ # Degrade ROADM-A1-ROADM-C1 link
+ def test_14_set_pm_ROADMA_OTS_DEG2_TTP_TXRX_OpticalPowerInput(self):
+ url = "{}/operations/pm-handling:pm-interact"
+ body = {
+ "input": {
+ "rpc-action": "set",
+ "pm-to-be-set-or-created": {
+ "current-pm-entry": [
+ {
+ "pm-resource-instance": "/org-openroadm-device:org-openroadm-device/org-openroadm-device"
+ ":interface[org-openroadm-device:name='OTS-DEG2-TTP-TXRX']",
+ "pm-resource-type": "interface",
+ "pm-resource-type-extension": "",
+ "current-pm": [
+ {
+ "type": "opticalPowerInput",
+ "extension": "",
+ "location": "nearEnd",
+ "direction": "rx",
+ "measurement": [
+ {
+ "granularity": "15min",
+ "pmParameterValue": -30,
+ "pmParameterUnit": "dBm",
+ "validity": "complete"
+ },
+ {
+ "granularity": "24Hour",
+ "pmParameterValue": -21.3,
+ "pmParameterUnit": "dBm",
+ "validity": "complete"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ }
+ response = requests.request("POST", url.format("http://127.0.0.1:8141/restconf"),
+ data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
+ auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+ timeout=test_utils.REQUEST_TIMEOUT)
+ self.assertEqual(response.status_code, requests.codes.ok)
+ self.assertEqual(response.json()['output']['status-message'], "The PMs has been successfully set !")
+ time.sleep(2)
+
+ def test_15_get_eth_service1(self):
+ response = test_utils.get_ordm_serv_list_attr_request("services", "service1")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['operational-state'], 'outOfService')
+ self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+ self.assertEqual(response['services'][0]['service-name'], 'service1')
+ self.assertEqual(response['services'][0]['connection-type'], 'service')
+ self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+ self.assertEqual(response['services'][0]['service-resiliency']['resiliency'],
+ 'org-openroadm-common-service-types:restorable')
+ time.sleep(1)
+
+ def test_16_service_reroute_service1(self):
+ response = test_utils.transportpce_api_rpc_request(
+ 'org-openroadm-service', 'service-reroute',
+ {
+ "sdnc-request-header": {
+ "request-id": "request-1",
+ "rpc-action": "service-reroute",
+ "request-system-id": "appname"
+ },
+ "service-name": "service1",
+ "service-resiliency": {
+ "resiliency": "org-openroadm-common-service-types:restorable"
+ }
+ })
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('500', response['output']['configuration-response-common']['response-code'])
+ self.assertIn('No path available by PCE',
+ response['output']['configuration-response-common']['response-message'])
+ time.sleep(2)
+
+ # Restore ROADM-A1-ROADM-C1 link
+ def test_17_clear_pm_ROADMA_OTS_DEG2_TTP_TXRX_OpticalPowerInput(self):
+ url = "{}/operations/pm-handling:pm-interact"
+ body = {
+ "input": {
+ "rpc-action": "clear",
+ "pm-to-get-clear-or-delete": {
+ "current-pm-entry": [
+ {
+ "pm-resource-instance": "/org-openroadm-device:org-openroadm-device/org-openroadm-device"
+ ":interface[org-openroadm-device:name='OTS-DEG2-TTP-TXRX']",
+ "pm-resource-type": "interface",
+ "pm-resource-type-extension": "",
+ "current-pm": [
+ {
+ "type": "opticalPowerInput",
+ "extension": "",
+ "location": "nearEnd",
+ "direction": "rx"
+ }
+ ]
+ }
+ ]
+ }
+ }
+ }
+ response = requests.request("POST", url.format("http://127.0.0.1:8141/restconf"),
+ data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
+ auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+ timeout=test_utils.REQUEST_TIMEOUT)
+ self.assertEqual(response.status_code, requests.codes.ok)
+ self.assertEqual(response.json()['output']['status-message'], "The PMs has been successfully released !")
+ time.sleep(2)
+
+ def test_18_get_eth_service1(self):
+ self.test_13_get_eth_service1()
+
+ def test_19_connect_xprda2_3_N1_to_roadma_PP2(self):
response = test_utils.transportpce_api_rpc_request(
'transportpce-networkutils', 'init-xpdr-rdm-links',
{'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '3', 'network-num': '1',
'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
+ time.sleep(2)
- def test_11_connect_roadma_PP2_to_xpdra2_3_N1(self):
+ def test_20_connect_roadma_PP2_to_xpdra2_3_N1(self):
response = test_utils.transportpce_api_rpc_request(
'transportpce-networkutils', 'init-rdm-xpdr-links',
{'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '3', 'network-num': '1',
'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
+ time.sleep(2)
- def test_12_connect_xprdc2_3_N1_to_roadmc_PP2(self):
+ def test_21_connect_xprdc2_3_N1_to_roadmc_PP2(self):
response = test_utils.transportpce_api_rpc_request(
'transportpce-networkutils', 'init-xpdr-rdm-links',
{'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '3', 'network-num': '1',
'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
+ time.sleep(2)
- def test_13_connect_roadmc_PP2_to_xpdrc2_3_N1(self):
+ def test_22_connect_roadmc_PP2_to_xpdrc2_3_N1(self):
response = test_utils.transportpce_api_rpc_request(
'transportpce-networkutils', 'init-rdm-xpdr-links',
{'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '3', 'network-num': '1',
'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
+ time.sleep(2)
- def test_14_add_omsAttributes_roadma_roadmc(self):
- # Config ROADMA-ROADMC oms-attributes
- 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}]}}
- response = test_utils.add_oms_attr_request(
- "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
- self.assertEqual(response.status_code, requests.codes.created)
-
- def test_15_add_omsAttributes_roadmc_roadma(self):
- # Config ROADMC-ROADMA oms-attributes
- 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}]}}
- response = test_utils.add_oms_attr_request(
- "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
- self.assertEqual(response.status_code, requests.codes.created)
-
- def test_16_add_omsAttributes_roadma_roadmb(self):
+ def test_23_add_omsAttributes_roadma_roadmb(self):
# Config ROADMA-ROADMB oms-attributes
data = {"span": {
"auto-spanloss": "true",
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request(
- "ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX", data)
+ response = test_utils.add_oms_attr_request("ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
- def test_17_add_omsAttributes_roadmb_roadma(self):
+ def test_24_add_omsAttributes_roadmb_roadma(self):
# Config ROADMB-ROADMA oms-attributes
data = {"span": {
"auto-spanloss": "true",
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request(
- "ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX", data)
+ response = test_utils.add_oms_attr_request("ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
- def test_18_add_omsAttributes_roadmb_roadmc(self):
+ def test_25_add_omsAttributes_roadmb_roadmc(self):
# Config ROADMB-ROADMC oms-attributes
data = {"span": {
"auto-spanloss": "true",
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request(
- "ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX", data)
+ response = test_utils.add_oms_attr_request("ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
- def test_19_add_omsAttributes_roadmc_roadmb(self):
+ def test_26_add_omsAttributes_roadmc_roadmb(self):
# Config ROADMC-ROADMB oms-attributes
data = {"span": {
"auto-spanloss": "true",
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils.add_oms_attr_request(
- "ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX", data)
+ response = test_utils.add_oms_attr_request("ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
- def test_20_create_OTS_ROADMA_DEG1(self):
+ def test_27_create_OTS_ROADMA_DEG1(self):
response = test_utils.transportpce_api_rpc_request(
'transportpce-device-renderer', 'create-ots-oms',
{
self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADM-A1',
response["output"]["result"])
- def test_21_create_OTS_ROADMC_DEG2(self):
+ def test_28_create_OTS_ROADMC_DEG2(self):
response = test_utils.transportpce_api_rpc_request(
'transportpce-device-renderer', 'create-ots-oms',
{
self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-C1',
response["output"]["result"])
- def test_22_create_OTS_ROADMB_DEG1(self):
+ def test_29_create_OTS_ROADMB_DEG1(self):
response = test_utils.transportpce_api_rpc_request(
'transportpce-device-renderer', 'create-ots-oms',
{
self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADM-B1',
response["output"]["result"])
- def test_23_create_OTS_ROADMB_DEG2(self):
+ def test_30_create_OTS_ROADMB_DEG2(self):
response = test_utils.transportpce_api_rpc_request(
'transportpce-device-renderer', 'create-ots-oms',
{
self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-B1',
response["output"]["result"])
- def test_24_calculate_span_loss_base_all(self):
+ def test_31_calculate_span_loss_base_all(self):
response = test_utils.transportpce_api_rpc_request(
'transportpce-olm', 'calculate-spanloss-base',
{
}, response["output"]["spans"])
time.sleep(1)
- # test service-create for Eth service from xpdr to xpdr with service-resiliency
- def test_25_create_eth_service1_with_service_resiliency_restorable(self):
- response = test_utils.transportpce_api_rpc_request(
- 'org-openroadm-service', 'service-create',
- self.cr_serv_input_data)
- self.assertEqual(response['status_code'], requests.codes.ok)
- self.assertIn('PCE calculation in progress',
- response['output']['configuration-response-common']['response-message'])
- time.sleep(self.WAITING)
-
- def test_26_get_eth_service1(self):
- response = test_utils.get_ordm_serv_list_attr_request("services", "service1")
- self.assertEqual(response['status_code'], requests.codes.ok)
- self.assertEqual(response['services'][0]['administrative-state'], 'inService')
- self.assertEqual(response['services'][0]['service-name'], 'service1')
- self.assertEqual(response['services'][0]['connection-type'], 'service')
- self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
- self.assertEqual(
- response['services'][0]['service-resiliency']['resiliency'],
- 'org-openroadm-common-service-types:restorable')
- time.sleep(1)
-
- def test_27_get_service_path_service_1(self):
+ def test_32_get_service_path_service_1(self):
response = test_utils.get_serv_path_list_attr("service-paths", "service1")
self.assertEqual(response['status_code'], requests.codes.ok)
- self.assertCountEqual(
- self.service_path_service_1_AtoZ,
- response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
+ self.assertCountEqual(self.service_path_service_1_AtoZ,
+ response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
# test service-create for Eth service from xpdr to xpdr without service-resiliency
- def test_28_create_eth_service2_without_service_resiliency(self):
+ def test_33_create_eth_service2_without_service_resiliency(self):
self.cr_serv_input_data["service-name"] = "service2"
del self.cr_serv_input_data["service-resiliency"]
- response = test_utils.transportpce_api_rpc_request(
- 'org-openroadm-service', 'service-create',
- self.cr_serv_input_data)
+ response = test_utils.transportpce_api_rpc_request('org-openroadm-service', 'service-create',
+ self.cr_serv_input_data)
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn('PCE calculation in progress',
response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
- def test_29_get_eth_service2(self):
+ def test_34_get_eth_service2(self):
response = test_utils.get_ordm_serv_list_attr_request("services", "service2")
self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual(response['services'][0]['operational-state'], 'inService')
self.assertEqual(response['services'][0]['administrative-state'], 'inService')
self.assertEqual(response['services'][0]['service-name'], 'service2')
self.assertEqual(response['services'][0]['connection-type'], 'service')
self.assertNotIn('service-resiliency', response['services'][0])
time.sleep(1)
- def test_30_get_service_path_service_2(self):
+ def test_35_get_service_path_service_2(self):
response = test_utils.get_serv_path_list_attr("service-paths", "service2")
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertCountEqual(
response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
# Degrade ROADM-A1-ROADM-C1 link
- def test_31_set_pm_ROADMA_OTS_DEG2_TTP_TXRX_OpticalPowerInput(self):
+ def test_36_set_pm_ROADMA_OTS_DEG2_TTP_TXRX_OpticalPowerInput(self):
url = "{}/operations/pm-handling:pm-interact"
body = {
"input": {
self.assertEqual(response.json()['output']['status-message'], "The PMs has been successfully set !")
time.sleep(self.WAITING * 2)
- def test_32_get_eth_service1(self):
- self.test_26_get_eth_service1()
+ def test_37_get_eth_service1(self):
+ self.test_13_get_eth_service1()
- def test_33_get_service_path_service_1(self):
+ def test_38_get_service_path_service_1(self):
response = test_utils.get_serv_path_list_attr("service-paths", "service1")
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertCountEqual(
self.service_path_service_1_rerouted_AtoZ,
response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
- def test_34_get_eth_service2(self):
+ def test_39_get_eth_service2(self):
response = test_utils.get_ordm_serv_list_attr_request("services", "service2")
self.assertEqual(response['services'][0]['operational-state'], 'outOfService')
self.assertEqual(response['services'][0]['administrative-state'], 'inService')
self.assertNotIn('service-resiliency', response['services'])
time.sleep(1)
- def test_35_get_service_path_service_2(self):
+ def test_40_get_service_path_service_2(self):
response = test_utils.get_serv_path_list_attr("service-paths", "service2")
self.assertEqual(response['status_code'], requests.codes.ok)
index = self.service_path_service_2_AtoZ.index(
response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
# Restore ROADM-A1-ROADM-C1 link
- def test_36_clear_pm_ROADMA_OTS_DEG2_TTP_TXRX_OpticalPowerInput(self):
+ def test_41_clear_pm_ROADMA_OTS_DEG2_TTP_TXRX_OpticalPowerInput(self):
url = "{}/operations/pm-handling:pm-interact"
body = {
"input": {
self.assertEqual(response.json()['output']['status-message'], "The PMs has been successfully released !")
time.sleep(2)
- def test_37_get_eth_service1(self):
- self.test_26_get_eth_service1()
+ def test_42_get_eth_service1(self):
+ self.test_13_get_eth_service1()
- def test_38_get_service_path_service_1(self):
- self.test_33_get_service_path_service_1()
+ def test_43_get_service_path_service_1(self):
+ self.test_38_get_service_path_service_1()
- def test_39_get_eth_service2(self):
- self.test_29_get_eth_service2()
+ def test_44_get_eth_service2(self):
+ self.test_34_get_eth_service2()
- def test_40_get_service_path_service_2(self):
- self.test_30_get_service_path_service_2()
+ def test_45_get_service_path_service_2(self):
+ self.test_35_get_service_path_service_2()
- def test_41_delete_eth_service2(self):
+ def test_46_delete_eth_service2(self):
self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service2"
response = test_utils.transportpce_api_rpc_request(
'org-openroadm-service', 'service-delete',
response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
- def test_42_delete_eth_service1(self):
+ def test_47_delete_eth_service1(self):
self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
response = test_utils.transportpce_api_rpc_request(
'org-openroadm-service', 'service-delete',
response['output']['configuration-response-common']['response-message'])
time.sleep(self.WAITING)
- def test_43_disconnect_xponders_from_roadm(self):
+ def test_48_disconnect_xponders_from_roadm(self):
response = test_utils.get_ietf_network_request('openroadm-topology', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
links = response['network'][0]['ietf-network-topology:link']
'openroadm-topology', link['link-id'], 'config')
self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
- def test_44_disconnect_xpdra2(self):
+ def test_49_disconnect_xpdra2(self):
response = test_utils.unmount_device("XPDR-A2")
self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
- def test_45_disconnect_xpdrc2(self):
+ def test_50_disconnect_xpdrc2(self):
response = test_utils.unmount_device("XPDR-C2")
self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
- def test_46_disconnect_roadmA(self):
+ def test_51_disconnect_roadmA(self):
response = test_utils.unmount_device("ROADM-A1")
self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
- def test_47_disconnect_roadmB(self):
+ def test_52_disconnect_roadmB(self):
response = test_utils.unmount_device("ROADM-B1")
self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
- def test_48_disconnect_roadmC(self):
+ def test_53_disconnect_roadmC(self):
response = test_utils.unmount_device("ROADM-C1")
self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
Code Review / transportpce.git / commitdiff