OOFPCIPOC Properties files for Alpine and Ubuntu

Include properties files in common folder for Alpine and Ubuntu
Update POM file for Ubuntu to install .vt template in a docker

Issue-ID: CCSDK-1477
Signed-off-by: SandeepLinux <sandeeplinux1068@gmail.com>
Change-Id: I5d13cd2cee83dbfe9ab06e68fa9ee8e5cc2b5414

diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index 3b3adea..f396985 100644 (file)
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -426,6 +426,7 @@
                                                                        <directory>../src/main/properties</directory>
                                                                        <includes>
                                                                                <include>*.properties</include>
+                                                                               <include>*.vt</include>
                                                                        </includes>
                                                                        <filtering>false</filtering>
                                                                </resource>

diff --git a/odlsli/src/main/properties/rpc-message-sliapi-execute.vt b/odlsli/src/main/properties/rpc-message-sliapi-execute.vt
new file mode 100644 (file)
index 0000000..1cdd65e
--- /dev/null
+++ b/odlsli/src/main/properties/rpc-message-sliapi-execute.vt
@@ -0,0 +1,8 @@
+{
+       "input": {
+               "module-name": "oofpcipoc-api",
+               "rpc-name": $rpc_name,
+               "mode": "sync",
+               "sli-parameter": $sli_parameters
+       }
+}
\ No newline at end of file

diff --git a/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties b/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties
index d4f7e3c..9464d19 100644 (file)
--- a/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties
+++ b/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties
@@ -1,10 +1,9 @@
 restapi.templateDir=/opt/onap/ccsdk/restapi/templates
-controller.url=http://localhost:8181
+controller.url=http://sdnc.onap:8282
 controller.user=admin
 controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-honeycomb.url=http://{honeycomb-instance-ip}:8183
-honeycomb.user=admin
-honeycomb.pwd=admin
+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
@@ -25,11 +24,34 @@ restapi.pci-patch.templatefile=oofpcipoc-pci-patch.json
 restapi.neighbor-add.templatefile=oofpcipoc-addNeighbor.json
 restapi.neighbor-delete.templatefile=oofpcipoc-deleteNeighbor.json
 restapi.generic-neighbor-patch.template=oofpcipoc-generic-neighbor-patch.json
+restapi.add-nbr-to-configdb-per-notif.template=oofpcipoc-add-nbr-to-configdb-per-nbrlist-change-notif.json
+restapi.dmaap-publish.template=oofpcipoc-dmaap-publish-template.json
 
-# URLs
+# URLs without Netconf Mount of Ran Simulator
 restapi.config=/restconf/config
 restapi.radio-access=/restconf/config/oofpcipoc:radio-access
 restapi.fap-service=/restconf/config/oofpcipoc:radio-access/fap-service/{alias}
 restapi.x-005b9-lte=/restconf/config/oofpcipoc:radio-access/fap-service/{alias}/x-0005b9-lte
 restapi.lte-ran-neighbor-list-in-use=/restconf/config/oofpcipoc:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use
 restapi.lte-ran-neighbor-in-use=/restconf/config/oofpcipoc:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use/lte-ran-neighbor-list-in-use-lte-cell/{plmnid}/{cid}
+
+# URLs with Netconf Mount of Ran Simulator
+restapi.config.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/
+restapi.radio-access.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/oofpcipoc:radio-access
+restapi.fap-service.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/oofpcipoc:radio-access/fap-service/{alias}
+restapi.x-005b9-lte.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/oofpcipoc:radio-access/fap-service/{alias}/x-0005b9-lte
+restapi.lte-ran-neighbor-list-in-use.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/oofpcipoc:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use
+restapi.lte-ran-neighbor-in-use.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/oofpcipoc:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use/lte-ran-neighbor-list-in-use-lte-cell/{plmnid}/{cid}
+
+#URLs for ConfigDB
+restapi.configdb.add-nbrlist-change-per-notif=/createNbr/{cellId}
+configdb.url=http://10.31.3.18:8080/api/sdnc-config-db/v3
+
+#DMAAP Publish
+dmaap-message-router.url=message-router.onap:3904/events
+oofpcipoc-dmaap.nbrlist-change.topic=/PCI-NOTIF-TOPIC-NGHBR-LIST-CHANGE-INFO
+
+oofpcipoc-dmaap.requestID=9d2d790e-a5f0-11e8-98d0-529269fb1459
+oofpcipoc-dmaap.aai=
+oofpcipoc-dmaap.version=1.0.2
+oofpcipoc-dmaap.nbrlistchange.action=NeighborListModified