Test case addition for SONAR coverage 22/92922/2
authorprakash.e <prakash.e@huawei.com>
Wed, 7 Aug 2019 16:11:43 +0000 (21:41 +0530)
committerTimoney, Dan (dt5972) <dtimoney@att.com>
Fri, 9 Aug 2019 18:06:06 +0000 (14:06 -0400)
Added new case for delete flow in PreloadVnfTopologyOperationRPCTest
Change-Id: I6eac70c388523853e519626039bb6bfafc46bd77
Issue-ID: SDNC-840
Signed-off-by: Prakash.E <prakash.e@huawei.com>
28 files changed:
features/features-sdnc-northbound/pom.xml
features/installer/pom.xml
features/pom.xml
features/sdnc-northbound-all/pom.xml
generic-resource-api/client/pom.xml
generic-resource-api/features/features-generic-resource-api/pom.xml
generic-resource-api/features/pom.xml
generic-resource-api/features/sdnc-generic-resource-api/pom.xml
generic-resource-api/installer/pom.xml
generic-resource-api/model/pom.xml
generic-resource-api/pom.xml
generic-resource-api/provider/pom.xml
generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/PreloadVnfTopologyOperationRPCTest.java
pom.xml
version.properties
vnfapi/features/features-vnfapi/pom.xml
vnfapi/features/pom.xml
vnfapi/features/sdnc-vnfapi/pom.xml
vnfapi/installer/pom.xml
vnfapi/model/pom.xml
vnfapi/pom.xml
vnfapi/provider/pom.xml
vnftools/features/features-vnftools/pom.xml
vnftools/features/pom.xml
vnftools/features/sdnc-vnftools/pom.xml
vnftools/installer/pom.xml
vnftools/pom.xml
vnftools/provider/pom.xml

index a60ff02..e25b0bb 100644 (file)
@@ -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>
index 4f548c2..c19b316 100755 (executable)
@@ -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>
index 52bbf6c..0908f46 100755 (executable)
@@ -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>
index 796bfe4..db8a60b 100644 (file)
@@ -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>
index f38e682..09e6d24 100644 (file)
@@ -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>
index 41d443d..d375223 100644 (file)
@@ -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>
index 4189994..2396578 100644 (file)
@@ -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>
index bb9fc6c..5a4eea9 100644 (file)
@@ -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>
index 6a175a6..a7c8b36 100755 (executable)
@@ -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>
index 5c48d14..789c20b 100644 (file)
@@ -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>
index 0d24a1b..deff824 100644 (file)
@@ -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>
index 575853e..2a6d50e 100644 (file)
@@ -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>
index 8ab5e1f..7f7ff82 100644 (file)
@@ -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 cc75695..19ecbc9 100644 (file)
--- a/pom.xml
+++ b/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</artifactId>
-       <version>1.6.1-SNAPSHOT</version>
+       <version>1.6.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-northbound</name>
index bf06322..6d9189d 100644 (file)
@@ -5,7 +5,7 @@
 
 release_name=1
 sprint_number=6
-feature_revision=1
+feature_revision=2
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
index cd1e4a4..e8a8a5c 100644 (file)
@@ -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>
index 563c0f6..48c8bf0 100644 (file)
@@ -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>
index 3bbdec7..23c3d01 100644 (file)
@@ -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>
index a0316e9..1f4b978 100755 (executable)
@@ -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>
index e9d725c..874ff7f 100644 (file)
@@ -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>
index f47ba58..422d75f 100644 (file)
@@ -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>
index f007e74..0c69ea4 100644 (file)
@@ -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>
index 8a686f7..90d9c14 100644 (file)
@@ -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>
index 37aca08..911d531 100644 (file)
@@ -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>
index f494edb..791661c 100644 (file)
@@ -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>
index 4b5ecdd..21847bc 100755 (executable)
@@ -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>
index 7303134..99f1903 100644 (file)
@@ -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>
index a0a9bc6..6bd110e 100644 (file)
@@ -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>