diff options
28 files changed, 92 insertions, 53 deletions
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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>features-sdnc-northbound</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: features :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>sdnc-northbound-features-installer</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: features :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>sdnc-northbound-feature-aggregator</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: features</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>sdnc-northbound-all</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: features :: ${project.artifactId}</name> 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 @@ <packaging>jar</packaging> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-client</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <name>sdnc-northbound :: generic-resource-api:: ${project.artifactId}</name> <url>http://wiki.onap.org</url> @@ -15,7 +15,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>client-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> </parent> <dependencies> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>features-generic-resource-api</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-features</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>sdnc-generic-resource-api</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-installer</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-model</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: generic-resource-api</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-provider</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> 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() @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>sdnc-northbound</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>features-vnfapi</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnfapi-features</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>sdnc-vnfapi</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnfapi-installer</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnfapi-model</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnfapi</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: vnfapi</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnfapi-provider</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>features-vnftools</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnftools-features</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>sdnc-vnftools</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnftools-installer</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnftools</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>VNF Tools Plugin</name> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnftools-provider</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> |