diff options
| author |   Ram Krishna Verma <ram_krishna.verma@bell.ca> | 2020-03-25 19:19:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-03-25 19:19:31 +0000 |
| commit | 7e92a9de35f0f92c936a92e5a85dbd5a1ef948a4 (patch) | |
| tree | 98f26f701579331568dd7b49e7a91d12ad9458d4 /controlloop/common/feature-controlloop-management/src/main | |
| parent | 9477940e341db68d9cd7f3fe8f722109964da521 (diff) | |
| parent | c53ad826391ef385e614b8c4617eb5e424ae11f7 (diff) | |
Merge "Adjust properties for context URI with slash"
Diffstat (limited to 'controlloop/common/feature-controlloop-management/src/main')
4 files changed, 6 insertions, 7 deletions
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties index 98122f5ee..8772f906e 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties @@ -24,4 +24,4 @@ http.client.services.GUARD.host=${envd:PDP_HOST} http.client.services.GUARD.port=${envd:PDP_PORT} http.client.services.GUARD.username=${envd:PDP_USERNAME} http.client.services.GUARD.password=${envd:PDP_PASSWORD} -http.client.services.GUARD.contextUriPath=${envd:PDP_CONTEXT_URI:policy/pdpx/v1} +http.client.services.GUARD.contextUriPath=${envd:PDP_CONTEXT_URI:policy/pdpx/v1/} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties index f09880763..b4bc9427d 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties @@ -24,4 +24,4 @@ http.client.services.VFC.host=${envd:VFC_HOST} http.client.services.VFC.port=${envd:VFC_PORT} http.client.services.VFC.username=${envd:VFC_USERNAME} http.client.services.VFC.password=${envd:VFC_PASSWORD} -http.client.services.VFC.contextUriPath=${envd:VFC_CONTEXT_URI:api/nslcm/v1} +http.client.services.VFC.contextUriPath=${envd:VFC_CONTEXT_URI:api/nslcm/v1/} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment index 18e7c936f..fdd8d421e 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment @@ -43,7 +43,7 @@ pdpx.host=${envd:PDP_HOST} pdpx.username=${envd:PDP_USERNAME} pdpx.password=${envd:PDP_PASSWORD} -guard.url=https://${envd:PDP_HOST}:${envd:PDP_PORT:443}/${envd:PDP_CONTEXT_URI}/decision +guard.url=https://${envd:PDP_HOST}:${envd:PDP_PORT:443}/${envd:PDP_CONTEXT_URI}decision guard.jdbc.url=jdbc:mariadb://${envd:SQL_HOST}:3306/operationshistory guard.disabled=false diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties index 21476847f..a578da85a 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties @@ -61,9 +61,8 @@ actor.service.CDS.grpcTimeout=10 actor.service.CDS.operations.gRPC.placeholder= actor.service.SDNC.clientName=SDNC -actor.service.SDNC.path= -actor.service.SDNC.operations.Reroute.placeholder= -actor.service.SDNC.operations.BandwidthOnDemand.placeholder= +actor.service.SDNC.operations.Reroute.path=/ +actor.service.SDNC.operations.BandwidthOnDemand.path=/ actor.service.SDNR.sinkTopic=SDNR-CL actor.service.SDNR.sourceTopic=SDNR-CL-RSP @@ -77,4 +76,4 @@ actor.service.SO.operations.VF\ Module\ Create.path=serviceInstantiation/v7/serv actor.service.SO.operations.VF\ Module\ Delete.path=serviceInstances/v7 actor.service.VFC.clientName=VFC -actor.service.VFC.operations.Restart.path= +actor.service.VFC.operations.Restart.path=/ |