X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2FModelMappingUtilsTest.java;h=387c7c6fcb9b48586cbe13ddd6db23bf68b9b993;hb=0ffe7488a6f08b542f99bd1f13dc91c8d6dbfb34;hp=75620c4aad6e1d6615138edeb32c669712805a7a;hpb=61a429b5b722d038a03c56645b0b56907203c540;p=transportpce.git diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java index 75620c4aa..387c7c6fc 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java @@ -7,60 +7,63 @@ */ package org.opendaylight.transportpce.servicehandler; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import java.util.Arrays; +import java.util.Map; +import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.servicehandler.utils.ServiceDataUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.ConnectionType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommon; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommonBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.sdnc.request.header.SdncRequestHeaderBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev190531.RpcStatus; -import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.CoRoutingBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.HardConstraintsBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.SoftConstraintsBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceFeasibilityCheckInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceFeasibilityCheckInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceFeasibilityCheckOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceReconfigureInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceReconfigureInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRerouteInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRerouteInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRestorationInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRestorationInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRestorationOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceCreateInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceCreateOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.Services; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.ServicesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.ServicesKey; -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.service.types.rev200128.response.parameters.sp.ResponseParameters; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.ResponseParametersBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.response.parameters.PathDescriptionBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRequestOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.ConnectionType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.configuration.response.common.ConfigurationResponseCommonBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.sdnc.request.header.SdncRequestHeaderBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209.constraints.CoRoutingBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209.constraints.co.routing.ServiceIdentifierListBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209.routing.constraints.HardConstraintsBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209.routing.constraints.SoftConstraintsBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceFeasibilityCheckInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceFeasibilityCheckInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceFeasibilityCheckOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigureInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigureInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRerouteInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRerouteInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRestorationInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRestorationInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRestorationOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceCreateInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceCreateOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.list.Services; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.list.ServicesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.list.ServicesKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.AToZDirectionBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.ZToADirectionBuilder; +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.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePaths; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePathsBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePathsKey; @@ -74,153 +77,153 @@ public class ModelMappingUtilsTest extends AbstractTest { private CountDownLatch endSignal; private static final int NUM_THREADS = 5; - @Before - public void setUp() { + @BeforeEach + void setUp() { executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(NUM_THREADS)); endSignal = new CountDownLatch(1); } - @After - public void tearDown() { + @AfterEach + void tearDown() { executorService.shutdownNow(); } private ServiceReconfigureInput buildServiceConfigurationInput() { - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx"); - OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC); - OffsetDateTime offsetDateTime2 = offsetDateTime.plusDays(10); - return new ServiceReconfigureInputBuilder().setNewServiceName("service 1") - .setServiceName("service 1").setCommonId("common id").setConnectionType(ConnectionType.Service) - .setCustomer("customer").setCustomerContact("customer contact").setDueDate(new DateAndTime( - dtf.format(offsetDateTime))) - .setEndDate(new DateAndTime(dtf.format(offsetDateTime2))) + return new ServiceReconfigureInputBuilder() + .setNewServiceName("service 1").setServiceName("service 1").setCommonId("common id") + .setConnectionType(ConnectionType.Service).setCustomer("customer").setCustomerContact("customer contact") + .setDueDate(new DateAndTime(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx") + .format(OffsetDateTime.now(ZoneOffset.UTC)))) + .setEndDate(new DateAndTime(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx") + .format(OffsetDateTime.now(ZoneOffset.UTC).plusDays(10)))) .setNcCode("nc node").setNciCode("nci node").setSecondaryNciCode("secondry").setOperatorContact("operator") .setServiceAEnd(ServiceDataUtils.getServiceAEndBuildReconfigure().build()) .setServiceZEnd(ServiceDataUtils.getServiceZEndBuildReconfigure().build()) .setHardConstraints(new HardConstraintsBuilder() - .setCoRoutingOrGeneral(new CoRoutingBuilder() - .setCoRouting(new org.opendaylight.yang.gen.v1.http.org.openroadm.routing - .constrains.rev190329.constraints.co.routing.or.general.co.routing - .CoRoutingBuilder().setExistingService( - Arrays.asList("Some existing-service")).build()) - .build()) - .setCustomerCode(Arrays.asList("Some customer-code")) - .build()) - .setSoftConstraints(new SoftConstraintsBuilder() - .setCoRoutingOrGeneral(new CoRoutingBuilder() - .setCoRouting(new org.opendaylight.yang.gen.v1.http.org.openroadm.routing - .constrains.rev190329.constraints.co.routing.or.general.co.routing - .CoRoutingBuilder().setExistingService( - Arrays.asList("Some existing-service")).build()) - .build()) - .setCustomerCode(Arrays.asList("Some customer-code")) - .build()) - .build(); + .setCustomerCode(Set.of("Some customer-code")) + .setCoRouting(new CoRoutingBuilder() + .setServiceIdentifierList(Map.of( + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209 + .constraints.co.routing.ServiceIdentifierListKey("Some existing-service"), + new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service") + .build())) + .build()) + .build()) + .setSoftConstraints(new SoftConstraintsBuilder() + .setCustomerCode(Set.of("Some customer-code")) + .setCoRouting(new CoRoutingBuilder() + .setServiceIdentifierList(Map.of( + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209 + .constraints.co.routing.ServiceIdentifierListKey("Some existing-service"), + new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service") + .build())) + .build()) + .build()) + .build(); } private PathComputationRequestOutput buildPathComputationOutput() { - ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO) - .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); - ResponseParameters responseParameters = new ResponseParametersBuilder() - .setPathDescription(new PathDescriptionBuilder() - .setAToZDirection(new AToZDirectionBuilder().setAToZWavelengthNumber(Uint32.valueOf(1)) - .setRate(Uint32.valueOf(1)).build()) - .setZToADirection(new ZToADirectionBuilder().setZToAWavelengthNumber(Uint32.valueOf(1)) - .setRate(Uint32.valueOf(1)).build()).build()) + return new PathComputationRequestOutputBuilder() + .setConfigurationResponseCommon(new ConfigurationResponseCommonBuilder() + .setRequestId("request 1") + .setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO) + .setResponseCode(ResponseCodes.RESPONSE_OK) + .setResponseMessage("PCE calculation in progress") + .build()) + .setResponseParameters(new ResponseParametersBuilder() + .setPathDescription(new PathDescriptionBuilder() + .setAToZDirection(new AToZDirectionBuilder() + .setAToZWavelengthNumber(Uint32.valueOf(1)) + .setRate(Uint32.valueOf(1)) + .build()) + .setZToADirection(new ZToADirectionBuilder() + .setZToAWavelengthNumber(Uint32.valueOf(1)) + .setRate(Uint32.valueOf(1)) + .build()) + .build()) + .build()) .build(); - return new PathComputationRequestOutputBuilder().setConfigurationResponseCommon(configurationResponseCommon) - .setResponseParameters(responseParameters).build(); - } - - @Test - //TODO : is this unit test relevant ? - public void mappingServicesNullServiceCreateInput() { - Services services = ModelMappingUtils.mappingServices(null, null); - Assert.assertEquals(new ServicesBuilder().withKey(new ServicesKey("unknown")).build(), services); } @Test - public void mappingServiceNotNullServiceReconfigureInput() { + void mappingServiceNotNullServiceReconfigureInput() { Services services = ModelMappingUtils.mappingServices(null, buildServiceConfigurationInput()); - Assert.assertEquals("service 1", services.getServiceName()); + assertEquals("service 1", services.getServiceName()); } @Test - public void mappingServiceValid() { - Services services = ModelMappingUtils.mappingServices(ServiceDataUtils.buildServiceCreateInput(), - null); - Assert.assertEquals("service 1", services.getServiceName()); + void mappingServiceValid() { + Services services = ModelMappingUtils.mappingServices(ServiceDataUtils.buildServiceCreateInput(), null); + assertEquals("service 1", services.getServiceName()); } @Test //TODO : is this unit test relevant ? - public void mappingServicesPathNullServiceCreateInput() { + void mappingServicesPathNullServiceCreateInput() { ServicePaths services = ModelMappingUtils.mappingServicePaths(null, buildPathComputationOutput()); - Assert.assertEquals(new ServicePathsBuilder().withKey(new ServicePathsKey("unknown")).build(), services); + assertEquals(new ServicePathsBuilder().withKey(new ServicePathsKey("unknown")).build(), services); } @Test - public void mappingServicePathWithServiceInputWithHardConstraints() { + void mappingServicePathWithServiceInputWithHardConstraints() { ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInputWithHardConstraints(); ServiceInput serviceInput = new ServiceInput(createInput); ServicePaths services = ModelMappingUtils.mappingServicePaths(serviceInput, buildPathComputationOutput()); - Assert.assertEquals(serviceInput.getServiceName(), services.getServicePathName()); - Assert.assertNotNull(services.getHardConstraints()); + assertEquals(serviceInput.getServiceName(), services.getServicePathName()); + assertNotNull(services.getHardConstraints()); } @Test - public void mappingServicePathWithServiceInputWithSoftConstraints() { + void mappingServicePathWithServiceInputWithSoftConstraints() { ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInputWithSoftConstraints(); ServiceInput serviceInput = new ServiceInput(createInput); ServicePaths services = ModelMappingUtils.mappingServicePaths(serviceInput, buildPathComputationOutput()); - Assert.assertEquals(serviceInput.getServiceName(), services.getServicePathName()); - Assert.assertNotNull(services.getSoftConstraints()); + assertEquals(serviceInput.getServiceName(), services.getServicePathName()); + assertNotNull(services.getSoftConstraints()); } @Test - public void createServiceDeleteInputWithServiceRerouteInput() { + void createServiceDeleteInputWithServiceRerouteInput() { ServiceRerouteInput serviceRerouteinput = new ServiceRerouteInputBuilder().setServiceName("reroute").build(); Services services = new ServicesBuilder() - .withKey(new ServicesKey("reroute")) - .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("123").build()).build(); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteInput - serviceDeleteInput = - ModelMappingUtils.createServiceDeleteInput(serviceRerouteinput, services); - Assert.assertEquals("reroute", serviceDeleteInput.getServiceName()); - Assert.assertEquals("123", serviceDeleteInput.getServiceHandlerHeader().getRequestId()); + .withKey(new ServicesKey("reroute")) + .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("123").build()) + .build(); + var serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(serviceRerouteinput, services); + assertEquals("reroute", serviceDeleteInput.getServiceName()); + assertEquals("123", serviceDeleteInput.getServiceHandlerHeader().getRequestId()); } @Test - public void createServiceDeleteInputWithServiceReconfigureInput() { - ServiceReconfigureInput serviceReconfigureInput = new ServiceReconfigureInputBuilder() - .setServiceName("reconf").build(); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteInput - serviceDeleteInput = - ModelMappingUtils.createServiceDeleteInput(serviceReconfigureInput); - Assert.assertEquals("reconf", serviceDeleteInput.getServiceName()); - Assert.assertEquals("reconf-reconfigure", serviceDeleteInput.getServiceHandlerHeader().getRequestId()); + void createServiceDeleteInputWithServiceReconfigureInput() { + ServiceReconfigureInput serviceReconfigureInput = new ServiceReconfigureInputBuilder() + .setServiceName("reconf") + .build(); + var serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(serviceReconfigureInput); + assertEquals("reconf", serviceDeleteInput.getServiceName()); + assertEquals("reconf-reconfigure", serviceDeleteInput.getServiceHandlerHeader().getRequestId()); } @Test - public void createServiceDeleteInputWithServiceRestorationInput() { + void createServiceDeleteInputWithServiceRestorationInput() { Services services = new ServicesBuilder() .withKey(new ServicesKey("rest")) - .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("123").build()).build(); - ServiceRestorationInput serviceRestorationInput = - new ServiceRestorationInputBuilder().setServiceName("rest").build(); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteInput - serviceDeleteInput = - ModelMappingUtils.createServiceDeleteInput(serviceRestorationInput, services); - Assert.assertEquals("rest", serviceDeleteInput.getServiceName()); - Assert.assertEquals("123", serviceDeleteInput.getServiceHandlerHeader().getRequestId()); + .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("123").build()) + .build(); + ServiceRestorationInput serviceRestorationInput = new ServiceRestorationInputBuilder() + .setServiceName("rest") + .build(); + var serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(serviceRestorationInput, services); + assertEquals("rest", serviceDeleteInput.getServiceName()); + assertEquals("123", serviceDeleteInput.getServiceHandlerHeader().getRequestId()); } @Test - public void createDeleteServiceReplyWithServiceDeleteInputWithSdncHeader() - throws ExecutionException, InterruptedException { + void createDeleteServiceReplyWithServiceDeleteInputWithSdncHeader() + throws ExecutionException, InterruptedException { ServiceDeleteInput input = new ServiceDeleteInputBuilder() - .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("12").build()).build(); + .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("12").build()) + .build(); ListenableFuture> serviceDeleteOutputF = ModelMappingUtils.createDeleteServiceReply(input, "ack", "message", "200"); serviceDeleteOutputF.addListener(new Runnable() { @@ -232,16 +235,14 @@ public class ModelMappingUtilsTest extends AbstractTest { endSignal.await(); RpcResult serviceDeleteOutput = serviceDeleteOutputF.get(); - Assert.assertEquals("200", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getResponseCode()); - Assert.assertEquals( - "ack", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); - Assert.assertEquals( - "message", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); - Assert.assertEquals("12", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getRequestId()); + assertEquals("200", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getResponseCode()); + assertEquals("ack", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); + assertEquals("message", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); + assertEquals("12", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getRequestId()); } @Test - public void createDeleteServiceReplyWithServiceDeleteInputWithoutSdncHeader() + void createDeleteServiceReplyWithServiceDeleteInputWithoutSdncHeader() throws ExecutionException, InterruptedException { ServiceDeleteInput input = new ServiceDeleteInputBuilder().build(); ListenableFuture> serviceDeleteOutputF = @@ -255,20 +256,18 @@ public class ModelMappingUtilsTest extends AbstractTest { endSignal.await(); RpcResult serviceDeleteOutput = serviceDeleteOutputF.get(); - Assert.assertEquals("200", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getResponseCode()); - Assert.assertEquals( - "ack", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); - Assert.assertEquals( - "message", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); - Assert.assertNull(serviceDeleteOutput.getResult().getConfigurationResponseCommon().getRequestId()); + assertEquals("200", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getResponseCode()); + assertEquals("ack", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); + assertEquals("message", serviceDeleteOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); + assertNull(serviceDeleteOutput.getResult().getConfigurationResponseCommon().getRequestId()); } @Test - public void createCreateServiceReplyWithServiceCreatInputWithSdncRequestHeader() + void createCreateServiceReplyWithServiceCreatInputWithSdncRequestHeader() throws ExecutionException, InterruptedException { - ServiceCreateInput input = - new ServiceCreateInputBuilder() - .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("12").build()).build(); + ServiceCreateInput input = new ServiceCreateInputBuilder() + .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("12").build()) + .build(); ListenableFuture> serviceCreatOutputF = ModelMappingUtils.createCreateServiceReply(input, "ack", "message", "200"); serviceCreatOutputF.addListener(new Runnable() { @@ -280,16 +279,14 @@ public class ModelMappingUtilsTest extends AbstractTest { endSignal.await(); RpcResult serviceCreatOutput = serviceCreatOutputF.get(); - Assert.assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); - Assert.assertEquals( - "ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); - Assert.assertEquals( - "message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); - Assert.assertEquals("12", serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); + assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); + assertEquals("ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); + assertEquals("message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); + assertEquals("12", serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); } @Test - public void createCreateServiceReplyWithServiceCreatInputWithoutSdncRequestHeader() + void createCreateServiceReplyWithServiceCreatInputWithoutSdncRequestHeader() throws ExecutionException, InterruptedException { ServiceCreateInput input = new ServiceCreateInputBuilder().build(); ListenableFuture> serviceCreatOutputF = @@ -303,20 +300,18 @@ public class ModelMappingUtilsTest extends AbstractTest { endSignal.await(); RpcResult serviceCreatOutput = serviceCreatOutputF.get(); - Assert.assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); - Assert.assertEquals( - "ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); - Assert.assertEquals( - "message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); - Assert.assertNull(serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); + assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); + assertEquals("ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); + assertEquals("message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); + assertNull(serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); } @Test - public void createCreateServiceReplyWithTempServiceCreatInputWithSdncRequestHeader() + void createCreateServiceReplyWithTempServiceCreatInputWithSdncRequestHeader() throws ExecutionException, InterruptedException { - TempServiceCreateInput input = - new TempServiceCreateInputBuilder() - .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("12").build()).build(); + TempServiceCreateInput input = new TempServiceCreateInputBuilder() + .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("12").build()) + .build(); ListenableFuture> serviceCreatOutputF = ModelMappingUtils.createCreateServiceReply(input, "ack", "message", "200"); serviceCreatOutputF.addListener(new Runnable() { @@ -328,16 +323,14 @@ public class ModelMappingUtilsTest extends AbstractTest { endSignal.await(); RpcResult serviceCreatOutput = serviceCreatOutputF.get(); - Assert.assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); - Assert.assertEquals( - "ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); - Assert.assertEquals( - "message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); - Assert.assertEquals("12", serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); + assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); + assertEquals("ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); + assertEquals("message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); + assertEquals("12", serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); } @Test - public void createCreateServiceReplyWithTempServiceCreatInputWithoutSdncRequestHeader() + void createCreateServiceReplyWithTempServiceCreatInputWithoutSdncRequestHeader() throws ExecutionException, InterruptedException { TempServiceCreateInput input = new TempServiceCreateInputBuilder().build(); ListenableFuture> serviceCreatOutputF = @@ -351,20 +344,18 @@ public class ModelMappingUtilsTest extends AbstractTest { endSignal.await(); RpcResult serviceCreatOutput = serviceCreatOutputF.get(); - Assert.assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); - Assert.assertEquals( - "ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); - Assert.assertEquals( - "message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); - Assert.assertNull(serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); + assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); + assertEquals("ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); + assertEquals("message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); + assertNull(serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); } @Test - public void createCreateServiceReplyWithServiceFeasibilityCheckInputWithSdncRequestHeader() + void createCreateServiceReplyWithServiceFeasibilityCheckInputWithSdncRequestHeader() throws ExecutionException, InterruptedException { - ServiceFeasibilityCheckInput input = - new ServiceFeasibilityCheckInputBuilder() - .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("12").build()).build(); + ServiceFeasibilityCheckInput input = new ServiceFeasibilityCheckInputBuilder() + .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("12").build()) + .build(); ListenableFuture> serviceCreatOutputF = ModelMappingUtils.createCreateServiceReply(input, "ack", "message", "200"); serviceCreatOutputF.addListener(new Runnable() { @@ -376,16 +367,14 @@ public class ModelMappingUtilsTest extends AbstractTest { endSignal.await(); RpcResult serviceCreatOutput = serviceCreatOutputF.get(); - Assert.assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); - Assert.assertEquals( - "ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); - Assert.assertEquals( - "message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); - Assert.assertEquals("12", serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); + assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); + assertEquals("ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); + assertEquals("message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); + assertEquals("12", serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); } @Test - public void createCreateServiceReplyWithServiceFeasibilityCheckInputWithoutSdncRequestHeader() + void createCreateServiceReplyWithServiceFeasibilityCheckInputWithoutSdncRequestHeader() throws ExecutionException, InterruptedException { ServiceFeasibilityCheckInput input = new ServiceFeasibilityCheckInputBuilder().build(); ListenableFuture> serviceCreatOutputF = @@ -399,18 +388,16 @@ public class ModelMappingUtilsTest extends AbstractTest { endSignal.await(); RpcResult serviceCreatOutput = serviceCreatOutputF.get(); - Assert.assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); - Assert.assertEquals( - "ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); - Assert.assertEquals( - "message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); - Assert.assertNull(serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); + assertEquals("200", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseCode()); + assertEquals("ack", serviceCreatOutput.getResult().getConfigurationResponseCommon().getAckFinalIndicator()); + assertEquals("message", serviceCreatOutput.getResult().getConfigurationResponseCommon().getResponseMessage()); + assertNull(serviceCreatOutput.getResult().getConfigurationResponseCommon().getRequestId()); } @Test - public void testCreateRestoreServiceReply() throws ExecutionException, InterruptedException { + void testCreateRestoreServiceReply() throws ExecutionException, InterruptedException { ListenableFuture> serviceRestorationOutputF = - ModelMappingUtils.createRestoreServiceReply("message", RpcStatus.Failed); + ModelMappingUtils.createRestoreServiceReply("message"); serviceRestorationOutputF.addListener(new Runnable() { @Override public void run() { @@ -419,7 +406,5 @@ public class ModelMappingUtilsTest extends AbstractTest { }, executorService); endSignal.await(); - RpcResult serviceRestorationOutput = serviceRestorationOutputF.get(); - Assert.assertEquals("message", serviceRestorationOutput.getResult().getStatusMessage()); } }