Sync local changes to support GRA microservice

Sync changes made downstream to support GRA microservice

Change-Id: If3bf5d879f7d61ab91209c63b0344d78128246a8
Issue-ID: CCSDK-3504
Signed-off-by: Dan Timoney <dtimoney@att.com>

1 files changed, 104 insertions, 19 deletions

diff --git a/ms/gra/gra-docker/src/main/resources/generic-resource-api-dg.properties b/ms/gra/gra-docker/src/main/resources/generic-resource-api-dg.properties
index 3751142..908c32b 100644
--- a/ms/gra/gra-docker/src/main/resources/generic-resource-api-dg.properties
+++ b/ms/gra/gra-docker/src/main/resources/generic-resource-api-dg.properties
@@ -1,7 +1,44 @@
-restapi.templateDir=/opt/onap/sdnc/restapi/templates
+restapi.templateDir=/opt/sdnc/gra/restapi/templates
 controller.url=http://localhost:8080
 controller.user=${ODL_USER}
 controller.pwd=${ODL_PASSWORD}
+bondingservice.server=${ADMIN_PORTAL_URL}
+bondingservice.user=${ODL_USER}
+bondingservice.password=${ODL_PASSWORD}
+bondingservice.authorization=${BONDING_SERVICE_CRED}
+bondingservice.uri=/provisioningms/v1/bondingservice/{action}
+cloud-region.cloud-owner=att-aic
+policy-manager.url=${POLICY_MANAGER_URL}
+policy-manager.authorization=${POLICY_AUTHORIZATION_CRED}
+policy-manager.clientauth=${POLICY_CLIENTAUTH_CRED}
+policy-manager.environment=TEST
+# MICROSERVICE
+rt.mS.user=${ODL_USER}
+rt.mS.pwd=${ODL_PASSWORD}
+rt.mS.routeTarget.type=dme2proxy
+rt.mS.routeTarget.service=microservice-router.lpp.att.com/services/microservice_router/v1/routes
+rt.ms.allocateRouteTarget.subContext=/nwrouting/allocateroutetarget/
+rt.ms.releaseRouteTarget.subContext=/nwrouting/releaseroutetarget/
+rt.ms.routeTarget.version=0.1
+rt.ms.routeTarget.envContext=TEST
+rt.ms.routeTarget.routeOffer=ST3
+rt.ms.routeTarget.appId=SDNCP
+# VLAN-TAG MICROSERVICE
+vt.mS.url=${ADMIN_PORTAL_URL}
+vt.mS.user=${ODL_USER}
+vt.mS.pwd=${ODL_PASSWORD}
+# MAC Address MICROSERVICE
+ma.mS.url=${ADMIN_PORTAL_URL}
+ma.mS.user=${ODL_USER}
+ma.mS.pwd=${ODL_PASSWORD}
+# CDS ipassign mS
+ipassign.ms.url=${IPASSIGN_URL}
+ipassign.ms.user=${ODL_USER}
+ipassign.ms.pwd=${ODL_PASSWORD}
+# CDS Naming mS
+naming.ms.url=${NAMING_MS_URL}
+naming.ms.user=${ODL_USER}
+naming.ms.pwd=${ODL_PASSWORD}
 honeycomb.url=http://{honeycomb-instance-ip}:8183
 honeycomb.user=${HONEYCOMB_USER}
 honeycomb.pwd=${HONEYCOMB_PASSWORD}
@@ -29,6 +66,35 @@ restapi.vpp.xconnect.templatefile=vcpe-l2-interface.json
 restapi.tx.templatefile=tunnelxconn-allotted-resource.json
 restapi.parentsvc.templatefile=parent-provided-allotted-resource.json
 restapi.network-ar.templatefile=network-provided-allotted-resources.json
+restapi.pm.getpolicy.templatefile=pm-get-policy.json
+restapi.pm.createpolicy.templatefile=pm-create-policy.json
+restapi.pm.pushpolicy.templatefile=pm-push-policy.json
+restapi.pm.deletepolicypdp.templatefile=pm-delete-policy-pdp.json
+restapi.pm.deletepolicypap.templatefile=pm-delete-policy-pap.json
+restapi.portmirrorconfig.templatefile=port-mirror-configuration.json
+restapi.genconfig.templatefile=gc-configuration.json
+restapi.vnfsubinterfacegroup.templatefile=vnf-sub-interface-group.json
+restapi.bondingservice.templatefile=bonding-service.json
+restapi.bondingservicerebuild.templatefile=bonding-service-rebuild.json
+restapi.forwardingpath.templatefile=forwarding-path.json
+restapi.network.templatefile=network.json
+restapi.network-instance-group.templatefile=network-instance-group.json
+restapi.network-instance-group-network.templatefile=network-instance-group-network.json
+restapi.network-instance-group-vpn-binding.templatefile=network-instance-group-vpn-binding.json
+restapi.csm.serviceinstance.templatefile=csm-service-instance.json
+restapi.mS.allocateRT.templatefile=allocate-route-target.json
+restapi.mS.releaseRT.templatefile=release-route-target.json
+restapi.ss.vnf.templatefile=self-serve-vnf-assignments.json
+restapi.ss.vfmodule.templatefile=self-serve-vfmodule-assignments.json
+restapi.ss.caprelease.templatefile=self-serve-capacity-release.json
+restapi.ss.capreserve.templatefile=self-serve-capacity-reserve.json
+restapi.ss.capreserve.targettype=Site
+restapi.ss.mS.vlan.tag.assign.templatefile=self-serve-mS-vlan-tag-assignments.json
+restapi.ss.mS.vlan.tag.unassign.templatefile=self-serve-mS-vlan-tag-unassignments.json
+restapi.ss.mS.mac.address.assign.templatefile=self-serve-mS-mac-address-assign.json
+restapi.ss.mS.mac.address.unassign.templatefile=self-serve-mS-mac-address-unassign.json
+restapi.ss.cds.ipassign.templatefile=self-serve-ipassign-unassign.json
+restapi.ss.cds.naming.templatefile=self-serve-naming-unassign.json
 restapi.vnf-ar.templatefile=vnf-provided-allotted-resources.json
 restapi.services.templatefile=vcpe-services-service.json
 restapi.services.vnf.vfmodule.templatefile=vfmodule-vim-parameters.vgw.json
