Extended notation support for interface operation.

Support extended notation for "Implementation" in interface operation.

Change-Id: Ie1e0979e19d0989fce8d63ebfb7e3abf93aca4a1
Issue-ID: SDC-1433
Signed-off-by: priyanshu <pagarwal@amdocs.com>

diff --git a/pom.xml b/pom.xml
index b51e68b..4fcef65 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
        <artifactId>sdc-tosca</artifactId>
        <name>sdc-sdc-tosca</name>
        <description>SDC Tosca Parser JAR file for use by consumers</description>
-       <version>1.4.0-SNAPSHOT</version>
+       <version>1.4.1-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <properties>
@@ -112,7 +112,7 @@
                <dependency>
                        <groupId>org.onap.sdc.jtosca</groupId>
                        <artifactId>jtosca</artifactId>
-                       <version>1.3.5</version>
+                       <version>1.4.1-SNAPSHOT</version>
                </dependency>
 
 

diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java
index e6755e1..907df58 100644 (file)
--- a/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java
@@ -56,4 +56,13 @@ public class ToscaParserInterfaceTest extends SdcToscaParserBasicTest {
         assertEquals(interfaceDef.getOperationName(), "instantiate");
     }
 
+    @Test
+    public void testGetInterfaceOperationImplementationDetails() {
+        InterfacesDef interfaceDef = csarHelperVfInterfaces.getInterfaceOperationDetails(vfs.get(0), "org.openecomp.interfaces.node.lifecycle.CxVnf1", "upgrade");
+        assertNotNull(interfaceDef);
+        assertNotNull(interfaceDef.getImplementation());
+        assertEquals(((Map)interfaceDef.getImplementation()).get("primary"), "Artifacts/Deployment/WORKFLOW/CreateWorkFlow.json");
+        assertEquals(((Map)interfaceDef.getImplementation()).get("dependencies"), "TestDependency1");
+    }
+
 }

diff --git a/src/test/resources/csars/service-CxSvc-csar.csar b/src/test/resources/csars/service-CxSvc-csar.csar
index 6bdbedc..ad77cc4 100644 (file)
Binary files a/src/test/resources/csars/service-CxSvc-csar.csar and b/src/test/resources/csars/service-CxSvc-csar.csar differ

diff --git a/version.properties b/version.properties
index d709d86..a169fce 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major=1
 minor=4
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}