From 05ce3093351549eb54029f907f15e9ae9273d476 Mon Sep 17 00:00:00 2001 From: PriyanshuAgarwal Date: Fri, 15 Jun 2018 11:06:32 +0530 Subject: [PATCH] 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 --- pom.xml | 4 ++-- .../org/onap/sdc/impl/ToscaParserInterfaceTest.java | 9 +++++++++ src/test/resources/csars/service-CxSvc-csar.csar | Bin 77909 -> 77970 bytes version.properties | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b51e68b..4fcef65 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ sdc-tosca sdc-sdc-tosca SDC Tosca Parser JAR file for use by consumers - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT jar @@ -112,7 +112,7 @@ org.onap.sdc.jtosca jtosca - 1.3.5 + 1.4.1-SNAPSHOT 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 --- 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 6bdbedc635e3859ed781f55c049bc29c9beaeeea..ad77cc46acdd60c358eeba479f59cd7bce66c46a 100644 GIT binary patch delta 4501 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 delta 4420 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