Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump upstream dependencies to Ca
[transportpce.git] / renderer / src / test / java / org / opendaylight / transportpce / renderer / provisiondevice / RendererServiceOperationsImplDeleteTest.java
diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java
index cf8eb6345ac910c38a85f5b1e217576edcaa8e02..fbedc423b9ecb663bb57514281026c06db6ad0f1 100644 (file)
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java
+++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java
@@ -14,22 +14,24 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.MountPoint;
 import org.opendaylight.mdsal.binding.api.MountPointService;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.RpcService;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.ResponseCodes;
 import org.opendaylight.transportpce.common.StringConstants;
@@ -38,7 +40,6 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
 import org.opendaylight.transportpce.common.mapping.PortMapping;
 import org.opendaylight.transportpce.renderer.provisiondevice.notification.NotificationSender;
-import org.opendaylight.transportpce.renderer.stub.OlmServiceStub;
 import org.opendaylight.transportpce.renderer.utils.NotificationPublishServiceMock;
 import org.opendaylight.transportpce.renderer.utils.ServiceDeleteDataUtils;
 import org.opendaylight.transportpce.renderer.utils.TransactionUtils;
@@ -46,8 +47,8 @@ import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.transportpce.test.stub.MountPointServiceStub;
 import org.opendaylight.transportpce.test.stub.MountPointStub;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.ServicePathOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndown;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndownOutputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.TransportpceOlmService;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteInputBuilder;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteOutput;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.node.types.rev210528.NodeIdType;
