Fix the oof-osdf to configdb interface bugs1.3.1

Change-Id: I41ce7210f108195a83a35db46094e27a88f239fb
Signed-off-by: vrvarma <vv8305@att.com>
Issue-ID: OPTFRA-508

8 files changed, 105 insertions, 68 deletions

diff --git a/test/functest/simulators/configdb/response-payloads/getNbrList-cell0.json b/test/functest/simulators/configdb/response-payloads/getNbrList-cell0.json
index e0986d8..ff291fb 100644
--- a/test/functest/simulators/configdb/response-payloads/getNbrList-cell0.json
+++ b/test/functest/simulators/configdb/response-payloads/getNbrList-cell0.json
@@ -1,10 +1,15 @@
-[
-  {
-    "cellId": "cell1",
-    "pciValue": 1
-  },
-  {
-    "cellId": "cell2",
-    "pciValue": 2
-  }
-]
\ No newline at end of file
+{
+  "cellId": "cell0",
+  "nbrList": [
+    {
+      "targetCellId": "cell1",
+      "pciValue": 1,
+      "ho": true
+    },
+    {
+      "targetCellId": "cell2",
+      "pciValue": 2,
+      "ho": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/functest/simulators/configdb/response-payloads/getNbrList-cell1.json b/test/functest/simulators/configdb/response-payloads/getNbrList-cell1.json
index d6ed353..3c487e8 100644
--- a/test/functest/simulators/configdb/response-payloads/getNbrList-cell1.json
+++ b/test/functest/simulators/configdb/response-payloads/getNbrList-cell1.json
@@ -1,10 +1,15 @@
-[
-  {
-    "cellId": "cell0",
-    "pciValue": 0
-  },
-  {
-    "cellId": "cell2",
-    "pciValue": 2
-  }
-]
\ No newline at end of file
+{
+  "cellId": "cell1",
+  "nbrList": [
+    {
+      "targetCellId": "cell0",
+      "pciValue": 0,
+      "ho": true
+    },
+    {
+      "targetCellId": "cell2",
+      "pciValue": 2,
+      "ho": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/functest/simulators/configdb/response-payloads/getNbrList-cell2.json b/test/functest/simulators/configdb/response-payloads/getNbrList-cell2.json
index 1ea80be..20a8c98 100644
--- a/test/functest/simulators/configdb/response-payloads/getNbrList-cell2.json
+++ b/test/functest/simulators/configdb/response-payloads/getNbrList-cell2.json
@@ -1,10 +1,15 @@
-[
-  {
-    "cellId": "cell0",
-    "pciValue": 0
-  },
-  {
-    "cellId": "cell1",
-    "pciValue": 1
-  }
-]
\ No newline at end of file
+{
+  "cellId": "cell2",
+  "nbrList": [
+    {
+      "targetCellId": "cell0",
+      "pciValue": 0,
+      "ho": true
+    },
+    {
+      "targetCellId": "cell1",
+      "pciValue": 1,
+      "ho": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/functest/simulators/configdb/response-payloads/getNbrList-cell20.json b/test/functest/simulators/configdb/response-payloads/getNbrList-cell20.json
index 86c7d2c..d4e754f 100644
--- a/test/functest/simulators/configdb/response-payloads/getNbrList-cell20.json
+++ b/test/functest/simulators/configdb/response-payloads/getNbrList-cell20.json
@@ -1,14 +1,20 @@
-[
-  {
-    "cellId": "cell21",
-    "pciValue": 0
-  },
-  {
-    "cellId": "cell22",
-    "pciValue": 1
-  },
-  {
-    "cellId": "cell23",
-    "pciValue": 2
-  }
-]
\ No newline at end of file
+{
+  "cellId": "cell20",
+  "nbrList": [
+    {
+      "targetCellId": "cell21",
+      "pciValue": 0,
+      "ho": true
+    },
+    {
+      "targetCellId": "cell22",
+      "pciValue": 1,
+      "ho": true
+    },
+    {
+      "targetCellId": "cell23",
+      "pciValue": 2,
+      "ho": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/functest/simulators/configdb/response-payloads/getNbrList-cell21.json b/test/functest/simulators/configdb/response-payloads/getNbrList-cell21.json
index 490c15f..a1d6f55 100644
--- a/test/functest/simulators/configdb/response-payloads/getNbrList-cell21.json
+++ b/test/functest/simulators/configdb/response-payloads/getNbrList-cell21.json
@@ -1,6 +1,10 @@
-[
-  {
-    "cellId": "cell20",
-    "pciValue":0
-  }
-]
\ No newline at end of file
+{
+  "cellId": "cell21",
+  "nbrList": [
+    {
+      "targetCellId": "cell20",
+      "pciValue": 0,
+      "ho": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/functest/simulators/configdb/response-payloads/getNbrList-cell22.json b/test/functest/simulators/configdb/response-payloads/getNbrList-cell22.json
index 426e13b..9c16aec 100644
--- a/test/functest/simulators/configdb/response-payloads/getNbrList-cell22.json
+++ b/test/functest/simulators/configdb/response-payloads/getNbrList-cell22.json
@@ -1,6 +1,10 @@
-[
-  {
-    "cellId": "cell20",
-    "pciValue": 0
-  }
-]
\ No newline at end of file
+{
+  "cellId": "cell22",
+  "nbrList": [
+    {
+      "targetCellId": "cell20",
+      "pciValue": 0,
+      "ho": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/functest/simulators/configdb/response-payloads/getNbrList-cell23.json b/test/functest/simulators/configdb/response-payloads/getNbrList-cell23.json
index de582eb..ac3bf6f 100644
--- a/test/functest/simulators/configdb/response-payloads/getNbrList-cell23.json
+++ b/test/functest/simulators/configdb/response-payloads/getNbrList-cell23.json
@@ -1,6 +1,10 @@
-[
-  {
-    "cellId": "cell24",
-    "pciValue": 0
-  }
-]
\ No newline at end of file
+{
+  "cellId": "cell23",
+  "nbrList": [
+    {
+      "targetCellId": "cell24",
+      "pciValue": 0,
+      "ho": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/functest/simulators/configdb/response-payloads/getNbrList-cell24.json b/test/functest/simulators/configdb/response-payloads/getNbrList-cell24.json
index 8d8d3fb..f34128e 100644
--- a/test/functest/simulators/configdb/response-payloads/getNbrList-cell24.json
+++ b/test/functest/simulators/configdb/response-payloads/getNbrList-cell24.json
@@ -1,6 +1,10 @@
-[
-  {
-    "cellId": "cell23",
-    "pciValue": 2
-  }
-]
\ No newline at end of file
+{
+  "cellId": "cell24",
+  "nbrList": [
+    {
+      "targetCellId": "cell23",
+      "pciValue": 2,
+      "ho": true
+    }
+  ]
+}
\ No newline at end of file