diff options
author | Sandeep Shah <sandeeplinux1068@gmail.com> | 2019-07-26 08:29:49 -0500 |
---|---|---|
committer | Sandeep Shah <sandeeplinux1068@gmail.com> | 2019-07-26 08:29:49 -0500 |
commit | f83b65de23e6caab3f6d8eb6c16541236d5afb6e (patch) | |
tree | 35e5bd98e1877e75821a04cb9e6b83eeb9fda00e | |
parent | 8433d52d646822fd9d9a3a1efc10ba07bfdcd82d (diff) |
Configuration changes to DG/templates SDNR POC
Configuration changes to DG and templates to support OOCPCIPOC
demo
Issue-ID: CCSDK-1544
Signed-off-by: SandeepLinux <Sandeep.Shah@ibm.com>
Change-Id: I1fa680c40c969d19691bbb445ec863c0344a0ea7
6 files changed, 7 insertions, 15 deletions
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 cb46379f..547dddd9 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 @@ -25,7 +25,7 @@ </record> </for> <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' > - <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' /> + <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' /> <parameter name='contextPrefix' value='prop' /> </execute> <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> diff --git a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml index d4bd6cec..7aedb6a7 100644 --- a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml +++ b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml @@ -16,7 +16,7 @@ </record> </for> <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' > - <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' /> + <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' /> <parameter name='contextPrefix' value='prop' /> </execute> <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> @@ -309,4 +309,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 c1b57c8e..59962f3e 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 @@ -23,7 +23,7 @@ </record> </for> <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' > - <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' /> + <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' /> <parameter name='contextPrefix' value='prop' /> </execute> <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> 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 ddd6f0f2..0c8f50b9 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 @@ -23,7 +23,7 @@ </record> </for> <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' > - <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' /> + <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' /> <parameter name='contextPrefix' value='prop' /> </execute> <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> diff --git a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_handle-nbrlist-change-notif.xml b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_handle-nbrlist-change-notif.xml index dca5ce47..b1c0e799 100644 --- a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_handle-nbrlist-change-notif.xml +++ b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_handle-nbrlist-change-notif.xml @@ -39,7 +39,7 @@ <parameter name="field2" value="`$handle-nbrlist-change-notif-input.fap-service-number-of-entries-changed`"/> </record> <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' > - <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' /> + <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' /> <parameter name='contextPrefix' value='prop' /> </execute> <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> @@ -158,4 +158,4 @@ </return> </block> </method> -</service-logic>
\ No newline at end of file +</service-logic> diff --git a/platform-logic/restapi-templates/src/main/json/oofpcipoc-generic-neighbor-patch.json b/platform-logic/restapi-templates/src/main/json/oofpcipoc-generic-neighbor-patch.json index b3b4643b..6362d641 100644 --- a/platform-logic/restapi-templates/src/main/json/oofpcipoc-generic-neighbor-patch.json +++ b/platform-logic/restapi-templates/src/main/json/oofpcipoc-generic-neighbor-patch.json @@ -10,14 +10,6 @@ "value": { "blacklisted": ${tmp.blacklisted} } - }, - { - "edit-id": "patch phy-cell-id", - "operation": "merge", - "target": "/oofpcipoc:phy-cell-id", - "value": { - "phy-cell-id": ${tmp.phy-cell-id} - } } ] } |