VF Module ingestion add and parser vers update

Changes made:
Add vf_customization_uuid and vf_module_label in VF Module ingestion.
Update sdc-tosca dependency version to 1.4.3 in pom.xml.

Change-Id: I5b03e8ff72a74448901f1d5f6d9ed8b7688a6f15
Issue-ID: CCSDK-540
Signed-off-by: lalena.aria <lalena.aria@att.com>

diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml
index 2fff94e..66437e4 100755 (executable)
--- a/ueb-listener/pom.xml
+++ b/ueb-listener/pom.xml
@@ -18,7 +18,7 @@
 
        <properties>
                <sdc.client.version>1.3.0</sdc.client.version>
-                <sdc.tosca.version>1.4.1</sdc.tosca.version>
+                <sdc.tosca.version>1.4.3</sdc.tosca.version>
                <fasterxml.jackson.version>2.9.4</fasterxml.jackson.version>
                <skip.SWM>true</skip.SWM>
                <ueb.listener.base>/opt/app/ueb-listener</ueb.listener.base>

diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java
index 64bceb8..2ba8de0 100644 (file)
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java
@@ -35,11 +35,11 @@ public class SdncVFModuleModel extends SdncBaseModel {
        public SdncVFModuleModel(ISdcCsarHelper sdcCsarHelper, Group group, SdncVFModel vfNodeModel) {
 
                super(sdcCsarHelper, group);
-               //addParameter("vf_customization_uuid", vfNodeModel.getCustomizationUUIDNoQuotes());
+               addParameter("vf_customization_uuid", vfNodeModel.getCustomizationUUIDNoQuotes());
                
                // extract properties
                addParameter("vf_module_type", extractValue(group, SdcPropertyNames.PROPERTY_NAME_VFMODULETYPE));
-               //addParameter("vf_module_label", extractValue(group, "vf_module_label"));
+               addParameter("vf_module_label", extractValue(group, "vf_module_label"));
                addIntParameter("availability_zone_count", extractValue(group, SdcPropertyNames.PROPERTY_NAME_AVAILABILITYZONECOUNT));
                addParameter("ecomp_generated_vm_assignments", extractBooleanValue(group, SdcPropertyNames.PROPERTY_NAME_ECOMPGENERATEDVMASSIGNMENTS));
        }