diff options
| author |   Sandeep Shah <sandeeplinux1068@gmail.com> | 2019-10-21 13:15:48 -0500 |
|---|---|---|
| committer | Sandeep Shah <sandeeplinux1068@gmail.com> | 2019-10-21 13:15:48 -0500 |
| commit | d082f249f543b5643245213ce6c1b7c7ebd464c3 (patch) | |
| tree | e1a877502ad8262a0e55894d770fa75b95b52ad6 /platform-logic/oofpcipoc-api/src/main/xml | |
| parent | a8495be56eb3915eb1db89f72a81386b458fdae8 (diff) | |
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
Diffstat (limited to 'platform-logic/oofpcipoc-api/src/main/xml')
2 files changed, 10 insertions, 50 deletions
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 ef4737ed..bf5c4710 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 @@ -472,35 +472,19 @@ </block> </outcome> </execute> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='escapeJsonString' > - <parameter name="source" value='`$tmp.oofpcipoc-dmaap-config-resp.payload`'/> - <parameter name="target" value='tmp.oofpcipoc-dmaap-config-resp.payload'/> - <outcome value='success'> - <block atomic='true'> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" /> - <parameter name="level" value="info" /> - <parameter name="field1" value="__TIMESTAMP__"/> - <parameter name="field2" value="Redndred template as an Escaped string"/> - <parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' /> - </record> - </block> - </outcome> - <outcome value='failure'> - <block> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error inserting escape chars in SDNR response payload string. Aborting PCI configuration" /> - </return> - </block> - </outcome> - </execute> </block> <block atomic='true'> <set> <parameter name='tmp.oofpcipoc-dmaap-config-resp.rpc-name' value='`$prop.oofpcipoc-dmaap-config-resp.rpc-name.modifyconfig`'/> </set> + <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> + <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" /> + <parameter name="level" value="info" /> + <parameter name="field1" value="__TIMESTAMP__"/> + <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/> + <parameter name='field3' value="`$prop.restapi.templateDir + '/' + $prop.restapi.dmaap-publish-config-response.template`" /> + <parameter name='field4' value="`$prop.dmaap-message-router.url + '/' + $prop.oofpcipoc-dmaap-configuration-response.topic`" /> + </record> <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.dmaap-publish-config-response.template`" /> <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + '/' + $prop.oofpcipoc-dmaap-configuration-response.topic`" /> @@ -535,4 +519,4 @@ </return> </block> </method> -</service-logic> +</service-logic>
\ No newline at end of file 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 6e386b9e..305b97ae 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 @@ -529,30 +529,6 @@ </block> </outcome> </execute> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='escapeJsonString' > - <parameter name="source" value='`$tmp.oofpcipoc-dmaap-config-resp.payload`'/> - <parameter name="target" value='tmp.oofpcipoc-dmaap-config-resp.payload'/> - <outcome value='success'> - <block atomic='true'> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" /> - <parameter name="level" value="info" /> - <parameter name="field1" value="__TIMESTAMP__"/> - <parameter name="field2" value="Redndred template as an Escaped string"/> - <parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' /> - </record> - </block> - </outcome> - <outcome value='failure'> - <block> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error inserting escape chars in SDNR response payload string. Aborting PCI configuration" /> - </return> - </block> - </outcome> - </execute> </block> <block atomic='true'> <set> @@ -592,4 +568,4 @@ </return> </block> </method> -</service-logic> +</service-logic>
\ No newline at end of file |