Code Review / sdnc / northbound.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Generic resource API catch up
[sdnc/northbound.git] / generic-resource-api / provider / src / test / java / org / onap / sdnc / northbound / PreloadVnfTopologyOperationRPCTest.java
diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/PreloadVnfTopologyOperationRPCTest.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/PreloadVnfTopologyOperationRPCTest.java
index 8a854a9..8ab5e1f 100644 (file)
--- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/PreloadVnfTopologyOperationRPCTest.java
+++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/PreloadVnfTopologyOperationRPCTest.java
@@ -7,12 +7,14 @@ import static org.onap.sdnc.northbound.GenericResourceApiProvider.APP_NAME;
 import static org.onap.sdnc.northbound.GenericResourceApiProvider.NO_SERVICE_LOGIC_ACTIVE;
 import static org.onap.sdnc.northbound.util.MDSALUtil.build;
 import static org.onap.sdnc.northbound.util.MDSALUtil.exec;
-import static org.onap.sdnc.northbound.util.MDSALUtil.preloadVnfTopologyOperationInput;
-import static org.onap.sdnc.northbound.util.MDSALUtil.preloadVnfTopologyOperationOutput;
+import static org.onap.sdnc.northbound.util.MDSALUtil.preloadVfModuleTopologyOperationInput;
+import static org.onap.sdnc.northbound.util.MDSALUtil.preloadVfModuleTopologyOperationOutput;
 import static org.onap.sdnc.northbound.util.MDSALUtil.requestInformation;
 import static org.onap.sdnc.northbound.util.MDSALUtil.sdncRequestHeader;
-import static org.onap.sdnc.northbound.util.MDSALUtil.vnfTopologyIdentifierBuilder;
-import static org.onap.sdnc.northbound.util.MDSALUtil.vnfTopologyInformationBuilder;
+import static org.onap.sdnc.northbound.util.MDSALUtil.vnfTopologyIdentifierStructureBuilder;
+import static org.onap.sdnc.northbound.util.MDSALUtil.preloadVfModuleTopologyInformationBuilder;
+import static org.onap.sdnc.northbound.util.MDSALUtil.vfModuleTopologyBuilder;
+import static org.onap.sdnc.northbound.util.MDSALUtil.vfModuleTopologyIdentifierBuilder;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -23,8 +25,8 @@ import org.onap.sdnc.northbound.util.PropBuilder;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainClosedException;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationInput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.request.information.RequestInformation;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeader.SvcAction;
 import org.opendaylight.yangtools.yang.common.RpcResult;
