Add ueb-listener unit test

Enhance ueb-listener unit test to verify TOSCA parse

Change-Id: Iedc675ead3ef69e4fa7151c8c4c500990c0ee6a7
Issue-ID: CCSDK-106
Signed-off-by: Dan Timoney <dtimoney@att.com>

6 files changed, 61 insertions, 63 deletions

diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java
index 75b19cd2e..8d480a4d1 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java
@@ -8,9 +8,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,24 +23,24 @@ package org.onap.ccsdk.sli.northbound.uebclient;
 
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Metadata;
 import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SdncARModel extends SdncBaseModel {
-	
+
 	private static final Logger LOG = LoggerFactory
 			.getLogger(SdncARModel.class);
 
 	public SdncARModel(ISdcCsarHelper sdcCsarHelper, NodeTemplate nodeTemplate) {
 
 		super(sdcCsarHelper, nodeTemplate);
-		
+
 		// extract metadata
-		Metadata metadata = nodeTemplate.getMetadata();
+		Metadata metadata = nodeTemplate.getMetaData();
 		addParameter("type", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_TYPE));
-		
+
 		// extract properties
 		//addParameter("role", extractValue (sdcCsarHelper, nodeTemplate, SdcPropertyNames.PROPERTY_NAME_ROLE));
 		//addParameter("type", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_TYPE)); - wrong location, get from metadata
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java
index 32e51599e..6128f288b 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java
@@ -8,9 +8,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,33 +27,33 @@ import java.util.Map;
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
 import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.Metadata;
 import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SdncBaseModel {
-	
+
 	private static final Logger LOG = LoggerFactory
 			.getLogger(SdncBaseModel.class);
-	
+
 	protected String customizationUUID = null;
 	protected String invariantUUID = null;
-	protected String model_yaml = null;	
-	protected String version = null;	
-	
+	protected String model_yaml = null;
+	protected String version = null;
+
 	protected Map<String, String> params = null;
 	protected ISdcCsarHelper sdcCsarHelper = null;
 
 	public SdncBaseModel() {
-		
+
 	}
-	
+
 	public SdncBaseModel(ISdcCsarHelper sdcCsarHelper, Metadata metadata) {
 
 		params = new HashMap<>();
 		this.sdcCsarHelper = sdcCsarHelper;
-		
+
 		// extract service metadata
 		invariantUUID = extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID);
 		addParameter("invariant_uuid",invariantUUID);
@@ -70,11 +70,11 @@ public class SdncBaseModel {
 		this.sdcCsarHelper = sdcCsarHelper;
 
 		// extract nodeTemplate metadata
-		Metadata metadata = nodeTemplate.getMetadata();
+		Metadata metadata = nodeTemplate.getMetaData();
 		customizationUUID = extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID);
 		addParameter("invariant_uuid", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
 		addParameter("uuid", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_UUID));
-		addParameter("version", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VERSION)); 
+		addParameter("version", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VERSION));
 	}
 
 	public SdncBaseModel(ISdcCsarHelper sdcCsarHelper, Group group) {
@@ -86,9 +86,9 @@ public class SdncBaseModel {
 		Metadata metadata = group.getMetadata();
 		//customizationUUID = extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULECUSTOMIZATIONUUID); - returning null
 		customizationUUID = extractValue (metadata, "vfModuleModelCustomizationUUID");
-		addParameter("invariant_uuid", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELINVARIANTUUID));			
-		addParameter("uuid", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELUUID));			
-		addParameter("version", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELVERSION));			
+		addParameter("invariant_uuid", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELINVARIANTUUID));
+		addParameter("uuid", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELUUID));
+		addParameter("version", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELVERSION));
 	}
 
 	protected void addParameter (String name, String value) {
@@ -102,26 +102,26 @@ public class SdncBaseModel {
 			params.put(name, value);
 		}
 	}
-	
+
 	public static void addIntParameter (String name, String value, Map<String, String> params) {
 		if (value != null && !value.isEmpty()) {
 			params.put(name, value);
 		}
 	}
-	
+
 	public static void addParameter (String name, String value, Map<String, String> params) {
 		if (value != null && !value.isEmpty()) {
 			params.put(name, "\"" + value + "\"");
 		}
 	}
