From 85f914068748d4446b64893b06f7a3abe6cddd6d Mon Sep 17 00:00:00 2001
From: Sandeep Shah <sandeeplinux1068@gmail.com>
Date: Sun, 23 Jun 2019 14:41:12 -0500
Subject: [PATCH] Bugs associated with SDNR OOFPCIPOC DG's

Consistent versioning across DG's and graph.versions file, update to
graph.versions file with correct RPC names, change the location of
SDNR DG properties file to /opt/onap/ccsdk/data/properties in DG's

Issue-ID: CCSDK-1430
Signed-off-by: SandeepLinux <sandeeplinux1068@gmail.com>
Change-Id: I9b6b61473baa2855e9140c37a52204c1bac7b028
---
 .../src/main/json/oofpcipoc-api_add-neighbor.json            |  8 ++++----
 .../main/json/oofpcipoc-api_configuration-phy-cell-id.json   |  4 ++--
 .../src/main/json/oofpcipoc-api_delete-neighbor.json         |  8 ++++----
 .../json/oofpcipoc-api_generic-neighbor-configuration.json   |  8 ++++----
 .../oofpcipoc-api/src/main/json/oofpcipoc-api_greeting.json  |  4 ++--
 .../main/json/oofpcipoc-api_handle-nbrlist-change-notif.json |  4 ++--
 .../oofpcipoc-api/src/main/resources/graph.versions          | 12 ++++++------
 .../src/main/xml/oofpcipoc-api_add-neighbor.xml              |  4 ++--
 .../src/main/xml/oofpcipoc-api_delete-neighbor.xml           |  4 ++--
 .../xml/oofpcipoc-api_generic-neighbor-configuration.xml     |  4 ++--
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_add-neighbor.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_add-neighbor.json
index 459daf4a..f79204e6 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_add-neighbor.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_add-neighbor.json
@@ -32,11 +32,11 @@
     {
         "id": "9a9306f0.db8218",
         "type": "service-logic",
-        "name": "oofpcipoc-api 0.4.2-SNAPSHOT",
+        "name": "oofpcipoc-api ${project.version}",
         "module": "oofpcipoc-api",
         "version": "${project.version}",
         "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='${project.version}'>",
         "outputs": 1,
         "x": 161.99999237060547,
         "y": 115.98968505859375,
@@ -371,7 +371,7 @@
         "id": "1110ac05.6f6994",
         "type": "execute",
         "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
         "x": 453.000244140625,
@@ -927,4 +927,4 @@
             []
         ]
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json
index 901f1c3c..589c1ebd 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json
@@ -457,7 +457,7 @@
         "id": "9fe3285b.bcd158",
         "type": "execute",
         "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
         "x": 482.00018310546875,
@@ -1050,4 +1050,4 @@
             []
         ]
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_delete-neighbor.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_delete-neighbor.json
index 54da3068..c6820b9b 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_delete-neighbor.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_delete-neighbor.json
@@ -32,11 +32,11 @@
     {
         "id": "aa08a843.d3fdc8",
         "type": "service-logic",
-        "name": "oofpcipoc-api 0.4.2-SNAPSHOT",
+        "name": "oofpcipoc-api ${project.version}",
         "module": "oofpcipoc-api",
         "version": "${project.version}",
         "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='${project.version}'>",
         "outputs": 1,
         "x": 160.99999237060547,
         "y": 89.98968505859375,
@@ -296,7 +296,7 @@
         "id": "db5b7b51.736548",
         "type": "execute",
         "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
         "x": 410.000244140625,
@@ -743,4 +743,4 @@
             []
         ]
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json
index fab2d021..082ca554 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json
@@ -160,7 +160,7 @@
         "id": "dc78859c.2a1938",
         "type": "execute",
         "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
         "x": 420.00018310546875,
