From: prakash.e Date: Wed, 7 Aug 2019 16:11:43 +0000 (+0530) Subject: Test case addition for SONAR coverage X-Git-Tag: 1.6.2~12 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Fnorthbound.git;a=commitdiff_plain;h=54fd31be9c46a26a735c4ee43470cbe225cffb4e Test case addition for SONAR coverage Added new case for delete flow in PreloadVnfTopologyOperationRPCTest Change-Id: I6eac70c388523853e519626039bb6bfafc46bd77 Issue-ID: SDNC-840 Signed-off-by: Prakash.E --- diff --git a/features/features-sdnc-northbound/pom.xml b/features/features-sdnc-northbound/pom.xml index a60ff02d..e25b0bb2 100644 --- a/features/features-sdnc-northbound/pom.xml +++ b/features/features-sdnc-northbound/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound features-sdnc-northbound - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT feature sdnc-northbound :: features :: ${project.artifactId} diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 4f548c27..c19b316d 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound-features-installer - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound :: features :: ${project.artifactId} diff --git a/features/pom.xml b/features/pom.xml index 52bbf6cc..0908f46f 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound-feature-aggregator - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound :: features diff --git a/features/sdnc-northbound-all/pom.xml b/features/sdnc-northbound-all/pom.xml index 796bfe48..db8a60b1 100644 --- a/features/sdnc-northbound-all/pom.xml +++ b/features/sdnc-northbound-all/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound-all - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT feature sdnc-northbound :: features :: ${project.artifactId} diff --git a/generic-resource-api/client/pom.xml b/generic-resource-api/client/pom.xml index f38e6828..09e6d245 100644 --- a/generic-resource-api/client/pom.xml +++ b/generic-resource-api/client/pom.xml @@ -6,7 +6,7 @@ jar org.onap.sdnc.northbound generic-resource-api-client - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT sdnc-northbound :: generic-resource-api:: ${project.artifactId} http://wiki.onap.org @@ -15,7 +15,7 @@ org.onap.ccsdk.parent client-parent - 1.3.2 + 1.3.3-SNAPSHOT diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml index 41d443d8..d3752234 100644 --- a/generic-resource-api/features/features-generic-resource-api/pom.xml +++ b/generic-resource-api/features/features-generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound features-generic-resource-api - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT feature sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml index 41899946..23965789 100644 --- a/generic-resource-api/features/pom.xml +++ b/generic-resource-api/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-features - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml index bb9fc6cf..5a4eea97 100644 --- a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml +++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound sdnc-generic-resource-api - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT feature sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index 6a175a6d..a7c8b369 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-installer - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index 5c48d14f..789c20b3 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-model - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT bundle sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index 0d24a1bb..deff8241 100644 --- a/generic-resource-api/pom.xml +++ b/generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound generic-resource-api - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound :: generic-resource-api diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml index 575853ec..2a6d50e4 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-provider - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT bundle sdnc-northbound :: generic-resource-api :: ${project.artifactId} 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 8ab5e1f7..7f7ff821 100644 --- 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 @@ -215,6 +215,45 @@ public class PreloadVnfTopologyOperationRPCTest extends GenericResourceApiProvid assertEquals(expectedOutput, output); } + + @Test + public void delete_complete_with_success_when_no_errors() throws Exception { + + svcClient.mockHasGraph(true); + PropBuilder svcResultProp = svcClient.createExecuteOKResult(); + svcClient.mockExecute(svcResultProp); + + 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.Delete) + )) + .setRequestInformation(build(requestInformation() + .setRequestId("test-request-id") + .setRequestAction(RequestInformation.RequestAction.DeleteServiceInstance) + )) + ); + + PreloadVfModuleTopologyOperationOutput output = + exec(genericResourceApiProvider::preloadVfModuleTopologyOperation, input, RpcResult::getResult); + + assertEquals("200", output.getResponseCode()); + assertEquals("Y", output.getAckFinalIndicator()); + + PreloadVfModuleTopologyOperationOutput expectedOutput = createExpectedOutput(svcResultProp, input); + assertEquals(expectedOutput, output); + } + + + private PreloadVfModuleTopologyOperationOutput createExpectedOutput(PropBuilder svcResultProp, PreloadVfModuleTopologyOperationInput input) { return build(preloadVfModuleTopologyOperationOutput() diff --git a/pom.xml b/pom.xml index cc756954..19ecbc93 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound diff --git a/version.properties b/version.properties index bf063226..6d9189d0 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=1 sprint_number=6 -feature_revision=1 +feature_revision=2 base_version=${release_name}.${sprint_number}.${feature_revision} diff --git a/vnfapi/features/features-vnfapi/pom.xml b/vnfapi/features/features-vnfapi/pom.xml index cd1e4a4b..e8a8a5c3 100644 --- a/vnfapi/features/features-vnfapi/pom.xml +++ b/vnfapi/features/features-vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound features-vnfapi - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT feature sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml index 563c0f61..48c8bf05 100644 --- a/vnfapi/features/pom.xml +++ b/vnfapi/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound vnfapi-features - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/features/sdnc-vnfapi/pom.xml b/vnfapi/features/sdnc-vnfapi/pom.xml index 3bbdec7d..23c3d019 100644 --- a/vnfapi/features/sdnc-vnfapi/pom.xml +++ b/vnfapi/features/sdnc-vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound sdnc-vnfapi - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT feature sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index a0316e97..1f4b9788 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound vnfapi-installer - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml index e9d725c8..874ff7f7 100644 --- a/vnfapi/model/pom.xml +++ b/vnfapi/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound vnfapi-model - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT bundle sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/pom.xml b/vnfapi/pom.xml index f47ba584..422d75fd 100644 --- a/vnfapi/pom.xml +++ b/vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound vnfapi - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound :: vnfapi diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml index f007e742..0c69ea4f 100644 --- a/vnfapi/provider/pom.xml +++ b/vnfapi/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound vnfapi-provider - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT bundle sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnftools/features/features-vnftools/pom.xml b/vnftools/features/features-vnftools/pom.xml index 8a686f70..90d9c142 100644 --- a/vnftools/features/features-vnftools/pom.xml +++ b/vnftools/features/features-vnftools/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound features-vnftools - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT feature sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml index 37aca08f..911d5310 100644 --- a/vnftools/features/pom.xml +++ b/vnftools/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound vnftools-features - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/features/sdnc-vnftools/pom.xml b/vnftools/features/sdnc-vnftools/pom.xml index f494edbe..791661ce 100644 --- a/vnftools/features/sdnc-vnftools/pom.xml +++ b/vnftools/features/sdnc-vnftools/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound sdnc-vnftools - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT feature sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index 4b5ecdda..21847bc8 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound vnftools-installer - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/pom.xml b/vnftools/pom.xml index 73031343..99f1903d 100644 --- a/vnftools/pom.xml +++ b/vnftools/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound vnftools - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT pom VNF Tools Plugin diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml index a0a9bc60..6bd110e3 100644 --- a/vnftools/provider/pom.xml +++ b/vnftools/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.sdnc.northbound vnftools-provider - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT bundle sdnc-northbound :: vnftools :: ${project.artifactId}