Adjust properties in anticipation of actor changes

Issue-ID: POLICY-2632
Change-Id: I4d20fe6b46432298ba796fe978796d5d74e1eb14
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 b55d16c..ac78eb8 100644 (file)
--- a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties
+++ b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties
@@ -69,15 +69,24 @@ actor.service.SDNR.sourceTopic=SDNR-CL-RSP
 actor.service.SDNR.operations.any.placeholder=
 
 actor.service.SO.clientName=SO
-actor.service.SO.pathGet=orchestrationRequests/v5/
-actor.service.SO.maxGets=20
-actor.service.SO.waitSecGet=20
+actor.service.SO.pollPath=orchestrationRequests/v5/
+actor.service.SO.maxPolls=20
+actor.service.SO.pollWaitSec=20
 actor.service.SO.operations.VF\ Module\ Create.path=serviceInstantiation/v7/serviceInstances
 actor.service.SO.operations.VF\ Module\ Delete.path=serviceInstances/v7
 
+actor.service.VFC.clientName=VFC
+actor.service.VFC.pollPath=jobs
+actor.service.VFC.maxPolls=20
+actor.service.VFC.pollWaitSec=20
+actor.service.VFC.operations.Restart.path=ns
+actor.service.VFC.operations.Restart.timeoutSec=60
+
+# these can be deleted once the corresponding actor review is merged
+actor.service.SO.pathGet=orchestrationRequests/v5/
+actor.service.SO.maxGets=20
+actor.service.SO.waitSecGet=20
 actor.service.VFC.operations.Restart.clientName=VFC
 actor.service.VFC.operations.Restart.pathGet=jobs
 actor.service.VFC.operations.Restart.maxGets=20
 actor.service.VFC.operations.Restart.waitSecGet=20
-actor.service.VFC.operations.Restart.path=ns
-actor.service.VFC.operations.Restart.timeoutSec=60

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 08d761d..f1afd25 100644 (file)
--- 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
@@ -70,15 +70,24 @@ actor.service.SDNR.sourceTopic=SDNR-CL-RSP
 actor.service.SDNR.operations.any.placeholder=
 
 actor.service.SO.clientName=SO
-actor.service.SO.pathGet=orchestrationRequests/v5/
-actor.service.SO.maxGets=20
-actor.service.SO.waitSecGet=20
+actor.service.SO.pollPath=orchestrationRequests/v5/
+actor.service.SO.maxPolls=20
+actor.service.SO.pollWaitSec=20
 actor.service.SO.operations.VF\ Module\ Create.path=serviceInstantiation/v7/serviceInstances
 actor.service.SO.operations.VF\ Module\ Delete.path=serviceInstances/v7
 
+actor.service.VFC.clientName=VFC
+actor.service.VFC.pollPath=jobs
+actor.service.VFC.maxPolls=20
+actor.service.VFC.pollWaitSec=20
+actor.service.VFC.operations.Restart.path=ns
+actor.service.VFC.operations.Restart.timeoutSec=60
+
+# these can be deleted once the corresponding actor review is merged
+actor.service.SO.pathGet=orchestrationRequests/v5/
+actor.service.SO.maxGets=20
+actor.service.SO.waitSecGet=20
 actor.service.VFC.operations.Restart.clientName=VFC
 actor.service.VFC.operations.Restart.pathGet=jobs
 actor.service.VFC.operations.Restart.maxGets=20
 actor.service.VFC.operations.Restart.waitSecGet=20
-actor.service.VFC.operations.Restart.path=ns
-actor.service.VFC.operations.Restart.timeoutSec=60