summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlalena.aria <lalena.aria@att.com>2019-08-14 19:41:59 +0000
committerDan Timoney <dtimoney@att.com>2019-08-15 21:24:27 +0000
commit944a56af64c77e67a2a11a3d963efb18f0c26ab8 (patch)
treeec95f4d092c32a35f28209b631216941e36a9b2b
parent5e2c493f9856c2d8cc966ca9a89506f57f00930f (diff)
ASDC lib version updates and 2 bug fixes
Changes made: Added remove dots to normalized VF name in SdncVFModel.insertVFModuleData. Fixed path to use_ipv4 and use_ipv6 in SdncNodeModel. Issue-ID: CCSDK-1424 Change-Id: Ib60fb652ee695025a6b505b750667c9c8ff1ab2d Signed-off-by: lalena.aria <lalena.aria@att.com>
-rw-r--r--ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java4
-rw-r--r--ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModel.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java
index cf81b3ca..65b20e61 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java
@@ -65,7 +65,7 @@ public class SdncNodeModel extends SdncBaseModel {
addParameter("trunk_network_indicator", trunkNetworkIndicator);
// extract properties - network_assignments - ipv4_subnet_default_assignment
- String useIpv4 = extractBooleanValue(nodeEntity, "network_assignments", "use_ipv4");
+ String useIpv4 = extractBooleanValue(nodeEntity, "network_assignments", "ipv4_subnet_default_assignment", "use_ipv4");
addParameter("use_ipv4", useIpv4);
addParameter("ipv4_dhcp_enabled", extractBooleanValue(nodeEntity, "network_assignments", "ipv4_subnet_default_assignment", "dhcp_enabled"));
addParameter("ipv4_ip_version", extractValue(nodeEntity, "network_assignments", "ipv4_subnet_default_assignment", "ip_version"));
@@ -73,7 +73,7 @@ public class SdncNodeModel extends SdncBaseModel {
addParameter("eipam_v4_address_plan", extractValue(nodeEntity, "network_assignments", "ipv4_subnet_default_assignment", "ip_network_address_plan"));
// extract properties - network_assignments - ipv6_subnet_default_assignment
- String useIpv6 = extractBooleanValue(nodeEntity, "network_assignments", "use_ipv6");
+ String useIpv6 = extractBooleanValue(nodeEntity, "network_assignments", "ipv6_subnet_default_assignment", "use_ipv6");
addParameter("use_ipv6", useIpv6);
addParameter("ipv6_dhcp_enabled", extractBooleanValue(nodeEntity, "network_assignments", "ipv6_subnet_default_assignment", "dhcp_enabled"));
addParameter("ipv6_ip_version", extractValue(nodeEntity, "network_assignments", "ipv6_subnet_default_assignment", "ip_version"));
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 dd93f45d..76e20863 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
@@ -155,7 +155,7 @@ public class SdncVFModel extends SdncBaseModel {
for (IEntityDetails vfModule : vfModules){
// If this vfModule name is prefixed with the VF name of the VF being processed, insert this VF Module in VF_MODULE_MODEL
- String normailizedVfName = nodeTemplate.getName().toLowerCase().replace(" ", "").replace("-", ""); // need full set of normalization rules from ASDC
+ String normailizedVfName = nodeTemplate.getName().toLowerCase().replace(" ", "").replace("-", "").replace(".", ""); // need full set of normalization rules from ASDC
if (!vfModule.getName().startsWith(normailizedVfName)) {
continue;
}