<artifactId>sdc-tosca</artifactId>
<name>sdc-sdc-tosca</name>
<description>SDC Tosca Parser JAR file for use by consumers</description>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<dependency>
<groupId>org.onap.sdc.jtosca</groupId>
<artifactId>jtosca</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</dependency>
if (ntProperties != null && ntProperties.size() > 0) {
for (Property current : ntProperties.values()) {
- filterProperties(current.getValue(), current.getName(), filterType, pattern, filterMap);
+ if (current.getValue() != null) {
+ filterProperties(current.getValue(), current.getName(), filterType, pattern, filterMap);
+ }
}
}
static ISdcCsarHelper csarHelperVfInterfaces;
static ISdcCsarHelper csarHelperServiceAnnotations;
static ISdcCsarHelper csarHelperServiceAdiodAnnotations;
+ static ISdcCsarHelper csarHelperServiceNetworkCloud;
static Map<String, HashMap<String, List<String>>> fdntCsarHelper_Data;
csarHelperServiceAnnotations = getCsarHelper("csars/resource-Sirovinputannotation-csar.csar");
csarHelperVfInterfaces = getCsarHelper("csars/service-CxSvc-csar.csar");
csarHelperServiceAdiodAnnotations = getCsarHelper("csars/service-AdiodVmxVpeBvService-csar.csar");
+ csarHelperServiceNetworkCloud = getCsarHelper("csars/service-NetworkCloudVnfServiceMock-csar.csar");
fdntCsarHelper_Data = new HashMap<String, HashMap<String, List<String>>>(){
{
package org.onap.sdc.impl;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
assertEquals("subnet_role_6", ((Map) ((ArrayList) propertyAsObject).get(1)).get("subnet_role"));
}
+ @Test
+ public void testResolveGetInputForListOnNetworkCloud() {
+ final String related_network_role = "related_network_role";
+ List<NodeTemplate> serviceVfList = csarHelperServiceNetworkCloud.getServiceVfList();
+ assertNotNull(serviceVfList);
+ assertFalse(serviceVfList.isEmpty());
+ List<NodeTemplate> vfcListByVf = csarHelperServiceNetworkCloud.getVfcListByVf(csarHelperServiceNetworkCloud.getNodeTemplateCustomizationUuid(serviceVfList.get(0)));
+ assertNotNull(vfcListByVf);
+ assertFalse(vfcListByVf.isEmpty());
+ List<NodeTemplate> cpList = csarHelperServiceNetworkCloud.getNodeTemplateChildren(vfcListByVf.get(0));
+ assertNotNull(cpList);
+ assertFalse(cpList.isEmpty());
+ final Object propertyValue = cpList.get(0).getPropertyValue("related_networks");
+ assertNotNull(propertyValue);
+ ArrayList<Map<String, String>> relatedNetworkList = (ArrayList)propertyValue;
+ assertEquals(3, relatedNetworkList.size());
+ assertEquals("cor_direct_2", relatedNetworkList.get(0).get(related_network_role));
+ assertEquals("sgi_direct_2", relatedNetworkList.get(1).get(related_network_role));
+ assertEquals("int_imbl_2", relatedNetworkList.get(2).get(related_network_role));
+ }
+
@Test
public void testResolveGetInputForPrimitiveTypeString() {
//This test covers "default" resolving of primitive - as Object