@@ -70,15 +71,24 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
+@ExtendWith(MockitoExtension.class)
 public class RendererServiceOperationsImplDeleteTest extends AbstractTest {
 
     private DeviceTransactionManager deviceTransactionManager;
+    @Mock
+    private DeviceRendererService deviceRenderer;
+    @Mock
+    private OtnDeviceRendererService otnDeviceRendererService;
+    private DataBroker dataBroker;
+    @Mock
+    private PortMapping portMapping;
+    @Mock
+    private RpcService rpcService;
+    @Mock
+    private CrossConnect crossConnect;
+    @Mock
+    private ServicePowerTurndown servicePowerTurndown;
     private RendererServiceOperationsImpl rendererServiceOperations;
-    private final DeviceRendererService deviceRenderer = mock(DeviceRendererService.class);
-    private final OtnDeviceRendererService otnDeviceRendererService = mock(OtnDeviceRendererService.class);
-    private final PortMapping portMapping = mock(PortMapping.class);
-    private final CrossConnect crossConnect = mock(CrossConnect.class);
-    private TransportpceOlmService olmService;
 
     private void setMountPoint(MountPoint mountPoint) {
         MountPointService mountPointService = new MountPointServiceStub(mountPoint);
@@ -87,13 +97,12 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest {
 
     @BeforeEach
     void setUp() {
-        setMountPoint(new MountPointStub(getDataBroker()));
-        this.olmService = new OlmServiceStub();
-        this.olmService = spy(this.olmService);
+        dataBroker = getNewDataBroker();
+        setMountPoint(new MountPointStub(dataBroker));
         NotificationPublishService notificationPublishService = new NotificationPublishServiceMock();
         this.rendererServiceOperations =  new RendererServiceOperationsImpl(deviceRenderer,
-            otnDeviceRendererService, olmService, getDataBroker(), new NotificationSender(notificationPublishService),
-            portMapping);
+            otnDeviceRendererService, dataBroker, new NotificationSender(notificationPublishService), portMapping,
+            rpcService);
     }
 
 
@@ -104,8 +113,6 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest {
         serviceDeleteInputBuilder.setServiceName("service 1");
         serviceDeleteInputBuilder.setServiceHandlerHeader((new ServiceHandlerHeaderBuilder())
             .setRequestId("request1").build());
-        doReturn(Collections.emptyList())
-            .when(this.crossConnect).deleteCrossConnect(anyString(), anyString(), eq(false));
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
             .setServiceFormat(ServiceFormat.Ethernet)
             .setServiceRate(Uint32.valueOf("100"))
@@ -122,13 +129,18 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest {
         when(portMapping.getMapping(anyString(), anyString())).thenReturn(null);
         when(deviceRenderer.deleteServicePath(any()))
             .thenReturn(new ServicePathOutputBuilder().setSuccess(true).build());
+        when(rpcService.getRpc(ServicePowerTurndown.class)).thenReturn(servicePowerTurndown);
+        doReturn(RpcResultBuilder
+                .success(new ServicePowerTurndownOutputBuilder().setResult(ResponseCodes.SUCCESS_RESULT).build())
+                .buildFuture())
+            .when(servicePowerTurndown).invoke(any());
         ServiceDeleteOutput serviceDeleteOutput = this.rendererServiceOperations
             .serviceDelete(serviceDeleteInputBuilder.build(), service).get();
         assertEquals(ResponseCodes.RESPONSE_OK, serviceDeleteOutput.getConfigurationResponseCommon().getResponseCode());
     }
 
     @Test
-    void serviceDeleteOperationNoDescription() throws InterruptedException, ExecutionException {
+    void serviceDeleteOperationWithoutPathDescription() throws InterruptedException, ExecutionException {
         ServiceDeleteInputBuilder serviceDeleteInputBuilder = new ServiceDeleteInputBuilder();
         serviceDeleteInputBuilder.setServiceName("service 1");
         Services service = new ServicesBuilder()
@@ -143,9 +155,6 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest {
                 .setNodeId(new NodeIdType("optical-node1"))
                 .build())
             .build();
-        when(portMapping.getMapping(anyString(), anyString())).thenReturn(null);
-        doReturn(RpcResultBuilder.success((new ServicePowerTurndownOutputBuilder())
-            .setResult("Failed").build()).buildFuture()).when(this.olmService).servicePowerTurndown(any());
         ServiceDeleteOutput serviceDeleteOutput
                 = this.rendererServiceOperations.serviceDelete(serviceDeleteInputBuilder.build(), service).get();
         assertEquals(
@@ -156,12 +165,6 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest {
 
     @Test
     void serviceDeleteOperationTearDownFailedAtoZ() throws ExecutionException, InterruptedException {
-        doReturn(Collections.emptyList())
-            .when(this.crossConnect).deleteCrossConnect(anyString(),anyString(), eq(false));
-        doReturn(RpcResultBuilder.success(new ServicePowerTurndownOutputBuilder().setResult("Failed").build())
-                .buildFuture())
-            .when(this.olmService).servicePowerTurndown(any());
-
         writePathDescription();
         Services service = new ServicesBuilder()
             .setServiceName("service 1")
@@ -180,6 +183,12 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest {
             .build();
         when(portMapping.getMapping(anyString(), anyString()))
             .thenReturn(null);
+        when(rpcService.getRpc(ServicePowerTurndown.class)).thenReturn(servicePowerTurndown);
+        doReturn(RpcResultBuilder
+                .success(new ServicePowerTurndownOutputBuilder().setResult(ResponseCodes.FAILED_RESULT).build())
+                .buildFuture())
+            .when(servicePowerTurndown).invoke(any());
+
         ListenableFuture<ServiceDeleteOutput> serviceDeleteOutput = this.rendererServiceOperations
             .serviceDelete(
                 new ServiceDeleteInputBuilder()
@@ -196,15 +205,13 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest {
 
     @Test
     void serviceDeleteOperationTearDownFailedZtoA() throws ExecutionException, InterruptedException {
-        doReturn(Collections.emptyList())
-            .when(this.crossConnect).deleteCrossConnect(anyString(), anyString(), eq(false));
-        when(this.olmService.servicePowerTurndown(any()))
+        writePathDescription();
+        when(rpcService.getRpc(ServicePowerTurndown.class)).thenReturn(servicePowerTurndown);
+        when(servicePowerTurndown.invoke(any()))
             .thenReturn(RpcResultBuilder.success((new ServicePowerTurndownOutputBuilder()).setResult("Success").build())
                 .buildFuture())
             .thenReturn(RpcResultBuilder.success((new ServicePowerTurndownOutputBuilder()).setResult("Failed").build())
                 .buildFuture());
-
-        writePathDescription();
         when(portMapping.getMapping(anyString(), anyString()))
             .thenReturn(null);
         ServiceDeleteOutput serviceDeleteOutput = this.rendererServiceOperations.serviceDelete(
@@ -230,7 +237,7 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest {
             .get();
         assertEquals(ResponseCodes.RESPONSE_FAILED,
             serviceDeleteOutput.getConfigurationResponseCommon().getResponseCode());
-        verify(this.olmService, times(2)).servicePowerTurndown(any());
+        verify(servicePowerTurndown, times(2)).invoke(any());
         verify(this.crossConnect, times(0)).deleteCrossConnect(eq("node1"), any(),eq(false));
         verify(this.crossConnect, times(0)).deleteCrossConnect(eq("node2"), any(),eq(false));
     }
Repository for Transport PCE project.