summaryrefslogtreecommitdiffstats
path: root/ueb-listener
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2018-11-19 22:32:32 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-19 22:32:32 +0000
commit4718e5b212cbbed25cc9e9f3bb50c8ac6c8f1b33 (patch)
tree721d2f9d3cd7828c7248503d559600e416af8b1d /ueb-listener
parentd411beeeb5b407c170a98ad98c18ab85d5281833 (diff)
parentb62880bebaafab43294739bb2c867f271d760db1 (diff)
Merge "Replace logic for subinterface_indicator ingestion"
Diffstat (limited to 'ueb-listener')
-rw-r--r--ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java
index 5977e2888..db5004309 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java
@@ -24,6 +24,7 @@ package org.onap.ccsdk.sli.northbound.uebclient;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
@@ -113,9 +114,17 @@ public class SdncVFCModel extends SdncBaseModel {
SdncBaseModel.addParameter("network_role", networkRole, commonParams); // can not be null
SdncBaseModel.addParameter("network_role_tag", nullCheck(propsMap.get("network_role_tag")), commonParams);
SdncBaseModel.addParameter("extcp_subnetpool_id", nullCheck(propsMap.get("subnetpoolid")), commonParams);
- String subinterfaceIndicator = nullCheck(propsMap.get("subinterface_indicator"));
- if (!subinterfaceIndicator.isEmpty()) {
- SdncBaseModel.addParameter("subinterface_indicator", subinterfaceIndicator.contains("true") ? "Y" : "N", commonParams); // boolean Y|N
+
+ // Loop thru all CPs using getNodeTemplateChildren and match the network_role on the CP with network_role from
+ // getCpPropertiesFromVfcAsObject output, then get subinterface_indicator for this CP
+ List<NodeTemplate> cpNodesList = sdcCsarHelper.getNodeTemplateChildren(vfcNode);
+ for (NodeTemplate cpNode : cpNodesList){
+ String cpNetworkRole = extractValue(cpNode, "network_role");
+
+ if (cpNetworkRole == networkRole) {
+ String subinterfaceIndicator = extractBooleanValue (cpNode, "subinterface_indicator");
+ addParameter("subinterface_indicator", subinterfaceIndicator, commonParams);
+ }
}
// Extract IP Version specific parameters