From: Jim Hahn <jrh3@att.com>
Date: Thu, 16 Apr 2020 16:46:50 +0000 (-0400)
Subject: Fix CDS actor properties
X-Git-Tag: 1.6.2~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=285a25b09d599384051752d2c233461d0e07fc13;p=policy%2Fdrools-applications.git

Fix CDS actor properties

CDS actor properties in drools-apps did not match the properties
in the actor, itself.  Fixed them (as best I could be inspection).

Issue-ID: POLICY-2501
Change-Id: Ibb4ac5ee59762bd740342c1d54fc472a9fca8968
Signed-off-by: Jim Hahn <jrh3@att.com>
---

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 384346e84..e4c8fdc59 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
@@ -51,13 +51,11 @@ actor.service.APPC.operations.Rebuild.placeholder=
 actor.service.APPC.operations.ModifyConfig.sinkTopic=APPC-CL
 actor.service.APPC.operations.ModifyConfig.sourceTopic=APPC-CL
 
-actor.service.CDS.clientName=CDS
-actor.service.CDS.grpcHost=localhost
-actor.service.CDS.grpcPort=7878
-actor.service.CDS.grpcUsername=grpc-username
-actor.service.CDS.grpcPassword=grpc-password
-actor.service.CDS.grpcTimeout=10
-actor.service.CDS.operations.xxx.yyy=
+actor.service.CDS.gRPC.host=localhost
+actor.service.CDS.gRPC.port=7878
+actor.service.CDS.gRPC.username=grpc-username
+actor.service.CDS.gRPC.password=grpc-password
+actor.service.CDS.gRPC.timeout=10
 
 actor.service.SDNC.clientName=SDNC
 actor.service.SDNC.operations.BandwidthOnDemand.path=\
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 8d770d717..5774a31a4 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
@@ -52,13 +52,11 @@ actor.service.APPC.operations.Rebuild.placeholder=
 actor.service.APPC.operations.ModifyConfig.sinkTopic=APPC-CL
 actor.service.APPC.operations.ModifyConfig.sourceTopic=APPC-CL
 
-actor.service.CDS.clientName=CDS
-actor.service.CDS.grpcHost=${envd:CDS_GRPC_HOST:}
-actor.service.CDS.grpcPort=${envd:CDS_GRPC_PORT:}
-actor.service.CDS.grpcUsername=${envd:CDS_GRPC_USERNAME:}
-actor.service.CDS.grpcPassword=${envd:CDS_GRPC_PASSWORD:}
-actor.service.CDS.grpcTimeout=10
-actor.service.CDS.operations.gRPC.placeholder=
+actor.service.CDS.gRPC.host=${envd:CDS_GRPC_HOST:}
+actor.service.CDS.gRPC.port=${envd:CDS_GRPC_PORT:}
+actor.service.CDS.gRPC.username=${envd:CDS_GRPC_USERNAME:}
+actor.service.CDS.gRPC.password=${envd:CDS_GRPC_PASSWORD:}
+actor.service.CDS.gRPC.timeout=10
 
 actor.service.SDNC.clientName=SDNC
 actor.service.SDNC.operations.BandwidthOnDemand.path=\
diff --git a/pom.xml b/pom.xml
index 6a0085d02..c17ed348e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 
         <!-- Project common dependency versions -->
         <version.policy.common>1.6.4</version.policy.common>
-        <policy.models.version>2.2.4</policy.models.version>
+        <policy.models.version>2.2.5-SNAPSHOT</policy.models.version>
         <version.policy.drools-pdp>1.6.1</version.policy.drools-pdp>
     </properties>