From d082f249f543b5643245213ce6c1b7c7ebd464c3 Mon Sep 17 00:00:00 2001
From: Sandeep Shah <sandeeplinux1068@gmail.com>
Date: Mon, 21 Oct 2019 13:15:48 -0500
Subject: Bug fixes to OOFPCIPOC templates, DG's, properties

Bug fixes to OOFPCIPOC ConfigDB and DMAAP template files, SDNR
property file, and corresponding DG's

Issue-ID: CCSDK-1840
Signed-off-by: SandeepLinux <Sandeep.Shah@ibm.com>
Change-Id: I23ebfdc819213ed5e070887bdf7cc14ba0121ec8
---
 ...poc-dmaap-publish-config-response-template.json | 42 +++++++++++-----------
 .../json/oofpcipoc-patch-configdb-ho-for-nbr.json  |  2 +-
 .../oofpcipoc-patch-configdb-pci-for-cell.json     |  2 +-
 3 files changed, 22 insertions(+), 24 deletions(-)

(limited to 'platform-logic/restapi-templates')

diff --git a/platform-logic/restapi-templates/src/main/json/oofpcipoc-dmaap-publish-config-response-template.json b/platform-logic/restapi-templates/src/main/json/oofpcipoc-dmaap-publish-config-response-template.json
index 655afed5..b6fa4716 100644
--- a/platform-logic/restapi-templates/src/main/json/oofpcipoc-dmaap-publish-config-response-template.json
+++ b/platform-logic/restapi-templates/src/main/json/oofpcipoc-dmaap-publish-config-response-template.json
@@ -1,23 +1,21 @@
-{
-  "body": {
-    "output": {
-      "CommonHeader": {
-        "TimeStamp": ${prop.oofpcipoc-dmaap-config-resp.timestamp},
-        "APIver": ${prop.oofpcipoc-dmaap-config-resp.apiver},
-        "RequestID": ${prop.oofpcipoc-dmaap-config-resp.requestID},
-        "SubRequestID": ${prop.oofpcipoc-dmaap-config-resp.subrequestID},
-        "RequestTrack": ${prop.oofpcipoc-dmaap-config-resp.requesttrack},
-        "Flags": ${prop.oofpcipoc-dmaap-config-resp.flags}
-      },
-      "Status": {
-        "Code": ${prop.oofpcipoc-dmaap-config-resp.status-code},
-        "Value": ${prop.oofpcipoc-dmaap-config-resp.status-value}
-      },
-      "Payload": ${tmp.oofpcipoc-dmaap-config-resp.payload}
-    }
-  },
-  "version": ${prop.oofpcipoc-dmaap-config-resp.version},
-  "rpc-name": ${tmp.oofpcipoc-dmaap-config-resp.rpc-name},
-  "correlation-id": ${prop.oofpcipoc-dmaap-config-resp.correlationID},
-  "type": ${prop.oofpcipoc-dmaap-config-resp.response}
+{ "body" : {
+"output" : {
+"CommonHeader" : {
+"TimeStamp" : ${prop.oofpcipoc-dmaap-config-resp.timestamp},
+"APIver" : ${prop.oofpcipoc-dmaap-config-resp.apiver},
+"RequestID" : ${prop.oofpcipoc-dmaap-config-resp.requestID},
+"SubRequestID" : ${prop.oofpcipoc-dmaap-config-resp.subrequestID},
+"RequestTrack" : ${prop.oofpcipoc-dmaap-config-resp.requesttrack},
+"Flags" : ${prop.oofpcipoc-dmaap-config-resp.flags}
+},
+"Status" : {
+"Code" : ${prop.oofpcipoc-dmaap-config-resp.status-code},
+"Value" : ${prop.oofpcipoc-dmaap-config-resp.status-value}
+},
+"Payload" : ${tmp.oofpcipoc-dmaap-config-resp.payload} }
+},
+"version" : ${prop.oofpcipoc-dmaap-config-resp.version},
+"rpc-name" : ${tmp.oofpcipoc-dmaap-config-resp.rpc-name},
+"correlation-id" : ${prop.oofpcipoc-dmaap-config-resp.correlationID},
+"type" : ${prop.oofpcipoc-dmaap-config-resp.type}
 }
diff --git a/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-ho-for-nbr.json b/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-ho-for-nbr.json
index 5cd8a6ef..f379f704 100644
--- a/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-ho-for-nbr.json
+++ b/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-ho-for-nbr.json
@@ -1,5 +1,5 @@
 {
 
-"ho": ${tmp.blacklisted}
+"ho": ${"tmp.blacklisted}
 
 }
diff --git a/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-pci-for-cell.json b/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-pci-for-cell.json
index 51309bb0..29e3a1bd 100644
--- a/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-pci-for-cell.json
+++ b/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-pci-for-cell.json
@@ -1,5 +1,5 @@
 {
 
-"pci-value": ${tmp.phy-cell-id-in-use}
+"pci-value": ${"tmp.phy-cell-id-in-use}
 
 }
-- 
cgit 1.2.3-korg