Update CCSDK northbound ueb-listener

Changes made:
Corrected extraction locations for role, type, ecomp_generated_naming and naming_policy in ALLOTTED_RESOURCE_MODEL.

Change-Id: I59d1625ee226e194ecba81c84ead964df6307676
Issue-ID: SDNC-194
Signed-off-by: lalena.aria <lalena.aria@att.com>

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 8d480a4..78225de 100644 (file)
--- 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
@@ -42,10 +42,10 @@ public class SdncARModel extends SdncBaseModel {
                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
-               addParameter("ecomp_generated_naming", extractBooleanValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VFCNAMING_ECOMPGENERATEDNAMING));
-               addParameter("naming_policy", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VFCNAMING_NAMINGPOLICY));
+               addParameter("role", extractValue (nodeTemplate, "nf_role"));
+               addParameter("type", extractValue (nodeTemplate, "nf_type"));
+               addParameter("ecomp_generated_naming", extractBooleanValue (nodeTemplate, "nf_naming#ecomp_generated_naming"));
+               addParameter("naming_policy", extractValue (nodeTemplate, "nf_naming#naming_policy"));
                //addParameter("depending_service", extractValue (sdcCsarHelper, nodeTemplate, SdcPropertyNames.PROPERTY_NAME_DEPENDINGSERVICE));
                //addParameter("service_dependency", extractValue (sdcCsarHelper, nodeTemplate, SdcPropertyNames.PROPERTY_NAME_SERVICEDEPENDENCY));
        }