diff options
| author |   Arthur Martella <amartell@research.att.com> | 2017-10-10 15:59:14 -0400 |
|---|---|---|
| committer | Arthur Martella <amartell@research.att.com> | 2017-10-10 15:59:14 -0400 |
| commit | 16467e6c6737a620804312b406b5855cebe0dd01 (patch) | |
| tree | 47200997ad1615dc088b7a1fa39874a9268b45d0 /bpmn/MSOCommonBPMN/src/test/resources | |
| parent | d8b291e5d903cd938a33522eb3098d74a4465edd (diff) | |
Updated port for SNIRO in Homing tests
Change-Id: Idbf4c87544c92dc6b744a859c024c773ec00e2cd
Issue-id: SO-138
Signed-off-by: Arthur Martella <amartell@research.att.com>
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/test/resources')
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf | 2 | ||||
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf index 2af6bf3423..5dcf71a7c8 100644 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf +++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf @@ -2,7 +2,7 @@ "requestInfo": { "transactionId": "testRequestId", "requestId": "testRequestId", - "callbackUrl": "http://localhost:8090/workflows/messages/message/SNIROResponse/testRequestId", + "callbackUrl": "http://localhost:28090/workflows/messages/message/SNIROResponse/testRequestId", "sourceId": "mso", "optimizer": [ "placement", diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties index 9829ddaf50..ba45f545c8 100644 --- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties +++ b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties @@ -24,6 +24,7 @@ mso.adapters.po.auth=757A94191D685FD2092AC1490730A4FC mso.adapters.po.password=3141634BF7E070AA289CF2892C986C0B
mso.po.timeout=PT60S
mso.default.adapter.namespace=http://org.openecomp.mso
+mso.adapters.workflow.message.endpoint=http://localhost:28090/workflows/messages/message
aai.auth=26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764
@@ -54,6 +55,17 @@ mso.sdnc.timeout.ucpe.async.minutes=5 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.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.sniro.endpoint=http://localhost:28090/optimizationInstance/V1/create
+mso.sniro.callback=http://localhost:28090/adapters/rest/SDNCNotify/SNIROResponse
+
mso.catalog.db.endpoint=http://localhost:28090/
mso.adapters.tenant.endpoint=http://localhost:28090/tenantAdapterMock
@@ -113,11 +125,3 @@ policyClientAuth=Basic bTAzNzQzOnBvbGljeVIwY2sk policyAuth=Basic dGVzdHBkcDphbHBoYTEyMw==
policyEnvironment=TEST
policyEndpoint=localhost:8080/pdp/api/getDecision
-
-mso.sniro.auth=test:testpwd
-mso.sniro.endpoint=http://localhost:28090/optimizationInstance/V1/create
-mso.sniro.callback=http://localhost:28090/adapters/rest/SDNCNotify/SNIROResponse
-mso.sniro.timeout=PT30M
-mso.service.agnostic.sniro.host=http://localhost:28090
-mso.service.agnostic.sniro.endpoint=/sniro/api/v2/placement
-mso.adapters.workflow.message.endpoint=http://localhost:8090/workflows/messages/message
|