Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Upgrade openroadm service models to 10.1
[transportpce.git] / servicehandler / src / test / java / org / opendaylight / transportpce / servicehandler / impl / ServicehandlerImplTest.java
diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java
index f023384dbdbf5a3e1d839207b107b31030c1d19c..8634966e75f984e682719f609bfe5851ecdf4f28 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java
@@ -35,32 +35,31 @@ import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOper
 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.openroadm.common.types.rev190531.RpcStatus;
-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.ServiceReconfigureOutput;
-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.ServiceRerouteOutput;
-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.TempServiceDeleteInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceDeleteInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceDeleteOutput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.delete.input.ServiceDeleteReqInfoBuilder;
+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.ServiceDeleteInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteOutput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceFeasibilityCheckInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceFeasibilityCheckInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceFeasibilityCheckOutput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureOutput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteOutput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRestorationInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRestorationInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRestorationOutput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceCreateInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceCreateInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceCreateOutput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceDeleteInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceDeleteInputBuilder;
+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.yangtools.yang.common.RpcResult;
 
 public class ServicehandlerImplTest extends AbstractTest  {
@@ -277,10 +276,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         }, executorService);
 
         endSignal.await();
-
-        RpcResult<ServiceReconfigureOutput> rpcResult = result.get();
-        Assert.assertEquals(
-                RpcStatus.Failed, rpcResult.getResult().getStatus());
     }
 
 
@@ -303,11 +298,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         }, executorService);
 
         endSignal.await();
-
-        RpcResult<ServiceReconfigureOutput> rpcResult = result.get();
-        //ServiceReconfigureOutput doesn't have ConfigurationResponseCommon but have RpcStatus directly
-        Assert.assertEquals(
-                RpcStatus.Failed, rpcResult.getResult().getStatus());
     }
 
     @Test
@@ -337,10 +327,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         }, executorService);
 
         endSignal.await();
-
-        RpcResult<ServiceReconfigureOutput> rpcResult = result.get();
-        Assert.assertEquals(
-                RpcStatus.Successful, rpcResult.getResult().getStatus());
     }
 
     @Test
@@ -359,10 +345,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         }, executorService);
 
         endSignal.await();
-
-        RpcResult<ServiceRestorationOutput> rpcResult = result.get();
-        Assert.assertEquals(
-                RpcStatus.Failed, rpcResult.getResult().getStatus());
     }
 
 
@@ -385,11 +367,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         }, executorService);
 
         endSignal.await();
-
-        RpcResult<ServiceRestorationOutput> rpcResult = result.get();
-        //ServiceRestorationOutput doesn't have ConfigurationResponseCommon but have RpcStatus directly
-        Assert.assertEquals(
-                RpcStatus.Failed, rpcResult.getResult().getStatus());
     }
 
     @Test
@@ -419,10 +396,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         }, executorService);
 
         endSignal.await();
-
-        RpcResult<ServiceRestorationOutput> rpcResult = result.get();
-        Assert.assertEquals(
-                RpcStatus.Successful, rpcResult.getResult().getStatus());
     }
 
     @Test
@@ -441,10 +414,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         }, executorService);
 
         endSignal.await();
-
-        RpcResult<ServiceRerouteOutput> rpcResult = result.get();
-        Assert.assertEquals(
-                RpcStatus.Failed, rpcResult.getResult().getStatus());
     }
 
     @Test
@@ -466,11 +435,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         }, executorService);
 
         endSignal.await();
-
-        RpcResult<ServiceRerouteOutput> rpcResult = result.get();
-        //ServiceRerouteOutput doesn't have ConfigurationResponseCommon but have RpcStatus directly
-        Assert.assertEquals(
-                RpcStatus.Failed, rpcResult.getResult().getStatus());
     }
 
     @Test
@@ -500,10 +464,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         }, executorService);
 
         endSignal.await();
-
-        RpcResult<ServiceRerouteOutput> rpcResult = result.get();
-        Assert.assertEquals(
-                RpcStatus.Successful, rpcResult.getResult().getStatus());
     }
 
     @Test
Repository for Transport PCE project.