Fix SNIRO configuration properties

This is the definitive set:

"sniroAuth": "test:testpwd",
"sniroEndpoint": "http://sniro.api.simpledemo.openecomp.org:8080/sniro/api/v2/placement",
"sniroTimeout": "PT30M",
"serviceAgnosticSniroHost": "http://sniro.api.simpledemo.openecomp.org:8080",
"serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement",

Issue: SO-274
Change-Id: I14da1d44703b3b6ba9f781c7e5269fceeec47d8c
Signed-off-by: Rob Daugherty <rd472p@att.com>

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
index 5520d18..1cebbcf 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -55,16 +55,11 @@ mso.sdnc.timeout.ucpe.async.minutes=5
 mso.workflow.message.endpoint=http://localhost:28080/mso/WorkflowMesssage\r
 mso.workflow.sdncadapter.callback=http://localhost:28080/mso/SDNCAdapterCallbackService\r
 \r
-\r
 mso.sniro.auth=test:testpwd\r
+mso.sniro.endpoint=http://localhost:28090/optimizationInstance/V1/create\r
 mso.sniro.timeout=PT30M\r
-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\r
-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\r
-\r
 mso.service.agnostic.sniro.host=http://localhost:28090\r
 mso.service.agnostic.sniro.endpoint=/sniro/api/v2/placement\r
-mso.sniro.endpoint=http://localhost:28090/optimizationInstance/V1/create\r
-mso.sniro.callback=http://localhost:28090/adapters/rest/SDNCNotify/SNIROResponse\r
 \r
 mso.catalog.db.endpoint=http://localhost:28090/\r
 \r