@@ -187,11 +187,11 @@
     {
         "id": "2071d805.4be628",
         "type": "service-logic",
-        "name": "oofpcipoc-api 0.4.2-SNAPSHOT",
+        "name": "oofpcipoc-api ${project.version}",
         "module": "oofpcipoc-api",
         "version": "${project.version}",
         "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='${project.version}'>",
         "outputs": 1,
         "x": 160.99998474121094,
         "y": 91.98968505859375,
@@ -1081,4 +1081,4 @@
             []
         ]
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_greeting.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_greeting.json
index f8347b75..e395c317 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_greeting.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_greeting.json
@@ -32,11 +32,11 @@
     {
         "id": "72aee190.08cf4",
         "type": "service-logic",
-        "name": "oofpcipoc-api 0.4.2-SNAPSHOT",
+        "name": "oofpcipoc-api ${project.version}",
         "module": "oofpcipoc-api",
         "version": "${project.version}",
         "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='${project.version}'>",
         "outputs": 1,
         "x": 199.01040649414062,
         "y": 175,
diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_handle-nbrlist-change-notif.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_handle-nbrlist-change-notif.json
index 64a92f01..25d6ad70 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_handle-nbrlist-change-notif.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_handle-nbrlist-change-notif.json
@@ -151,7 +151,7 @@
         "id": "523cdfb2.ababa",
         "type": "execute",
         "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
         "x": 473.00018310546875,
@@ -577,4 +577,4 @@
             []
         ]
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/oofpcipoc-api/src/main/resources/graph.versions b/platform-logic/oofpcipoc-api/src/main/resources/graph.versions
index 6f81edb2..b456cf93 100644
--- a/platform-logic/oofpcipoc-api/src/main/resources/graph.versions
+++ b/platform-logic/oofpcipoc-api/src/main/resources/graph.versions
@@ -1,6 +1,6 @@
-oofpcipoc-api oofpcipoc-api_greeting ${project.version} sync
-oofpcipoc-api oofpcipoc-api_configuration-phy-cell-id ${project.version} sync
-oofpcipoc-api oofpcipoc-api_generic-neighbor-configuration ${project.version} sync
-oofpcipoc-api oofpcipoc-api_add-neighbor ${project.version} sync
-oofpcipoc-api oofpcipoc-delete-neighbor ${project.version} sync
-oofpcipoc-api oofpcipoc-api_handle-nbrlist-change-notif ${project.version} sync
+oofpcipoc-api greeting ${project.version} sync
+oofpcipoc-api configuration-phy-cell-id ${project.version} sync
+oofpcipoc-api generic-neighbor-configuration ${project.version} sync
+oofpcipoc-api add-neighbor ${project.version} sync
+oofpcipoc-api delete-neighbor ${project.version} sync
+oofpcipoc-api handle-nbrlist-change-notif ${project.version} sync
diff --git a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_add-neighbor.xml b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_add-neighbor.xml
index fef46865..cb46379f 100644
--- a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_add-neighbor.xml
+++ b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_add-neighbor.xml
@@ -1,6 +1,6 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='${project.version}'>
     <method rpc='add-neighbor' mode='sync'>
         <block atomic='true'>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -303,4 +303,4 @@
             </return>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
diff --git a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_delete-neighbor.xml b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_delete-neighbor.xml
index 93eeeb9a..c1b57c8e 100644
--- a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_delete-neighbor.xml
+++ b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_delete-neighbor.xml
@@ -1,6 +1,6 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='${project.version}'>
     <method rpc='delete-neighbor' mode='sync'>
         <block atomic='true'>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -228,4 +228,4 @@
             </return>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
diff --git a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_generic-neighbor-configuration.xml b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_generic-neighbor-configuration.xml
index f4c1250e..ddd6f0f2 100644
--- a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_generic-neighbor-configuration.xml
+++ b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_generic-neighbor-configuration.xml
@@ -1,6 +1,6 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='${project.version}'>
     <method rpc='generic-neighbor-configuration' mode='sync'>
         <block atomic='true'>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -338,4 +338,4 @@
             </return>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
-- 
2.16.6