diff options
Diffstat (limited to 'controlloop/common/feature-controlloop-management')
6 files changed, 9 insertions, 10 deletions
diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml index 85981f60c..62d4d68f7 100644 --- a/controlloop/common/feature-controlloop-management/pom.xml +++ b/controlloop/common/feature-controlloop-management/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.drools-applications.controlloop.common</groupId> <artifactId>drools-applications-common</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>1.6.1-SNAPSHOT</version> </parent> <artifactId>feature-controlloop-management</artifactId> 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..78e74c6c2 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 @@ -31,7 +31,7 @@ aai.url=https://${envd:AAI_HOST}:${envd:AAI_PORT:443}/${envd:AAI_CONTEXT_URI} aai.username=${envd:AAI_USERNAME} aai.password=${envd:AAI_PASSWORD} -so.url=https://${envd:SO_HOST}:${envd:SO_PORT:443}/${envd:SO_CONTEXT_URI} +so.url=${envd:SO_URL} so.username=${envd:SO_USERNAME} so.password=${envd:SO_PASSWORD} @@ -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=/ diff --git a/controlloop/common/feature-controlloop-management/src/test/resources/op.pom b/controlloop/common/feature-controlloop-management/src/test/resources/op.pom index d2d90979e..93be3fa54 100644 --- a/controlloop/common/feature-controlloop-management/src/test/resources/op.pom +++ b/controlloop/common/feature-controlloop-management/src/test/resources/op.pom @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.policy.drools-pdp</groupId> <artifactId>drools-pdp</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>1.6.1-SNAPSHOT</version> </parent> <groupId>org.onap.policy.drools.apps.test</groupId> |