AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>

1 files changed, 23 insertions, 14 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
index 1cebbcfc48..049fc7c551 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -13,12 +13,12 @@ mso.healthcheck.log.debug=false
 

 mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess

 

-mso.adapters.db.endpoint=http://localhost:28090/dbadapters/MsoRequestsDbAdapter

+mso.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter

 mso.adapters.openecomp.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter

 mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC

 

 mso.adapters.network.endpoint=http://localhost:28090/networks/NetworkAdapter

-mso.adapters.network.rest.endpoint=http://localhost:28090/networks/NetworkAdapter

+mso.adapters.network.rest.endpoint=http://localhost:28090/networks/rest/v1/networks

 

 mso.adapters.po.auth=757A94191D685FD2092AC1490730A4FC

 mso.adapters.po.password=3141634BF7E070AA289CF2892C986C0B

@@ -28,16 +28,17 @@ mso.adapters.workflow.message.endpoint=http://localhost:28090/workflows/messages
 

 aai.auth=26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764

 

-policy.endpoint=https://mtanjvsgcvm02.nvp.cip.att.com:8081/pdp/api/getDecision

+policy.endpoint=https://mtanjvsgcvm02.nvp.cip.att.com:8081/pdp/api/

 policy.client.auth=Basic bTAzNzQzOnBvbGljeVIwY2sk

 policy.auth=Basic dGVzdHBkcDphbHBoYTEyMw==

 policy.environment=TEST

 

-appc.topic.read=APPC-CL-FUSION-LCM-RESPONSE

-appc.topic.read.timeout=60000

-appc.client.response.timeout=3600000

-appc.topic.write=APPC-CL-FUSION-LCM

-appc.pool.members=uebsb91bodc.it.openecomp.org:3904,uebsb92bodc.it.openecomp.org:3904,uebsb93bodc.it.openecomp.org:3904

+appc.topic.read=APPC-TEST-AMDOCS2

+appc.topic.write=APPC-TEST-AMDOCS1-DEV3

+appc.topic.read.timeout=120000

+appc.client.response.timeout=120000

+appc.service=ueb

+appc.poolMembers=uebsb93kcdc.it.att.com:3904,uebsb92kcdc.it.att.com:3904,uebsb91kcdc.it.att.com:3904

 appc.client.key=iaEMAfjsVsZnraBP

 appc.client.secret=wcivUjsjXzmGFBfxMmyJu9dz

 

@@ -56,17 +57,24 @@ mso.workflow.message.endpoint=http://localhost:28080/mso/WorkflowMesssage
 mso.workflow.sdncadapter.callback=http://localhost:28080/mso/SDNCAdapterCallbackService

 

 mso.sniro.auth=test:testpwd

-mso.sniro.endpoint=http://localhost:28090/optimizationInstance/V1/create

 mso.sniro.timeout=PT30M

+mso.sniro.policies.dhv.2vvig=SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1

+mso.sniro.policies.dhv.4vvig=SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.VNFPolicy_vvigprimary2_v1,SNIRO.VNFPolicy_vvigsecondary2_v1,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1

+

 mso.service.agnostic.sniro.host=http://localhost:28090

 mso.service.agnostic.sniro.endpoint=/sniro/api/v2/placement

 

 mso.catalog.db.endpoint=http://localhost:28090/

 

+ruby.create-ticket-request.dmaap.username=m04768@mso.ecomp.att.com

+ruby.create-ticket-request.dmaap.password=eHQ1cUJrOUc

+ruby.create-ticket-request.publisher.topic=com.att.pdas.st1.msoCMFallout-v1

+

+

 mso.adapters.tenant.endpoint=http://localhost:28090/tenantAdapterMock

 mso.adapters.vnf-async.endpoint=http://localhost:28090/vnfs/VnfAdapterAsync

 mso.adapters.vnf.endpoint=http://localhost:28090/vnfs/VnfAdapter

-mso.adapters.vnf.rest.endpoint=http://localhost:28090/vnfs/v1/vnfs

+mso.adapters.vnf.rest.endpoint=http://localhost:28090/vnfs/rest/v1/vnfs

 mso.workflow.vnfadapter.create.callback=http://localhost:28080/mso/vnfAdapterNotify

 mso.workflow.vnfadapter.delete.callback=http://localhost:28080/mso/vnfAdapterNotify

 mso.workflow.vnfadapter.query.callback=http://localhost:28080/mso/services/VNFAdapterQuerCallbackV1

@@ -98,6 +106,7 @@ mso.workflow.default.aai.v8.tenant.uri=/aai/v8/cloud-infrastructure/cloud-region
 mso.workflow.default.aai.v8.vce.uri=/aai/v8/network/vces/vce

 mso.workflow.default.aai.v8.vpn-binding.uri=/aai/v8/network/vpn-bindings/vpn-binding

 mso.workflow.notification.name=GenericNotificationService

+mso.bpmn.optimisticlockingexception.retrycount=3

 

 log.debug.CompleteMsoProcess=true

 log.debug.CreateNetworkInstanceInfra=true

@@ -116,7 +125,7 @@ log.debug.GenericDeleteVnf=true
 log.debug.vnfAdapterCreateV1=true

 log.debug.vnfAdapterRestV1=true

 

-policyClientAuth=Basic bTAzNzQzOnBvbGljeVIwY2sk

-policyAuth=Basic dGVzdHBkcDphbHBoYTEyMw==

-policyEnvironment=TEST

-policyEndpoint=localhost:8080/pdp/api/getDecision

+sdno.health-check.dmaap.username=m04768@mso.ecomp.att.com

+sdno.health-check.dmaap.password=eHQ1cUJrOUc

+sdno.health-check.dmaap.subscriber.topic=com.att.sdno.test-health-diagnostic-v02

+sdno.health-check.dmaap.publisher.topic=com.att.sdno.test-health-diagnostic-v02
\ No newline at end of file