diff options
Diffstat (limited to 'controlloop/common')
20 files changed, 25 insertions, 27 deletions
diff --git a/controlloop/common/controller-frankfurt/pom.xml b/controlloop/common/controller-frankfurt/pom.xml index 078235d07..f077d3b8f 100644 --- a/controlloop/common/controller-frankfurt/pom.xml +++ b/controlloop/common/controller-frankfurt/pom.xml @@ -25,7 +25,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>controller-frankfurt</artifactId> diff --git a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties index 9244fd2ed..3cd8f70a1 100644 --- a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties +++ b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties @@ -60,9 +60,8 @@ actor.service.CDS.grpcTimeout=10 actor.service.CDS.operations.xxx.yyy= actor.service.SDNC.clientName=SDNC -actor.service.SDNC.path=/ -actor.service.SDNC.operations.BandwidthOnDemand.placeholder= -actor.service.SDNC.operations.Reroute.placeholder= +actor.service.SDNC.operations.BandwidthOnDemand.path=/ +actor.service.SDNC.operations.Reroute.path=/ actor.service.SDNR.sinkTopic=SDNR-CL actor.service.SDNR.sourceTopic=SDNR-CL-RSP @@ -76,4 +75,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.xxx.yyy= +actor.service.VFC.operations.Restart.path=/ diff --git a/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-http-client.properties b/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-http-client.properties index bb3a1a02b..afc8772f9 100644 --- a/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-http-client.properties +++ b/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-http-client.properties @@ -25,7 +25,7 @@ http.client.services.GUARD.host=localhost http.client.services.GUARD.port=6669 http.client.services.GUARD.username=pdpx http.client.services.GUARD.password=pdpx -http.client.services.GUARD.contextUriPath=policy/pdpx/v1 +http.client.services.GUARD.contextUriPath=policy/pdpx/v1/ http.client.services.AAI.managed=true http.client.services.AAI.host=localhost diff --git a/controlloop/common/controller-usecases/pom.xml b/controlloop/common/controller-usecases/pom.xml index b03488e2f..acaa0274d 100644 --- a/controlloop/common/controller-usecases/pom.xml +++ b/controlloop/common/controller-usecases/pom.xml @@ -27,7 +27,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>controller-usecases</artifactId> diff --git a/controlloop/common/coordination/pom.xml b/controlloop/common/coordination/pom.xml index e540f2b51..f823ce01d 100644 --- a/controlloop/common/coordination/pom.xml +++ b/controlloop/common/coordination/pom.xml @@ -24,7 +24,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>coordination</artifactId> diff --git a/controlloop/common/database/pom.xml b/controlloop/common/database/pom.xml index e202da76e..5a3f62271 100644 --- a/controlloop/common/database/pom.xml +++ b/controlloop/common/database/pom.xml @@ -24,7 +24,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>database</artifactId> diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml index dbf701fa5..a535724af 100644 --- a/controlloop/common/eventmanager/pom.xml +++ b/controlloop/common/eventmanager/pom.xml @@ -27,7 +27,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>eventmanager</artifactId> diff --git a/controlloop/common/feature-controlloop-frankfurt/pom.xml b/controlloop/common/feature-controlloop-frankfurt/pom.xml index f10cd2b3a..0150a782e 100644 --- a/controlloop/common/feature-controlloop-frankfurt/pom.xml +++ b/controlloop/common/feature-controlloop-frankfurt/pom.xml @@ -24,7 +24,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-frankfurt</artifactId> 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> diff --git a/controlloop/common/feature-controlloop-trans/pom.xml b/controlloop/common/feature-controlloop-trans/pom.xml index 02489b360..52de10954 100644 --- a/controlloop/common/feature-controlloop-trans/pom.xml +++ b/controlloop/common/feature-controlloop-trans/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-trans</artifactId> diff --git a/controlloop/common/feature-controlloop-usecases/pom.xml b/controlloop/common/feature-controlloop-usecases/pom.xml index 1e17d98a1..af4ccfb5d 100644 --- a/controlloop/common/feature-controlloop-usecases/pom.xml +++ b/controlloop/common/feature-controlloop-usecases/pom.xml @@ -25,7 +25,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-usecases</artifactId> diff --git a/controlloop/common/feature-controlloop-utils/pom.xml b/controlloop/common/feature-controlloop-utils/pom.xml index 670cba37d..9968ae409 100644 --- a/controlloop/common/feature-controlloop-utils/pom.xml +++ b/controlloop/common/feature-controlloop-utils/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-utils</artifactId> diff --git a/controlloop/common/guard/pom.xml b/controlloop/common/guard/pom.xml index 001325da4..a6a96ae57 100644 --- a/controlloop/common/guard/pom.xml +++ b/controlloop/common/guard/pom.xml @@ -24,7 +24,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>guard</artifactId> diff --git a/controlloop/common/pom.xml b/controlloop/common/pom.xml index 29690047d..c5f4b00c8 100644 --- a/controlloop/common/pom.xml +++ b/controlloop/common/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.drools-applications.controlloop</groupId> <artifactId>controlloop</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>1.6.1-SNAPSHOT</version> </parent> <groupId>org.onap.policy.drools-applications.controlloop.common</groupId> diff --git a/controlloop/common/rules-test/pom.xml b/controlloop/common/rules-test/pom.xml index 8b24f29a0..7deb6e1e1 100644 --- a/controlloop/common/rules-test/pom.xml +++ b/controlloop/common/rules-test/pom.xml @@ -25,7 +25,7 @@ <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>rules-test</artifactId> |