-	
+
 	protected String extractValue (Metadata metadata, String name) {
 		String value = sdcCsarHelper.getMetadataPropertyValue(metadata, name);
 		if (value != null) {
 			return value;
 		} else {
 			return "";
-		}	
+		}
 	}
 
 	public static String extractValue (ISdcCsarHelper sdcCsarHelper, Metadata metadata, String name) {
@@ -130,7 +130,7 @@ public class SdncBaseModel {
 			return value;
 		} else {
 			return "";
-		}	
+		}
 	}
 
 	protected String extractValue (NodeTemplate nodeTemplate, String name) {
@@ -241,19 +241,19 @@ public class SdncBaseModel {
 	public void setCustomizationUUID(String customizationUUID) {
 		this.customizationUUID = customizationUUID;
 	}
-	
+
 	public String getSql(String tableName, String model_yaml) {
-		
+
 		StringBuilder sb = new StringBuilder();
 		sb.append("INSERT into " + tableName + " (customization_uuid, model_yaml, ");
-		
+
 		int paramCount = 0;
 		for (String paramKey :  params.keySet()) {
 			paramCount++;
 		    sb.append(paramKey);
 		    if (paramCount < params.size()) sb.append(", ");
 		}
-		
+
 		sb.append(") values (" + getCustomizationUUID() + ", \"" + model_yaml + "\", ");
 
 		paramCount = 0;
@@ -267,19 +267,19 @@ public class SdncBaseModel {
 		sb.append(");");
 		return sb.toString();
 	}
-	
+
 	public static String getSql(String tableName, String keyName, String keyValue, String model_yaml, Map<String, String> params) {
-		
+
 		StringBuilder sb = new StringBuilder();
 		sb.append("INSERT into " + tableName + " (" + keyName + ", ");
-		
+
 		int paramCount = 0;
 		for (String paramKey :  params.keySet()) {
 			paramCount++;
 		    sb.append(paramKey);
 		    if (paramCount < params.size()) sb.append(", ");
 		}
-		
+
 		sb.append(") values (" + keyValue + ", ");
 
 		paramCount = 0;
@@ -293,5 +293,5 @@ public class SdncBaseModel {
 		sb.append(");");
 		return sb.toString();
 	}
-	
+
 }
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModel.java
index 3df27be6e..d3fd16791 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModel.java
@@ -23,7 +23,7 @@ package org.onap.ccsdk.sli.northbound.uebclient;
 
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Metadata;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
index f00d73724..b3c96d9d8 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
@@ -74,8 +74,8 @@ import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
 import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
 import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.Metadata;
 import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
 import org.openecomp.sdc.utils.ArtifactTypeEnum;
 import org.openecomp.sdc.utils.DistributionActionResultEnum;
 import org.openecomp.sdc.utils.DistributionStatusEnum;
@@ -238,6 +238,8 @@ public class SdncUebCallback implements INotificationCallback {
         File incomingDir = null;
         File archiveDir = null;
 
+        LOG.debug("IncomingDirName is {}", incomingDirName);
+
         // Process service level artifacts
         List<IArtifactInfo> artifactList = data.getServiceArtifacts();
 
@@ -298,12 +300,15 @@ public class SdncUebCallback implements INotificationCallback {
     public void deployDownloadedFiles(File incomingDir, File archiveDir, INotificationData data) {
 
         if (incomingDir == null) {
+        	    LOG.debug("incomingDir is null - using {}", config.getIncomingDir());
             incomingDir = new File(config.getIncomingDir());
 
             if (!incomingDir.exists()) {
                 incomingDir.mkdirs();
             }
 
+        } else {
+        		LOG.debug("incomingDir is not null - it is {}", incomingDir.getPath());
         }
 
         if (archiveDir == null) {
@@ -315,6 +320,7 @@ public class SdncUebCallback implements INotificationCallback {
         }
 
         String curFileName = "";
+        LOG.debug("Scanning {} - {} for downloaded files", incomingDir.getPath(), incomingDir.toPath());
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(incomingDir.toPath())) {
             for (Path file: stream) {
                 curFileName = file.toString();
@@ -533,7 +539,6 @@ public class SdncUebCallback implements INotificationCallback {
 			sdcCsarHelper = factory.getSdcCsarHelper(spoolFile.getAbsolutePath());
 		} catch (SdcToscaParserException e) {
 			LOG.error("Could not create SDC TOSCA Parser ", e);
-			factory.close();
 			return;
 		}
 
@@ -550,7 +555,6 @@ public class SdncUebCallback implements INotificationCallback {
 			insertToscaData(serviceModel.getSql(model_yaml));
 		} catch (IOException e) {
 			LOG.error("Could not insert Tosca YAML data into the SERVICE_MODEL table ", e);
-			factory.close();
 			return;
 		}
 
@@ -693,7 +697,7 @@ public class SdncUebCallback implements INotificationCallback {
 					//String extcp_subnetpool_id = "\"" + SdncBaseModel.extractValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_SUBNETPOOLID) + "\""; // need path to subnetpoolid
 
 					// extract values from the right "VFC" Node
-					String vfcCustomizationUuid = "\"" + SdncBaseModel.extractValue(sdcCsarHelper, match.getRight().getMetadata(), "customization_uuid") + "\"";
+					String vfcCustomizationUuid = "\"" + SdncBaseModel.extractValue(sdcCsarHelper, match.getRight().getMetaData(), "customization_uuid") + "\"";
 					SdncBaseModel.addParameter("vm_type", SdncBaseModel.extractValue(sdcCsarHelper, match.getRight(), SdcPropertyNames.PROPERTY_NAME_VMTYPE), mappingParams);
 					SdncBaseModel.addIntParameter("ipv4_count", SdncBaseModel.extractValue(sdcCsarHelper, match.getRight(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_MINSUBNETSCOUNT), mappingParams);
 					SdncBaseModel.addIntParameter("ipv6_count", SdncBaseModel.extractValue(sdcCsarHelper, match.getRight(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_MINSUBNETSCOUNT), mappingParams);
@@ -712,8 +716,7 @@ public class SdncUebCallback implements INotificationCallback {
 
 		} // VF loop
 
-		// Close ASDC TOSCA Parser factory - we are done processing this distribution
-		factory.close();
+
 
 		if ((artifact != null) && (data != null)) {
 			LOG.info("Update to SDN-C succeeded");
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java
index d97abacbd..b49a66070 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java
@@ -30,7 +30,6 @@ import java.util.List;
 import java.util.Properties;
 
 import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.utils.ArtifactTypeEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -162,16 +161,8 @@ public class SdncUebConfiguration implements IConfiguration{
 			relevantArtifactTypes = new LinkedList<>();
 
 			for (String artifactType : artifactTypes) {
-				try {
-					if (ArtifactTypeEnum.valueOf(artifactType) != null) {
-							relevantArtifactTypes.add(artifactType);
-					} else {
-						LOG.warn("Skipping unrecognized artifact type {}", artifactType);
-					}
-				} catch (Exception e) {
 
-					LOG.warn("Caught exception validating artifact type {}", artifactType, e);
-				}
+				relevantArtifactTypes.add(artifactType);
 
 			}
 
@@ -282,7 +273,11 @@ public class SdncUebConfiguration implements IConfiguration{
 
 	@Override
 	public boolean isFilterInEmptyResources() {
-		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public Boolean isUseHttpsWithDmaap() {
 		return false;
 	}
 
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModel.java
index deed20cf4..fd71527de 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModel.java
@@ -8,9 +8,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,13 +23,13 @@ package org.onap.ccsdk.sli.northbound.uebclient;
 
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Metadata;
 import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SdncVFModel extends SdncBaseModel {
-	
+
 	private static final Logger LOG = LoggerFactory
 			.getLogger(SdncVFModel.class);
 
@@ -38,11 +38,11 @@ public class SdncVFModel extends SdncBaseModel {
 		super(sdcCsarHelper, nodeTemplate);
 
 		// extract metadata
-		Metadata metadata = nodeTemplate.getMetadata();
+		Metadata metadata = nodeTemplate.getMetaData();
 		addParameter("name", extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_NAME));
-		addParameter("vendor", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_RESOURCEVENDOR)); 
-		addParameter("vendor_version", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_RESOURCEVENDORRELEASE)); 
-		
+		addParameter("vendor", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_RESOURCEVENDOR));
+		addParameter("vendor_version", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_RESOURCEVENDORRELEASE));
+
 		// extract properties
 		addParameter("ecomp_generated_naming", extractBooleanValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VNFECOMPNAMING_ECOMPGENERATEDNAMING));
 		addParameter("naming_policy", extractValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VNFECOMPNAMING_NAMINGPOLICY));