X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2Fservice%2FServiceDataStoreOperationsImplTest.java;h=4c285024e2de54987ab3b886ffb08da2c6f27639;hb=a05bba4c09700f9e2bc0520d5de384477abd0107;hp=67a51b5088083b7f60fe0f63e3df49df49160e25;hpb=c9aef6567c2a11918b591302dc8835a1fa232d40;p=transportpce.git

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java
index 67a51b508..4c285024e 100644
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.transportpce.servicehandler.service;
 
+import java.util.Optional;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -16,8 +18,8 @@ import org.opendaylight.transportpce.common.ResponseCodes;
 import org.opendaylight.transportpce.servicehandler.ServiceInput;
 import org.opendaylight.transportpce.servicehandler.utils.ServiceDataUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev171017.PathComputationRequestOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev171017.PathComputationRequestOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestOutputBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommon;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommonBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.State;
@@ -30,14 +32,11 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev171016.response.parameters.sp.ResponseParametersBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev171016.response.parameters.sp.response.parameters.PathDescriptionBuilder;
 
-import java.util.Optional;
-
 
 public class ServiceDataStoreOperationsImplTest extends AbstractTest {
 
     private ServiceDataStoreOperationsImpl serviceDataStoreOperations;
 
-
     @Before
     public void init() {
         DataBroker dataBroker = this.getNewDataBroker();
@@ -127,8 +126,8 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
 
     @Test
     public void getServiceFromEmptyDataStoreShouldBeEmpty() {
-        Optional<Services> oService = this.serviceDataStoreOperations.getService("service 1");
-        Assert.assertFalse(oService.isPresent());
+        Optional<Services> optService = this.serviceDataStoreOperations.getService("service 1");
+        Assert.assertFalse(optService.isPresent());
     }
 
     @Test
@@ -143,9 +142,9 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         this.serviceDataStoreOperations.createService(createInput);
 
-        Optional<Services> oService = this.serviceDataStoreOperations.getService(createInput.getServiceName());
-        Assert.assertTrue(oService.isPresent());
-        Assert.assertEquals(createInput.getServiceName(), oService.get().getServiceName());
+        Optional<Services> optService = this.serviceDataStoreOperations.getService(createInput.getServiceName());
+        Assert.assertTrue(optService.isPresent());
+        Assert.assertEquals(createInput.getServiceName(), optService.get().getServiceName());
     }
 
     @Test
@@ -166,16 +165,16 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
     public void modifyServiceIsSuccessfulForPresentService() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         this.serviceDataStoreOperations.createService(createInput);
-        OperationResult result =
-                this.serviceDataStoreOperations.modifyService(createInput.getServiceName(), State.InService, State.InService);
+        OperationResult result = this.serviceDataStoreOperations.modifyService(createInput.getServiceName(),
+            State.InService, State.InService);
         Assert.assertTrue(result.isSuccess());
     }
 
     @Test
     public void getTempServiceFromEmptyDataStoreShouldBeEmpty() {
         Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.temp.service.list
-                .Services> oService = this.serviceDataStoreOperations.getTempService("service 1");
-        Assert.assertFalse(oService.isPresent());
+                .Services> optService = this.serviceDataStoreOperations.getTempService("service 1");
+        Assert.assertFalse(optService.isPresent());
     }
 
     @Test
@@ -191,9 +190,9 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
         this.serviceDataStoreOperations.createTempService(createInput);
 
         Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.temp.service.list
-                .Services> oService = this.serviceDataStoreOperations.getTempService(createInput.getCommonId());
-        Assert.assertTrue(oService.isPresent());
-        Assert.assertEquals(createInput.getCommonId(), oService.get().getCommonId());
+                .Services> optService = this.serviceDataStoreOperations.getTempService(createInput.getCommonId());
+        Assert.assertTrue(optService.isPresent());
+        Assert.assertEquals(createInput.getCommonId(), optService.get().getCommonId());
     }
 
     @Test
@@ -208,8 +207,8 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
     public void modifyTempServiceIsSuccessfulForPresentTempService() {
         TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput();
         this.serviceDataStoreOperations.createTempService(createInput);
-        OperationResult result =
-                this.serviceDataStoreOperations.modifyTempService(createInput.getCommonId(), State.InService, State.InService);
+        OperationResult result = this.serviceDataStoreOperations.modifyTempService(createInput.getCommonId(),
+            State.InService, State.InService);
         Assert.assertTrue(result.isSuccess());
     }
 
@@ -222,13 +221,15 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
                 .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(1L).setRate(1L).build())
-                        .setZToADirection(new ZToADirectionBuilder().setZToAWavelengthNumber(1L).setRate(1L).build()).build()).build();
+            .setPathDescription(new PathDescriptionBuilder()
+                .setAToZDirection(new AToZDirectionBuilder().setAToZWavelengthNumber(1L).setRate(1L).build())
+                .setZToADirection(new ZToADirectionBuilder().setZToAWavelengthNumber(1L).setRate(1L).build()).build())
+            .build();
         PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder()
-                .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters).build();
+            .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters)
+            .build();
         OperationResult result =
-                this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput);
+            this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput);
         Assert.assertTrue(result.isSuccess());
     }
 
@@ -238,13 +239,14 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
         this.serviceDataStoreOperations.createService(createInput);
         ServiceInput serviceInput = new ServiceInput(createInput);
         ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder()
-                .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO)
-                .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build();
+            .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO)
+            .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build();
         ResponseParameters responseParameters = new ResponseParametersBuilder().build();
         PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder()
-                .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters).build();
+            .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters)
+            .build();
         OperationResult result =
-                this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput);
+            this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput);
         Assert.assertFalse(result.isSuccess());
     }
 
@@ -254,17 +256,19 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
         this.serviceDataStoreOperations.createService(createInput);
         ServiceInput serviceInput = new ServiceInput(createInput);
         ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder()
-                .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO)
-                .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build();
+            .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(1L).setRate(1L).build())
-                        .setZToADirection(new ZToADirectionBuilder().setZToAWavelengthNumber(1L).setRate(1L).build()).build()).build();
+            .setPathDescription(new PathDescriptionBuilder()
+                .setAToZDirection(new AToZDirectionBuilder().setAToZWavelengthNumber(1L).setRate(1L).build())
+                .setZToADirection(new ZToADirectionBuilder().setZToAWavelengthNumber(1L).setRate(1L).build()).build())
+            .build();
         PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder()
-                .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters).build();
+            .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters)
+            .build();
         this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput);
 
         OperationResult result = this.serviceDataStoreOperations.deleteServicePath(serviceInput.getServiceName());
         Assert.assertTrue(result.isSuccess());
     }
-}
\ No newline at end of file
+}