@@ -32,7 +34,7 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 @RunWith(MockitoJUnitRunner.class)
 public class PreloadVnfTopologyOperationRPCTest extends GenericResourceApiProviderTest {
 
-    private static final String SVC_OPERATION = "preload-vnf-topology-operation";
+    private static final String SVC_OPERATION = "preload-vf-module-topology-operation";
 
     @Before
     public void setUp() throws Exception {
@@ -43,13 +45,13 @@ public class PreloadVnfTopologyOperationRPCTest extends GenericResourceApiProvid
     @Test
     public void should_fail_when_invalid_vnf_topology() throws Exception {
 
-        PreloadVnfTopologyOperationInput input = build(preloadVnfTopologyOperationInput());
+        PreloadVfModuleTopologyOperationInput input = build(preloadVfModuleTopologyOperationInput());
 
-        PreloadVnfTopologyOperationOutput output =
-            exec(genericResourceApiProvider::preloadVnfTopologyOperation, input, RpcResult::getResult);
+        PreloadVfModuleTopologyOperationOutput output =
+            exec(genericResourceApiProvider::preloadVfModuleTopologyOperation, input, RpcResult::getResult);
 
         assertEquals("403", output.getResponseCode());
-        assertEquals("invalid input: input is null", output.getResponseMessage());
+        assertEquals("invalid input, null or empty preload-vf-module-topology-information.vf-module-topology.vf-module-topology-identifier.vf-module-name", output.getResponseMessage());
         assertEquals("Y", output.getAckFinalIndicator());
     }
 
@@ -57,17 +59,17 @@ public class PreloadVnfTopologyOperationRPCTest extends GenericResourceApiProvid
     @Test
     public void should_fail_when_invalid_preload_data() throws Exception {
 
-        PreloadVnfTopologyOperationInput input = build(preloadVnfTopologyOperationInput()
-            .setVnfTopologyInformation(build(vnfTopologyInformationBuilder()
-                .setVnfTopologyIdentifier(build(vnfTopologyIdentifierBuilder()
+        PreloadVfModuleTopologyOperationInput input = build(preloadVfModuleTopologyOperationInput()
+            .setPreloadVfModuleTopologyInformation(build(preloadVfModuleTopologyInformationBuilder()
+                .setVnfTopologyIdentifierStructure(build(vnfTopologyIdentifierStructureBuilder()
                     .setVnfName("test-vnf-name")))))
         );
 
-        PreloadVnfTopologyOperationOutput output =
-            exec(genericResourceApiProvider::preloadVnfTopologyOperation, input, RpcResult::getResult);
+        PreloadVfModuleTopologyOperationOutput output =
+            exec(genericResourceApiProvider::preloadVfModuleTopologyOperation, input, RpcResult::getResult);
 
         assertEquals("403", output.getResponseCode());
-        assertEquals("invalid input: vnf-name or vnf-type is null or empty", output.getResponseMessage());
+        assertEquals("invalid input, null or empty preload-vf-module-topology-information.vf-module-topology.vf-module-topology-identifier.vf-module-name", output.getResponseMessage());
         assertEquals("Y", output.getAckFinalIndicator());
     }
 
@@ -76,17 +78,29 @@ public class PreloadVnfTopologyOperationRPCTest extends GenericResourceApiProvid
     public void should_fail_when_client_execution_failed() throws Exception {
 
         svcClient.mockHasGraph(true);
-        svcClient.mockExecuteWoServiceData(new RuntimeException("test exception"));
-
-        PreloadVnfTopologyOperationInput input = build(preloadVnfTopologyOperationInput()
-            .setVnfTopologyInformation(build(vnfTopologyInformationBuilder()
-                .setVnfTopologyIdentifier(build(vnfTopologyIdentifierBuilder()
-                    .setVnfName("test-vnf-name")
-                    .setVnfType("test-vnf-type")))))
-        );
-
-        PreloadVnfTopologyOperationOutput output =
-            exec(genericResourceApiProvider::preloadVnfTopologyOperation, input, RpcResult::getResult);
+        svcClient.mockExecuteWoServiceDataPreload(new RuntimeException("test exception"));
+
+        PreloadVfModuleTopologyOperationInput input = build(preloadVfModuleTopologyOperationInput()
+                .setPreloadVfModuleTopologyInformation(build(preloadVfModuleTopologyInformationBuilder()
+                    .setVnfTopologyIdentifierStructure(build(vnfTopologyIdentifierStructureBuilder()
+                        .setVnfName("test-vnf-name")
+                        .setVnfType("test-vnf-type")))
+                    .setVfModuleTopology(build(vfModuleTopologyBuilder()
+                        .setVfModuleTopologyIdentifier(build(vfModuleTopologyIdentifierBuilder()
+                            .setVfModuleName("vf-module-name"))
+                )))))
+                .setSdncRequestHeader(build(sdncRequestHeader()
+                    .setSvcRequestId("test-svc-request-id")
+                    .setSvcAction(SvcAction.Assign)
+                ))
+                .setRequestInformation(build(requestInformation()
+                    .setRequestId("test-request-id")
+                    .setRequestAction(RequestInformation.RequestAction.CreateServiceInstance)
+                ))
+            );
+
+        PreloadVfModuleTopologyOperationOutput output =
+            exec(genericResourceApiProvider::preloadVfModuleTopologyOperation, input, RpcResult::getResult);
 
         assertEquals("500", output.getResponseCode());
         assertEquals("test exception", output.getResponseMessage());
@@ -98,15 +112,27 @@ public class PreloadVnfTopologyOperationRPCTest extends GenericResourceApiProvid
 
         svcClient.mockHasGraph(false);
 
-        PreloadVnfTopologyOperationInput input = build(preloadVnfTopologyOperationInput()
-            .setVnfTopologyInformation(build(vnfTopologyInformationBuilder()
-                .setVnfTopologyIdentifier(build(vnfTopologyIdentifierBuilder()
-                    .setVnfName("test-vnf-name")
-                    .setVnfType("test-vnf-type")))))
-        );
-
-        PreloadVnfTopologyOperationOutput output =
-            exec(genericResourceApiProvider::preloadVnfTopologyOperation, input, RpcResult::getResult);
+        PreloadVfModuleTopologyOperationInput input = build(preloadVfModuleTopologyOperationInput()
+                .setPreloadVfModuleTopologyInformation(build(preloadVfModuleTopologyInformationBuilder()
+                    .setVnfTopologyIdentifierStructure(build(vnfTopologyIdentifierStructureBuilder()
+                        .setVnfName("test-vnf-name")
+                        .setVnfType("test-vnf-type")))
+                    .setVfModuleTopology(build(vfModuleTopologyBuilder()
+                        .setVfModuleTopologyIdentifier(build(vfModuleTopologyIdentifierBuilder()
+                            .setVfModuleName("vf-module-name"))
+                )))))
+                .setSdncRequestHeader(build(sdncRequestHeader()
+                    .setSvcRequestId("test-svc-request-id")
+                    .setSvcAction(SvcAction.Assign)
+                ))
+                .setRequestInformation(build(requestInformation()
+                    .setRequestId("test-request-id")
+                    .setRequestAction(RequestInformation.RequestAction.CreateServiceInstance)
+                ))
+            );
+
+        PreloadVfModuleTopologyOperationOutput output =
+            exec(genericResourceApiProvider::preloadVfModuleTopologyOperation, input, RpcResult::getResult);
 
         assertEquals("503", output.getResponseCode());
         assertEquals(NO_SERVICE_LOGIC_ACTIVE + APP_NAME + ": '" + SVC_OPERATION + "'", output.getResponseMessage());
@@ -126,15 +152,27 @@ public class PreloadVnfTopologyOperationRPCTest extends GenericResourceApiProvid
         when(spyDataBroker.newWriteOnlyTransaction()).thenReturn(mockWriteTransaction);
         genericResourceApiProvider.setDataBroker(spyDataBroker);
 
-        PreloadVnfTopologyOperationInput input = build(preloadVnfTopologyOperationInput()
-            .setVnfTopologyInformation(build(vnfTopologyInformationBuilder()
-                .setVnfTopologyIdentifier(build(vnfTopologyIdentifierBuilder()
-                    .setVnfName("test-vnf-name")
-                    .setVnfType("test-vnf-type")))))
-        );
-
-        PreloadVnfTopologyOperationOutput output =
-            exec(genericResourceApiProvider::preloadVnfTopologyOperation, input, RpcResult::getResult);
+        PreloadVfModuleTopologyOperationInput input = build(preloadVfModuleTopologyOperationInput()
+                .setPreloadVfModuleTopologyInformation(build(preloadVfModuleTopologyInformationBuilder()
+                    .setVnfTopologyIdentifierStructure(build(vnfTopologyIdentifierStructureBuilder()
+                        .setVnfName("test-vnf-name")
+                        .setVnfType("test-vnf-type")))
+                    .setVfModuleTopology(build(vfModuleTopologyBuilder()
+                        .setVfModuleTopologyIdentifier(build(vfModuleTopologyIdentifierBuilder()
+                            .setVfModuleName("vf-module-name"))
+                )))))
+                .setSdncRequestHeader(build(sdncRequestHeader()
+                    .setSvcRequestId("test-svc-request-id")
+                    .setSvcAction(SvcAction.Assign)
+                ))
+                .setRequestInformation(build(requestInformation()
+                    .setRequestId("test-request-id")
+                    .setRequestAction(RequestInformation.RequestAction.CreateServiceInstance)
+                ))
+            );
+
+        PreloadVfModuleTopologyOperationOutput output =
+            exec(genericResourceApiProvider::preloadVfModuleTopologyOperation, input, RpcResult::getResult);
 
         assertEquals("500", output.getResponseCode());
         assertEquals("test exception", output.getResponseMessage());
@@ -148,11 +186,15 @@ public class PreloadVnfTopologyOperationRPCTest extends GenericResourceApiProvid
         PropBuilder svcResultProp = svcClient.createExecuteOKResult();
         svcClient.mockExecute(svcResultProp);
 
-        PreloadVnfTopologyOperationInput input = build(preloadVnfTopologyOperationInput()
-            .setVnfTopologyInformation(build(vnfTopologyInformationBuilder()
-                .setVnfTopologyIdentifier(build(vnfTopologyIdentifierBuilder()
+        PreloadVfModuleTopologyOperationInput input = build(preloadVfModuleTopologyOperationInput()
+            .setPreloadVfModuleTopologyInformation(build(preloadVfModuleTopologyInformationBuilder()
+                .setVnfTopologyIdentifierStructure(build(vnfTopologyIdentifierStructureBuilder()
                     .setVnfName("test-vnf-name")
-                    .setVnfType("test-vnf-type")))))
+                    .setVnfType("test-vnf-type")))
+                .setVfModuleTopology(build(vfModuleTopologyBuilder()
+                    .setVfModuleTopologyIdentifier(build(vfModuleTopologyIdentifierBuilder()
+                        .setVfModuleName("vf-module-name"))
+            )))))
             .setSdncRequestHeader(build(sdncRequestHeader()
                 .setSvcRequestId("test-svc-request-id")
                 .setSvcAction(SvcAction.Assign)
@@ -163,19 +205,19 @@ public class PreloadVnfTopologyOperationRPCTest extends GenericResourceApiProvid
             ))
         );
 
-        PreloadVnfTopologyOperationOutput output =
-            exec(genericResourceApiProvider::preloadVnfTopologyOperation, input, RpcResult::getResult);
+        PreloadVfModuleTopologyOperationOutput output =
+            exec(genericResourceApiProvider::preloadVfModuleTopologyOperation, input, RpcResult::getResult);
 
         assertEquals("200", output.getResponseCode());
         assertEquals("Y", output.getAckFinalIndicator());
 
-        PreloadVnfTopologyOperationOutput expectedOutput = createExpectedOutput(svcResultProp, input);
+        PreloadVfModuleTopologyOperationOutput expectedOutput = createExpectedOutput(svcResultProp, input);
         assertEquals(expectedOutput, output);
     }
 
-    private PreloadVnfTopologyOperationOutput createExpectedOutput(PropBuilder svcResultProp,
-        PreloadVnfTopologyOperationInput input) {
-        return build(preloadVnfTopologyOperationOutput()
+    private PreloadVfModuleTopologyOperationOutput createExpectedOutput(PropBuilder svcResultProp,
+        PreloadVfModuleTopologyOperationInput input) {
+        return build(preloadVfModuleTopologyOperationOutput()
             .setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId())
             .setResponseCode(svcResultProp.get(svcClient.errorCode))
             .setAckFinalIndicator(svcResultProp.get(svcClient.ackFinal))
SDNC northbound adaptors