summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-06-18 14:57:11 +0000
committerGerrit Code Review <gerrit@onap.org>2019-06-18 14:57:11 +0000
commitffc1ff47613eefa2bc6dc5a30957ce6c8e7b789f (patch)
tree964b94afa175f6bf50fa4003b3427ba81efc04be
parente8fcf7c536a77381542dabc239a3e127c319e4a8 (diff)
parent9b5c8a76bf6a75d5d82df56a1db0a09651596f82 (diff)
Merge "Bug fixes/mods to dmaap-listener for SDNR OOF PCI"
-rw-r--r--dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/OofPciPocDmaapConsumers.java21
-rw-r--r--dmaap-listener/src/main/resources/anr-changes-from-policy-to-sdnr.map4
-rw-r--r--dmaap-listener/src/main/resources/pci-changes-from-policy-to-sdnr.map4
3 files changed, 16 insertions, 13 deletions
diff --git a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/OofPciPocDmaapConsumers.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/OofPciPocDmaapConsumers.java
index 2e6ae742b..7037d8848 100644
--- a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/OofPciPocDmaapConsumers.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/OofPciPocDmaapConsumers.java
@@ -65,6 +65,9 @@ public class OofPciPocDmaapConsumers extends SdncDmaapConsumerImpl {
private static final String BODY = "body";
private static final String INPUT = "input";
+ private static final String EMPTY = "";
+ private static final String ESCAPE_SEQUENCE_QUOTES = "\"";
+
private static final String GENERIC_NEIGHBOR_CONFIGURATION_INPUT = "generic-neighbor-configuration-input.";
private static final String GENERIC_NEIGHBOR_CONFIGURATION_INPUT_NEIGHBOR_LIST_IN_USE = GENERIC_NEIGHBOR_CONFIGURATION_INPUT.concat("neighbor-list-in-use");
private static final String MODIFY_CONFIG_ANR = "ModifyConfigANR";
@@ -162,15 +165,15 @@ public class OofPciPocDmaapConsumers extends SdncDmaapConsumerImpl {
if(nbrListInUse.isArray()) {
for(JsonNode lteCell:nbrListInUse) {
sliParametersArray.put(new JSONObject().put(PARAMETER_NAME, GENERIC_NEIGHBOR_CONFIGURATION_INPUT_NEIGHBOR_LIST_IN_USE+"["+entryCount+"]."+"plmnid")
- .put(STRING_VALUE, lteCell.get("PLMNID")));
+ .put(STRING_VALUE, lteCell.get("PLMNID").toString().replace(ESCAPE_SEQUENCE_QUOTES, EMPTY)));
sliParametersArray.put(new JSONObject().put(PARAMETER_NAME, GENERIC_NEIGHBOR_CONFIGURATION_INPUT_NEIGHBOR_LIST_IN_USE+"["+entryCount+"]."+"cid")
- .put(STRING_VALUE, lteCell.get("CID")));
+ .put(STRING_VALUE, lteCell.get("CID").toString().replace(ESCAPE_SEQUENCE_QUOTES, EMPTY)));
sliParametersArray.put(new JSONObject().put(PARAMETER_NAME, GENERIC_NEIGHBOR_CONFIGURATION_INPUT_NEIGHBOR_LIST_IN_USE+"["+entryCount+"]."+"phy-cell-id")
- .put(STRING_VALUE, lteCell.get("PhyCellID")));
+ .put(STRING_VALUE, lteCell.get("PhyCellID").toString().replace(ESCAPE_SEQUENCE_QUOTES, EMPTY)));
sliParametersArray.put(new JSONObject().put(PARAMETER_NAME, GENERIC_NEIGHBOR_CONFIGURATION_INPUT_NEIGHBOR_LIST_IN_USE+"["+entryCount+"]."+"pnf-name")
- .put(STRING_VALUE, lteCell.get("PNFName")));
+ .put(STRING_VALUE, lteCell.get("PNFName").toString().replace(ESCAPE_SEQUENCE_QUOTES, EMPTY)));
sliParametersArray.put(new JSONObject().put(PARAMETER_NAME, GENERIC_NEIGHBOR_CONFIGURATION_INPUT_NEIGHBOR_LIST_IN_USE+"["+entryCount+"]."+"blacklisted")
- .put(STRING_VALUE, lteCell.get("Blacklisted")));
+ .put(STRING_VALUE, lteCell.get("Blacklisted").toString().replace(ESCAPE_SEQUENCE_QUOTES, EMPTY)));
entryCount++;
}
@@ -219,13 +222,13 @@ public class OofPciPocDmaapConsumers extends SdncDmaapConsumerImpl {
if(configurations.isArray()) {
for(JsonNode dataNode:configurations) {
sliParametersArray.put(new JSONObject().put(PARAMETER_NAME, PHYSICAL_CELL_ID_INPUT_FAP_SERVICE+"["+entryCount+"]."+ALIAS)
- .put(STRING_VALUE, dataNode.get(DATA).get(FAP_SERVICE).get(ALIAS)));
+ .put(STRING_VALUE, dataNode.get(DATA).get(FAP_SERVICE).get(ALIAS).toString().replace(ESCAPE_SEQUENCE_QUOTES, EMPTY)));
sliParametersArray.put(new JSONObject().put(PARAMETER_NAME, PHYSICAL_CELL_ID_INPUT_FAP_SERVICE+"["+entryCount+"]."+"cid")
- .put(STRING_VALUE, dataNode.get(DATA).get(FAP_SERVICE).get("CellConfig").get("LTE").get("RAN").get("Common").get("CellIdentity")));
+ .put(STRING_VALUE, dataNode.get(DATA).get(FAP_SERVICE).get("CellConfig").get("LTE").get("RAN").get("Common").get("CellIdentity").toString().replace(ESCAPE_SEQUENCE_QUOTES, EMPTY)));
sliParametersArray.put(new JSONObject().put(PARAMETER_NAME, PHYSICAL_CELL_ID_INPUT_FAP_SERVICE+"["+entryCount+"]."+"phy-cell-id-in-use")
- .put(STRING_VALUE, dataNode.get(DATA).get(FAP_SERVICE).get(X0005b9Lte).get("phyCellIdInUse")));
+ .put(STRING_VALUE, dataNode.get(DATA).get(FAP_SERVICE).get(X0005b9Lte).get("phyCellIdInUse").toString().replace(ESCAPE_SEQUENCE_QUOTES, EMPTY)));
sliParametersArray.put(new JSONObject().put(PARAMETER_NAME, PHYSICAL_CELL_ID_INPUT_FAP_SERVICE+"["+entryCount+"]."+"pnf-name")
- .put(STRING_VALUE, dataNode.get(DATA).get(FAP_SERVICE).get(X0005b9Lte).get("pnfName")));
+ .put(STRING_VALUE, dataNode.get(DATA).get(FAP_SERVICE).get(X0005b9Lte).get("pnfName").toString().replace(ESCAPE_SEQUENCE_QUOTES, EMPTY)));
entryCount++;
}
diff --git a/dmaap-listener/src/main/resources/anr-changes-from-policy-to-sdnr.map b/dmaap-listener/src/main/resources/anr-changes-from-policy-to-sdnr.map
index e7c45b253..5cd2b8371 100644
--- a/dmaap-listener/src/main/resources/anr-changes-from-policy-to-sdnr.map
+++ b/dmaap-listener/src/main/resources/anr-changes-from-policy-to-sdnr.map
@@ -1,5 +1,5 @@
# SDN-C URL
-SDNC.endpoint => oofpcipoc-api:generic-neighbour-configuration
+SDNC.endpoint => SLI-API:execute-graph
-# Field mapping
+# Field mapping
SDNC.template => anr-pci-changes-from-policy-to-sdnr.vt
diff --git a/dmaap-listener/src/main/resources/pci-changes-from-policy-to-sdnr.map b/dmaap-listener/src/main/resources/pci-changes-from-policy-to-sdnr.map
index 44c34a4d4..5cd2b8371 100644
--- a/dmaap-listener/src/main/resources/pci-changes-from-policy-to-sdnr.map
+++ b/dmaap-listener/src/main/resources/pci-changes-from-policy-to-sdnr.map
@@ -1,5 +1,5 @@
# SDN-C URL
-SDNC.endpoint => oofpcipoc-api:configuration-phy-cell-id
+SDNC.endpoint => SLI-API:execute-graph
-# Field mapping
+# Field mapping
SDNC.template => anr-pci-changes-from-policy-to-sdnr.vt