<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>
<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>
<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>
<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>
<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>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>client-parent</artifactId>
- <version>1.3.2</version>
+ <version>1.3.3-SNAPSHOT</version>
</parent>
<dependencies>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
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()
<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>
release_name=1
sprint_number=6
-feature_revision=1
+feature_revision=2
base_version=${release_name}.${sprint_number}.${feature_revision}
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>