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: I001731f6db288ae9d94cc9759d4f394b79ac0719
Signed-off-by: Rob Daugherty <rd472p@att.com>

diff --git a/environments/mso-docker.json b/environments/mso-docker.json
index 7053857..a3f65b9 100644 (file)
--- a/environments/mso-docker.json
+++ b/environments/mso-docker.json
@@ -160,14 +160,10 @@
       "versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44",
       "infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77",
       "sniroAuth": "test:testpwd",
-      "sniroCallback": "http://mso.api.simpledemo.openecomp.org:8080/adapters/rest/SDNCNotify/SNIROResponse",
       "sniroEndpoint": "http://sniro.api.simpledemo.openecomp.org:8080/sniro/api/v2/placement",
       "sniroTimeout": "PT30M",
-      "sniroPoliciesDHV2vvig": "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",
-      "sniroPoliciesDHV4vvig": "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.sniro.endpoint": "/optimizationInstance/V1/create",
-      "mso.sniro.callback": "/adapters/rest/SDNCNotify/SNIROResponse",
-      "mso.infra.customer.id": "21014aa2-526b-11e6-beb8-9e71128cae77",
+      "serviceAgnosticSniroHost": "http://sniro.api.simpledemo.openecomp.org:8080",
+      "serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement",
       "aaiEndpoint": "https://aai.api.simpledemo.openecomp.org:8443",
       "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
       "adaptersNamespace": "http://org.openecomp.mso",