@@ -48,30 +114,49 @@ restapi.ss.mS.mac.address.unassign.templatefile=self-serve-mS-mac-address-unassi
 cloud-region.cloud-owner=CloudOwner
 
 # URLs
-restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/
-restapi.sz-allottedresource=/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/
 restapi.brg-allottedresource=/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/
-restapi.vpp-honeycomb=/restconf/config/ietf-interfaces:interfaces/interface/{tunnel-name}/
-restapi.tx-allottedresource=/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/
-restapi.vnf-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/
+restapi.cds.ipassign.service=/ippm/restservices/v2/ipaddresses/unassign/
+restapi.cds.naming.service=/web/service/v1/genNetworkElementName/cds/
+restapi.connection-attachment-allottedresource=/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/
+restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/
+restapi.forwarding-path=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/
+restapi.gc-configuration=/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/
+restapi.mS.allocateRT=/vpnmicroservice/v1/vpn/allocateroutetarget/
+restapi.mS.releaseRT=/vpnmicroservice/v1/vpn/releaseroutetarget/
+restapi.naming.gen-name.service=/web/service/v1/genNetworkElementName/
+restapi.network-by-id=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/
+restapi.network-instance-group-network=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}/
+restapi.network-instance-group-network=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}/
+restapi.network-instance-group-vpn-binding=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}/vpn-bindings/{vpn-binding-id}/
+restapi.network-instance-group=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/
+restapi.network-level-oper-status=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-level-oper-status/
 restapi.network-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/
-restapi.pm-configuration=/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/
+restapi.network-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-provided-allotted-resources/
+restapi.network-topology-identifier-structure=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-topology-identifier-structure/
 restapi.network=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/
-restapi.vnf=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/
-restapi.vnf-api.service-information=/restconf/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/
 restapi.parent-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-allotted-resources/provided-allotted-resource/{allotted-resource-id}/
-restapi.network-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-provided-allotted-resources/
-restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/
+restapi.pm-configuration=/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/
+restapi.preload-network=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{network-name}/network/preload-data/preload-network-topology-information/
+restapi.preloadinformation=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/
 restapi.service.vnf.vfmodule-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/
-restapi.connection-attachment-allottedresource=/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/
-restapi.naming.gen-name.service=/web/service/v1/genNetworkElementName
-restapi.ss-pnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/
-restapi.ss-vnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/
-restapi.ss-vfmodule-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/
-restapi.ss-mS-vlan-tag-assign=/vlantagapi/v1/{action}
+restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/
 restapi.ss-mS-mac-address-assign=/api/macaddress/v1/service/assign/
 restapi.ss-mS-mac-address-unassign=/api/macaddress/v1/service/unassign/
-restapi.preload-network=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{network-name}/network/preload-data/preload-network-topology-information/
-restapi.preloadinformation=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/
+restapi.ss-mS-vlan-tag-assign=/vlantagapi/v1/{action}
+restapi.ss-pnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/
+restapi.ss-vfmodule-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/
+restapi.ss-vnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/
+restapi.sz-allottedresource=/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/
+restapi.tx-allottedresource=/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/
 restapi.vf-module=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/
+restapi.vnf-api.service-information=/restconf/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/
 restapi.vnf-assign=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/
+restapi.vnf-level-oper-status=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-level-oper-status/
+restapi.vnf-network=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/
+restapi.vnf-networks=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/
+restapi.vnf-onap-model-information=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/onap-model-information/
+restapi.vnf-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/
+restapi.vnf-sub-interface-group=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/
+restapi.vnf-topology.onap-model-information=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/onap-model-information/
+restapi.vnf=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/
+restapi.vpp-honeycomb=/restconf/config/ietf-interfaces:interfaces/interface/{tunnel-name}/