diff options
| -rw-r--r-- | ansible-server/pom.xml | 2 | ||||
| -rwxr-xr-x | dependencies/pom.xml | 2 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 15 | ||||
| -rw-r--r-- | odlsli/src/main/properties/sdnr-CMNotify-api-dg.properties | 36 | ||||
| -rw-r--r-- | platform-logic/cMNotify-api/src/main/json/CM-NOTIFY-API_nbrlist-change-notification.json | 386 | ||||
| -rw-r--r-- | platform-logic/cMNotify-api/src/main/xml/CM-NOTIFY-API_nbrlist-change-notification.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 2 |
7 files changed, 241 insertions, 206 deletions
diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index ad92abb1..369ab5f4 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.5.2</version> + <version>1.5.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dependencies/pom.xml b/dependencies/pom.xml index b6ef35b6..3d700b0a 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.5.2</version> + <version>1.5.4</version> <relativePath/> </parent> diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index c65eafa1..18093119 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.5.2</version> + <version>1.5.4</version> <relativePath/> </parent> @@ -39,11 +38,11 @@ </ccsdk.odl.features> <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra> - <ccsdk.features.version>0.7.2</ccsdk.features.version> - <ccsdk.sli.core.version>0.7.1</ccsdk.sli.core.version> - <ccsdk.sli.adaptors.version>0.7.1</ccsdk.sli.adaptors.version> - <ccsdk.sli.northbound.version>0.7.1</ccsdk.sli.northbound.version> - <ccsdk.sli.plugins.version>0.7.1</ccsdk.sli.plugins.version> + <ccsdk.features.version>0.7.3</ccsdk.features.version> + <ccsdk.sli.core.version>0.7.2</ccsdk.sli.core.version> + <ccsdk.sli.adaptors.version>0.7.2</ccsdk.sli.adaptors.version> + <ccsdk.sli.northbound.version>0.7.2</ccsdk.sli.northbound.version> + <ccsdk.sli.plugins.version>0.7.2</ccsdk.sli.plugins.version> </properties> <dependencies> diff --git a/odlsli/src/main/properties/sdnr-CMNotify-api-dg.properties b/odlsli/src/main/properties/sdnr-CMNotify-api-dg.properties new file mode 100644 index 00000000..848bde96 --- /dev/null +++ b/odlsli/src/main/properties/sdnr-CMNotify-api-dg.properties @@ -0,0 +1,36 @@ +restapi.templateDir=/opt/onap/ccsdk/restapi/templates +controller.url=http://sdnc.onap:8282 +controller.user=admin +controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +ransim-mounted=false + +restapi.trustStoreFileName=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks +restapi.trustStorePassword=adminadmin +restapi.keyStoreFileName=/opt/onap/sdnc/data/stores/sdnc.p12 +restapi.keyStorePassword=adminadmin +restapi.connection-oof-url=http://oof.api.simpledemo.onap.org:8698/api/oof/v1/route +naming.gen-name.url=http://neng-serv:8080 +naming.gen-name.user=ccsdkapps +naming.gen-name.pwd=ccsdkapps + + +# Templates +restapi.pci-patch.templatefile=CMNotify-pci-patch.json +restapi.neighbor-add.templatefile=CMNotify-addNeighbor.json +restapi.neighbor-delete.templatefile=CMNotify-deleteNeighbor.json +restapi.generic-neighbor-patch.template=CMNotify-generic-neighbor-patch.json +restapi.add-nbr-to-configdb-per-notif.template=CMNotify-add-nbr-to-configdb-per-nbrlist-change-notif.json +restapi.dmaap-publish.template=CMNotify-dmaap-publish-template.json + +#URLs for ConfigDB +restapi.configdb.add-nbrlist-change-per-notif=/createNbr/{cellId} +configdb.url=http://10.12.5.120:8080/api/sdnc-config-db/v3 + +#DMAAP Publish +dmaap-message-router.url=message-router.onap:3904/events +CMNotify-dmaap.nbrlist-change.topic=/CM-NOTIFICATION-RSP + +CMNotify-dmaap.requestID=9d2d790e-a5f0-11e8-98d0-529269fb1459 +CMNotify-dmaap.aai= +CMNotify-dmaap.version=1.0.2 +CMNotify-dmaap.nbrlistchange.action=NeighborListModified diff --git a/platform-logic/cMNotify-api/src/main/json/CM-NOTIFY-API_nbrlist-change-notification.json b/platform-logic/cMNotify-api/src/main/json/CM-NOTIFY-API_nbrlist-change-notification.json index 1438b5d5..07a7754d 100644 --- a/platform-logic/cMNotify-api/src/main/json/CM-NOTIFY-API_nbrlist-change-notification.json +++ b/platform-logic/cMNotify-api/src/main/json/CM-NOTIFY-API_nbrlist-change-notification.json @@ -1,36 +1,36 @@ [ { - "id": "d7426cda.853c3", + "id": "9cdbf65d.61da08", "type": "method", "name": "method", "xml": "<method rpc='nbrlist-change-notification' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 139, - "y": 192.00000381469727, - "z": "e365f261.0028d", + "x": 116, + "y": 184.9895896911621, + "z": "1b416678.0cb38a", "wires": [ [ - "e01172f2.eb605" + "ccf09b18.22e968" ] ] }, { - "id": "384d1619.9cd7ea", + "id": "8ecc3c13.1f136", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 142, - "y": 42, - "z": "e365f261.0028d", + "x": 119, + "y": 34.989585876464844, + "z": "1b416678.0cb38a", "wires": [ [ - "a139909c.cc021" + "c9cb69b7.ef8a38" ] ] }, { - "id": "a139909c.cc021", + "id": "c9cb69b7.ef8a38", "type": "service-logic", "name": "CM-NOTIFY-API ${project.version}", "module": "CM-NOTIFY-API", @@ -38,553 +38,553 @@ "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='CM-NOTIFY-API' version='${project.version}'>", "outputs": 1, - "x": 199.99998474121094, - "y": 103.00009536743164, - "z": "e365f261.0028d", + "x": 176.99998474121094, + "y": 95.98968124389648, + "z": "1b416678.0cb38a", "wires": [ [ - "d7426cda.853c3" + "9cdbf65d.61da08" ] ] }, { - "id": "e01172f2.eb605", + "id": "ccf09b18.22e968", "type": "block", "name": "block : atomic", "xml": "<block atomic='true'>", "atomic": "true", "comments": "", "outputs": 1, - "x": 161.48959732055664, - "y": 361.0000343322754, - "z": "e365f261.0028d", + "x": 138.48959732055664, + "y": 353.98962020874023, + "z": "1b416678.0cb38a", "wires": [ [ - "ce9ff91f.9fd7b8", - "8f754eb6.4c563", - "12096927.430627", - "1c34cf50.e940a1", - "681abe9f.71ebb", - "cacad6a.74e6028" + "881ca71a.c69178", + "dbc67e0b.33a1", + "e0b8e1f2.2858a", + "4e19afc4.f040e", + "8d33c16a.487dd", + "f3cc9cf1.39cd5" ] ] }, { - "id": "ce9ff91f.9fd7b8", + "id": "881ca71a.c69178", "type": "returnSuccess", "name": "return success", "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"SUCCESSFUL Execution\" />\n", "comments": "", - "x": 258.0002670288086, - "y": 591.000186920166, - "z": "e365f261.0028d", + "x": 235.0002670288086, + "y": 583.9897727966309, + "z": "1b416678.0cb38a", "wires": [] }, { - "id": "46b206d1.328288", + "id": "274526c8.2b2c0a", "type": "record", "name": "record", "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/ves-nbrlist-change-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Input RPC Payload request. FAP #: \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].alias`\"/>\n<parameter name=\"field4\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].cid`\"/>\n<parameter name=\"field5\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].phy-cell-id-in-use`\"/>\n<parameter name=\"field6\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].pnf-name`\"/>\n<parameter name=\"field7\" value=\"Number of neigbors Changed/To Be Added #: \"/>\n<parameter name=\"field8\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-cell-number-of-entries`\"/>", "comments": "", "outputs": 1, - "x": 826.0005493164062, - "y": 58.00004959106445, - "z": "e365f261.0028d", + "x": 803.0005493164062, + "y": 50.9896354675293, + "z": "1b416678.0cb38a", "wires": [ [] ] }, { - "id": "c791a89f.b094f8", + "id": "3ef94324.02316c", "type": "comment", "name": "CMNotify VES: nbrlist-change-notification", "info": "", "comments": "", - "x": 424, - "y": 35.010414123535156, - "z": "e365f261.0028d", + "x": 401, + "y": 28, + "z": "1b416678.0cb38a", "wires": [] }, { - "id": "12096927.430627", + "id": "e0b8e1f2.2858a", "type": "for", "name": "for", "xml": "<for index='idx' start='0' end=\"`$nbrlist-change-notification-input.fap-service-number-of-entries-changed`\" >", "comments": "", "outputs": 1, - "x": 495.085693359375, - "y": 130.9635887145996, - "z": "e365f261.0028d", + "x": 472.085693359375, + "y": 123.95317459106445, + "z": "1b416678.0cb38a", "wires": [ [ - "c2a6556d.4d96f8" + "edc5445d.f0d138" ] ] }, { - "id": "8f754eb6.4c563", + "id": "dbc67e0b.33a1", "type": "record", "name": "record", "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/ves-nbrlist-change-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"RPC to handle VES event: nbrlist change notification invoked. Number of FAP services for which neighbors have changed: \"/>\n<parameter name=\"field2\" value=\"`$nbrlist-change-notification-input.fap-service-number-of-entries-changed`\"/>\n", "comments": "", "outputs": 1, - "x": 311.0002975463867, - "y": 170.02084732055664, - "z": "e365f261.0028d", + "x": 288.0002975463867, + "y": 163.01043319702148, + "z": "1b416678.0cb38a", "wires": [ [] ] }, { - "id": "3b43614d.42cd1e", + "id": "77c0aa9a.049124", "type": "set", "name": "set tmp variables for notif input parms", "xml": "<set>\n<parameter name=\"tmp.alias\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].alias`\"/>\n<parameter name=\"tmp.cid\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].cid`\"/>\n<parameter name=\"tmp.phy-cell-id-in-use\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].phy-cell-id-in-use`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].pnf-name`\"/>\n<parameter name=\"tmp.lte-cell-number-of-entries\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-cell-number-of-entries`\"/>", "comments": "", - "x": 781.0010986328125, - "y": 225.89947891235352, - "z": "e365f261.0028d", + "x": 758.0010986328125, + "y": 218.88906478881836, + "z": "1b416678.0cb38a", "wires": [] }, { - "id": "1c34cf50.e940a1", + "id": "4e19afc4.f040e", "type": "execute", "name": "execute Properties", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-CMNotify-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n", "comments": "", "outputs": 1, - "x": 506.00018310546875, - "y": 191.02083206176758, - "z": "e365f261.0028d", + "x": 483.00018310546875, + "y": 184.01041793823242, + "z": "1b416678.0cb38a", "wires": [ [] ] }, { - "id": "681abe9f.71ebb", + "id": "8d33c16a.487dd", "type": "record", "name": "record", "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/ves-nbrlist-change-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Properties read ..configDB URL\"/>\n<parameter name=\"field2\" value=\"`$prop.configdb.url`\"/>\n<parameter name=\"field3\" value=\"Properties read ..DMAAP Msg Router URL\"/>\n<parameter name=\"field4\" value=\"`$prop.configdb.url`\"/>\n<parameter name=\"field5\" value=\"`$prop.dmaap-message-router.url`\"/>\n<parameter name=\"field6\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"field7\" value=\"`$prop.controller.url`\"/>\n", "comments": "", "outputs": 1, - "x": 471.00030517578125, - "y": 245.0209083557129, - "z": "e365f261.0028d", + "x": 448.00030517578125, + "y": 238.01049423217773, + "z": "1b416678.0cb38a", "wires": [ [] ] }, { - "id": "c2a6556d.4d96f8", + "id": "edc5445d.f0d138", "type": "block", "name": "block : atomic", "xml": "<block atomic='true'>", "atomic": "true", "comments": "", "outputs": 1, - "x": 647, - "y": 93.00000381469727, - "z": "e365f261.0028d", + "x": 624, + "y": 85.98958969116211, + "z": "1b416678.0cb38a", "wires": [ [ - "46b206d1.328288", - "dd208eef.5b405" + "274526c8.2b2c0a", + "ddd3137a.6d79" ] ] }, { - "id": "dd208eef.5b405", + "id": "ddd3137a.6d79", "type": "for", "name": "for", "xml": "<for index='idy' start='0' end=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-cell-number-of-entries`\" >", "comments": "", "outputs": 1, - "x": 819, - "y": 123.00000381469727, - "z": "e365f261.0028d", + "x": 796, + "y": 115.98958969116211, + "z": "1b416678.0cb38a", "wires": [ [ - "654cb6f6.2f7848" + "568906cd.e80a98" ] ] }, { - "id": "654cb6f6.2f7848", + "id": "568906cd.e80a98", "type": "record", "name": "record", "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/ves-nbrlist-change-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Neighbor #: \"/>\n<parameter name=\"field2\" value=\"`$idy`\"/>\n<parameter name=\"field3\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-ran-neighbor-list-in-use-lte-cell-changed[$idy].plmnid`\"/>\n<parameter name=\"field4\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-ran-neighbor-list-in-use-lte-cell-changed[$idy].cid`\"/>\n<parameter name=\"field5\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-ran-neighbor-list-in-use-lte-cell-changed[$idy].phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-ran-neighbor-list-in-use-lte-cell-changed[$idy].pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-ran-neighbor-list-in-use-lte-cell-changed[$idy].blacklisted`\"/>", "comments": "", "outputs": 1, - "x": 970, - "y": 117.00000381469727, - "z": "e365f261.0028d", + "x": 947, + "y": 109.98958969116211, + "z": "1b416678.0cb38a", "wires": [ [] ] }, { - "id": "cacad6a.74e6028", + "id": "f3cc9cf1.39cd5", "type": "for", "name": "for", "xml": "<for index='idx' start='0' end=\"`$nbrlist-change-notification-input.fap-service-number-of-entries-changed`\" >", "comments": "", "outputs": 1, - "x": 346, - "y": 371, - "z": "e365f261.0028d", + "x": 323, + "y": 363.98958587646484, + "z": "1b416678.0cb38a", "wires": [ [ - "23ccad8.b78ea52" + "efcfb695.252ca8" ] ] }, { - "id": "23ccad8.b78ea52", + "id": "efcfb695.252ca8", "type": "block", "name": "block : ConfigDB Update", "xml": "<block atomic='true'>", "atomic": "true", "comments": "", "outputs": 1, - "x": 525, - "y": 362.00000381469727, - "z": "e365f261.0028d", + "x": 502, + "y": 354.9895896911621, + "z": "1b416678.0cb38a", "wires": [ [ - "3b43614d.42cd1e", - "7a2468e9.edebc8" + "77c0aa9a.049124", + "f58bb7d3.1b9b58" ] ] }, { - "id": "7a2468e9.edebc8", + "id": "f58bb7d3.1b9b58", "type": "for", "name": "for", "xml": "<for index='idy' start='0' end=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-cell-number-of-entries`\" >", "comments": "", "outputs": 1, - "x": 742, - "y": 336.00000381469727, - "z": "e365f261.0028d", + "x": 719, + "y": 328.9895896911621, + "z": "1b416678.0cb38a", "wires": [ [ - "8e06e48c.36b168" + "151580b5.938dcf" ] ] }, { - "id": "b1c0b593.fe96b8", + "id": "baca4141.61cff", "type": "set", "name": "set tmp variables for notif neigbor input parms", "xml": "<set>\n<parameter name=\"tmp.nbr.plmnid\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-ran-neighbor-list-in-use-lte-cell-changed[$idy].plmnid`\"/>\n<parameter name=\"tmp.nbr.cid\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-ran-neighbor-list-in-use-lte-cell-changed[$idy].cid`\"/>\n<parameter name=\"tmp.nbr.phy-cell-id\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-ran-neighbor-list-in-use-lte-cell-changed[$idy].phy-cell-id`\"/>\n<parameter name=\"tmp.nbr.pnf-name\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-ran-neighbor-list-in-use-lte-cell-changed[$idy].pnf-name`\"/>\n<parameter name=\"tmp.nbr.blacklisted\" value=\"`$nbrlist-change-notification-input.fap-service[$idx].lte-ran-neighbor-list-in-use-lte-cell-changed[$idy].blacklisted`\"/>", "comments": "", - "x": 1140, - "y": 210.00000381469727, - "z": "e365f261.0028d", + "x": 1117, + "y": 202.9895896911621, + "z": "1b416678.0cb38a", "wires": [] }, { - "id": "8e06e48c.36b168", + "id": "151580b5.938dcf", "type": "block", "name": "block : atomic", "xml": "<block atomic='true'>", "atomic": "true", "comments": "", "outputs": 1, - "x": 875, - "y": 284.00000381469727, - "z": "e365f261.0028d", + "x": 852, + "y": 276.9895896911621, + "z": "1b416678.0cb38a", "wires": [ [ - "b1c0b593.fe96b8", - "c91fd3ed.ea1a9", - "8ff49992.4b25f8", - "30d460ed.4d3f2" + "baca4141.61cff", + "1403bd78.a45313", + "b103e360.7ab87", + "16926b68.0e3d45" ] ] }, { - "id": "c91fd3ed.ea1a9", + "id": "1403bd78.a45313", "type": "execute", "name": "generate configdb add URL for nbr", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.configdb.add-nbrlist-change-per-notif`\"/>\n <parameter name=\"outputPath\" value=\"tmp.configdb.add-nbrlist-change-per-notif.url\"/>\n <parameter name=\"target\" value=\"{cellId}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>", "comments": "", "outputs": 1, - "x": 1138, - "y": 256.00000381469727, - "z": "e365f261.0028d", + "x": 1115, + "y": 248.9895896911621, + "z": "1b416678.0cb38a", "wires": [ [] ] }, { - "id": "8ff49992.4b25f8", + "id": "b103e360.7ab87", "type": "record", "name": "record configdb RestAPI parms", - "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/handle-nbrlist-change-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"URL for configDB neighbor cell ADD\"/>\n<parameter name='field2' value=\"`$prop.configdb.url + $tmp.configdb.add-nbrlist-change-per-notif.url`\" />\n<parameter name='field3' value=\"`$tmp.nbr.cid`\" />\n<parameter name='field4' value=\"`$tmp.nbr.blacklisted`\" />\n", + "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/ves-nbrlist-change-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"URL for configDB neighbor cell ADD\"/>\n<parameter name='field2' value=\"`$prop.configdb.url + $tmp.configdb.add-nbrlist-change-per-notif.url`\" />\n<parameter name='field3' value=\"`$tmp.nbr.cid`\" />\n<parameter name='field4' value=\"`$tmp.nbr.blacklisted`\" />\n", "comments": "", "outputs": 1, - "x": 1133, - "y": 305.00000381469727, - "z": "e365f261.0028d", + "x": 1110, + "y": 297.9895896911621, + "z": "1b416678.0cb38a", "wires": [ [] ] }, { - "id": "30d460ed.4d3f2", + "id": "16926b68.0e3d45", "type": "execute", "name": "Add neighbor to Cell", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/CMNotify-add-nbr-to-configdb-per-nbrlist-change-notif.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.configdb.url + $tmp.configdb.add-nbrlist-change-per-notif.url`\"/>\n<parameter name=\"httpMethod\" value=\"PUT\"/>\n<parameter name=\"responsePrefix\" value=\"CMNotify-configdb-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/json' />", "comments": "", "outputs": 1, - "x": 1104, - "y": 383.00000381469727, - "z": "e365f261.0028d", + "x": 1081, + "y": 375.9895896911621, + "z": "1b416678.0cb38a", "wires": [ [ - "bef59603.eb6c28", - "82674e19.0b984" + "44eb5dc7.b020b4", + "2c9f36fe.9fb3aa" ] ] }, { - "id": "bef59603.eb6c28", + "id": "44eb5dc7.b020b4", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1306, - "y": 350.00000381469727, - "z": "e365f261.0028d", + "x": 1283, + "y": 342.9895896911621, + "z": "1b416678.0cb38a", "wires": [ [ - "2af0bc2d.9a03f4" + "7a1f1425.5c773c" ] ] }, { - "id": "82674e19.0b984", + "id": "2c9f36fe.9fb3aa", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1298.999891281128, - "y": 428.9999132156372, - "z": "e365f261.0028d", + "x": 1275.999891281128, + "y": 421.98949909210205, + "z": "1b416678.0cb38a", "wires": [ [ - "9972d4be.cec088" + "48283474.0ab81c" ] ] }, { - "id": "2af0bc2d.9a03f4", + "id": "7a1f1425.5c773c", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1466.9998779296875, - "y": 307.0000343322754, - "z": "e365f261.0028d", + "x": 1443.9998779296875, + "y": 299.98962020874023, + "z": "1b416678.0cb38a", "wires": [ [ - "9186101c.ebef7" + "b9e68bb.3124078" ] ] }, { - "id": "9186101c.ebef7", + "id": "b9e68bb.3124078", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error adding neighbor to configdb. Aborting notification update\" />", "comments": "", - "x": 1645.999568939209, - "y": 304.00000190734863, - "z": "e365f261.0028d", + "x": 1622.999568939209, + "y": 296.9895877838135, + "z": "1b416678.0cb38a", "wires": [] }, { - "id": "9972d4be.cec088", + "id": "48283474.0ab81c", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1456.9996337890625, - "y": 394.99997329711914, - "z": "e365f261.0028d", + "x": 1433.9996337890625, + "y": 387.989559173584, + "z": "1b416678.0cb38a", "wires": [ [ - "400b8692.be8148" + "6d7ea8b.bc57258" ] ] }, { - "id": "400b8692.be8148", + "id": "6d7ea8b.bc57258", "type": "record", "name": "record", "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/ves-nbrlist-change-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Neighbor Added to ConfigDB \"/>", "comments": "", "outputs": 1, - "x": 1635.9997024536133, - "y": 393.9999599456787, - "z": "e365f261.0028d", + "x": 1612.9997024536133, + "y": 386.98954582214355, + "z": "1b416678.0cb38a", "wires": [ [] ] }, { - "id": "9491fd51.6d973", + "id": "c130286.cde2fd8", "type": "execute", "name": "execute DmaapMsg", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.dmaap-publish.templatefile`\" />\n <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + '/' + $prop.CMNotify-dmaap.nbrlist-change.topic`\" />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name='responsePrefix' value='dmaap' />", "comments": "", "outputs": 1, - "x": 676.5, - "y": 521.0833168029785, - "z": "e365f261.0028d", + "x": 653.5, + "y": 514.0729026794434, + "z": "1b416678.0cb38a", "wires": [ [ - "c2fb651f.83fdf8", - "f266f5d2.b65708" + "57083c90.881064", + "aad16dc2.b0cba" ] ] }, { - "id": "d9c9c262.acaa7", + "id": "1cf4ba2d.43b9c6", "type": "set", "name": "set", "xml": "<set>\n<parameter name='tmp.oofpcipoc-dmaap.requestID' value='`$prop.CMNotify-dmaap.requestID`'/>\n<parameter name='tmp.oofpcipoc-dmaap.aai' value=\"`$prop.CMNotify-dmaap.aai`\"/>\n<parameter name='tmp.oofpcipoc-dmaap.version' value='`$prop.CMNotify-dmaap.version`'/>\n<parameter name='tmp.oofpcipoc-dmaap.action' value='`$prop.CMNotify-dmaap.action`'/>\n<parameter name='tmp.oofpcipoc-dmaap.payload' value='`$nbrlist-change-notification-input.payload`'/>", "comments": "", - "x": 671.166748046875, - "y": 427.0833168029785, - "z": "e365f261.0028d", + "x": 648.166748046875, + "y": 420.07290267944336, + "z": "1b416678.0cb38a", "wires": [] }, { - "id": "c2fb651f.83fdf8", + "id": "57083c90.881064", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 872, - "y": 461.00000381469727, - "z": "e365f261.0028d", + "x": 849, + "y": 453.9895896911621, + "z": "1b416678.0cb38a", "wires": [ [ - "1c059a5a.142026" + "fcb62202.e164f" ] ] }, { - "id": "f266f5d2.b65708", + "id": "aad16dc2.b0cba", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 857.9998779296875, - "y": 594.999942779541, - "z": "e365f261.0028d", + "x": 834.9998779296875, + "y": 587.9895286560059, + "z": "1b416678.0cb38a", "wires": [ [ - "f560935d.61fab" + "849162d5.d13d2" ] ] }, { - "id": "1c059a5a.142026", + "id": "fcb62202.e164f", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1062.9998779296875, - "y": 491.0000343322754, - "z": "e365f261.0028d", + "x": 1039.9998779296875, + "y": 483.98962020874023, + "z": "1b416678.0cb38a", "wires": [ [ - "47ce8954.135548" + "128dd08a.c2daaf" ] ] }, { - "id": "47ce8954.135548", + "id": "128dd08a.c2daaf", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error publishing DMAAP message. ConfigDB Updated; TO be rolled back...will handle next release\" />", "comments": "", - "x": 1241.999568939209, - "y": 488.00000190734863, - "z": "e365f261.0028d", + "x": 1218.999568939209, + "y": 480.9895877838135, + "z": "1b416678.0cb38a", "wires": [] }, { - "id": "f560935d.61fab", + "id": "849162d5.d13d2", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1052.9996337890625, - "y": 578.9999732971191, - "z": "e365f261.0028d", + "x": 1029.9996337890625, + "y": 571.989559173584, + "z": "1b416678.0cb38a", "wires": [ [ - "9d733460.1d7b38" + "f8d55add.9a71f8" ] ] }, { - "id": "9d733460.1d7b38", + "id": "f8d55add.9a71f8", "type": "record", "name": "record", "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/ves-nbrlist-change-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP Message Successfully Published \"/>", "comments": "", "outputs": 1, - "x": 1231.9997024536133, - "y": 577.9999599456787, - "z": "e365f261.0028d", + "x": 1208.9997024536133, + "y": 570.9895458221436, + "z": "1b416678.0cb38a", "wires": [ [] ] }, { - "id": "7c1b714b.48842", + "id": "3145ec9a.d28f24", "type": "block", "name": "block : Publish DMAAP Message", "xml": "<block atomic='true'>", "atomic": "true", "comments": "", "outputs": 1, - "x": 427, - "y": 465, - "z": "e365f261.0028d", + "x": 404, + "y": 457.98958587646484, + "z": "1b416678.0cb38a", "wires": [ [ - "d9c9c262.acaa7", - "9491fd51.6d973" + "1cf4ba2d.43b9c6", + "c130286.cde2fd8" ] ] }, { - "id": "78866421.b367ac", + "id": "a4ad86da.d5fb28", "type": "comment", "name": "DMAAP Publish Not Reqd. Just a placeholder", "info": "", "comments": "", - "x": 391, - "y": 519, - "z": "e365f261.0028d", + "x": 368, + "y": 511.98958587646484, + "z": "1b416678.0cb38a", "wires": [] } -] +]
\ No newline at end of file diff --git a/platform-logic/cMNotify-api/src/main/xml/CM-NOTIFY-API_nbrlist-change-notification.xml b/platform-logic/cMNotify-api/src/main/xml/CM-NOTIFY-API_nbrlist-change-notification.xml index 58380642..7e49bf9d 100644 --- a/platform-logic/cMNotify-api/src/main/xml/CM-NOTIFY-API_nbrlist-change-notification.xml +++ b/platform-logic/cMNotify-api/src/main/xml/CM-NOTIFY-API_nbrlist-change-notification.xml @@ -78,7 +78,7 @@ <parameter name="replacement" value="`$tmp.cid`"/> </execute> <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/opendaylight/current/data/log/handle-nbrlist-change-notif.log" /> + <parameter name="file" value="/opt/opendaylight/current/data/log/ves-nbrlist-change-notif.log" /> <parameter name="level" value="info" /> <parameter name="field1" value="URL for configDB neighbor cell ADD"/> <parameter name='field2' value="`$prop.configdb.url + $tmp.configdb.add-nbrlist-change-per-notif.url`" /> @@ -123,4 +123,4 @@ </return> </block> </method> -</service-logic> +</service-logic>
\ No newline at end of file @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.5.2</version> + <version>1.5.4</version> </parent> <groupId>org.onap.ccsdk.distribution</groupId> |