aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pom.xml2
-rw-r--r--src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java10
-rw-r--r--src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcTypes.java17
-rw-r--r--src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java5
-rw-r--r--src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java9
-rw-r--r--src/test/resources/csars/service-PortMirroring.csarbin0 -> 56821 bytes
6 files changed, 32 insertions, 11 deletions
diff --git a/pom.xml b/pom.xml
index 3ccca61..dfb1b37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<artifactId>sdc-tosca</artifactId>
<name>SDC Tosca Parser</name>
<description>SDC Tosca Parser JAR file for use by consumers</description>
- <version>1.1.50-SNAPSHOT</version>
+ <version>1.1.51-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
diff --git a/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java b/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
index c320f63..7b94000 100644
--- a/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
+++ b/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
@@ -634,13 +634,13 @@ public class SdcCsarHelperImpl implements ISdcCsarHelper {
if (sdcType.equals(SdcTypes.VFC) && isVNF) {
return nodeTemplates.stream()
.filter(x -> (x.getMetaData() != null &&
- sdcType.toString().equals(x.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE))) && isVNFType(x))
+ sdcType.getValue().equals(x.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE))) && isVNFType(x))
.collect(Collectors.toList());
}
else {
return nodeTemplates.stream()
.filter(x -> (x.getMetaData() != null &&
- sdcType.toString().equals(x.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE))) && !isVNFType(x))
+ sdcType.getValue().equals(x.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE))) && !isVNFType(x))
.collect(Collectors.toList());
}
}
@@ -706,9 +706,9 @@ public class SdcCsarHelperImpl implements ISdcCsarHelper {
}
if (nodeTemplate.getMetaData() != null) {
- String type = nodeTemplate.getMetaData().getValue("type");
+ String type = nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE);
log.debug("hasTopology - node template {} is a {} type", nodeTemplate.getName(), type);
- return SdcTypes.isComplex(SdcTypes.valueOf(type));
+ return SdcTypes.isComplex(type);
}
return false;
@@ -852,7 +852,7 @@ public class SdcCsarHelperImpl implements ISdcCsarHelper {
List<NodeTemplate> nodeTemplates = topologyTemplate.getNodeTemplates();
if (nodeTemplates != null && nodeTemplates.size() > 0)
- return nodeTemplates.stream().filter(x -> (x.getMetaData() != null && sdcType.toString().equals(x.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE)))).collect(Collectors.toList());
+ return nodeTemplates.stream().filter(x -> (x.getMetaData() != null && sdcType.getValue().equals(x.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE)))).collect(Collectors.toList());
log.debug("getNodeTemplateBySdcType - topologyTemplate's nodeTemplates not exist");
return new ArrayList<>();
diff --git a/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcTypes.java b/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcTypes.java
index 5dc9101..03d61a6 100644
--- a/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcTypes.java
+++ b/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcTypes.java
@@ -22,14 +22,25 @@ package org.openecomp.sdc.tosca.parser.impl;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
public enum SdcTypes {
- CP, VL, VF, VFC, PNF, SERVICE, CVFC, SERVICE_PROXY, CONFIGURATION;
+ CP("CP"), VL("VL"), VF("VF"), VFC("VFC"), PNF("PNF"), SERVICE("Service"), CVFC("CVFC"), SERVICE_PROXY("Service Proxy"), CONFIGURATION("Configuration");
- public static List<SdcTypes> complexTypes = Arrays.asList(VF, PNF, SERVICE, CVFC);
+ private String value;
- public static boolean isComplex(SdcTypes sdcType) {
+ private static List<String> complexTypes = Arrays.asList(VF, PNF, SERVICE, CVFC).stream().map(SdcTypes::getValue).collect(Collectors.toList());
+
+ private SdcTypes(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public static boolean isComplex(String sdcType) {
return complexTypes.contains(sdcType);
}
}
diff --git a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java b/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java
index a73f121..90124c5 100644
--- a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java
+++ b/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java
@@ -33,8 +33,10 @@ public abstract class SdcToscaParserBasicTest {
static ISdcCsarHelper resolveGetInputCsarFalse;
static ISdcCsarHelper resolveGetInputCsarQA;
static ISdcCsarHelper resolveReqsCapsCsarQA;
+ static ISdcCsarHelper portMirroring;
- static Map<String, HashMap<String, List<String>>> fdntCsarHelper_Data;
+
+ static Map<String, HashMap<String, List<String>>> fdntCsarHelper_Data;
@BeforeClass
public static void init() throws SdcToscaParserException, JToscaException, IOException {
@@ -53,6 +55,7 @@ public abstract class SdcToscaParserBasicTest {
resolveGetInputCsarQA = getCsarHelper("csars/service-resolve-get-input-csar_QA.csar");
QAServiceForToscaParserTests = getCsarHelper("csars/service-ServiceForToscaParserTests-csar.csar");
resolveReqsCapsCsarQA = getCsarHelper("csars/service-sunny-flow2.csar");
+ portMirroring = getCsarHelper("csars/service-PortMirroring.csar");
fdntCsarHelper_Data = new HashMap<String, HashMap<String, List<String>>>(){
{
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java b/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
index 2c62ca2..ad240b1 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
+++ b/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
@@ -483,11 +483,18 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest {
public void testServiceNodeTemplateBySdcType() {
List<NodeTemplate> serviceVfList = fdntCsarHelper.getServiceNodeTemplateBySdcType(SdcTypes.VF);
assertNotNull(serviceVfList);
- assertEquals(2, serviceVfList.size());
+ assertEquals(serviceVfList.size(), 2);
assertEquals(serviceVfList.get(0).getName(), "FDNT 1");
}
@Test
+ public void testServiceNodeTemplateBySdcTypeServiceProxy() {
+ List<NodeTemplate> serviceProxies = portMirroring.getServiceNodeTemplateBySdcType(SdcTypes.SERVICE_PROXY);
+ assertNotNull(serviceProxies);
+ assertEquals(serviceProxies.size(), 2);
+ }
+
+ @Test
public void testServiceNodeTemplateByNullSdcType() {
List<NodeTemplate> serviceVfList = fdntCsarHelper.getServiceNodeTemplateBySdcType(null);
assertNotNull(serviceVfList);
diff --git a/src/test/resources/csars/service-PortMirroring.csar b/src/test/resources/csars/service-PortMirroring.csar
new file mode 100644
index 0000000..6186291
--- /dev/null
+++ b/src/test/resources/csars/service-PortMirroring.csar
Binary files differ