From 933fa8c00351f1c58e4381d7ac488e5637dad140 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 1 Nov 2018 09:15:41 -0400 Subject: Changed actor from "MSO" to "SO" Also added "VF Module Delete" to the list of recipes for "SO" accepted by the compiler. Removed "AOTS" and "SDNO" from the list of accepted actors, as code does not exist for those actors. Update remaining actors and recipes. Left "AAI" in the list for now, though it has no recipes listed (and no actor.aai code). Also removed "AAI" from the list of accepted actors. Change-Id: I9db56715d8bea3cf86d2112df1e0086777863192 Issue-ID: POLICY-1239 Signed-off-by: Jim Hahn (cherry picked from commit af77c268e44da5c6e170a502b7252e5d2ac80727) --- .../controlloop/compiler/ControlLoopCompiler.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/controlloop/common/policy-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java b/controlloop/common/policy-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java index f18752a62..d3d8a0272 100644 --- a/controlloop/common/policy-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java +++ b/controlloop/common/policy-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java @@ -405,7 +405,7 @@ public class ControlLoopCompiler implements Serializable { // // Construct a list for all valid actors // - ImmutableList actors = ImmutableList.of("APPC", "AOTS", "MSO", "SDNO", "SDNR", "AAI"); + ImmutableList actors = ImmutableList.of("APPC", "SDNC", "SDNR", "SO", "VFC"); // if (operPolicy.getActor() != null && (!actors.contains(operPolicy.getActor())) ) { if (callback != null) { @@ -429,18 +429,10 @@ public class ControlLoopCompiler implements Serializable { // ImmutableMap> recipes = new ImmutableMap.Builder>() .put("APPC", ImmutableList.of("Restart", "Rebuild", "Migrate", "ModifyConfig")) - .put("AOTS", ImmutableList.of("checkMaintenanceWindow", - "checkENodeBTicketHours", - "checkEquipmentStatus", - "checkEimStatus", - "checkEquipmentMaintenance")) - .put("MSO", ImmutableList.of("VF Module Create")) - .put("SDNO", ImmutableList.of("health-diagnostic-type", - "health-diagnostic", - "health-diagnostic-history", - "health-diagnostic-commands", - "health-diagnostic-aes")) - .put("SDNR", ImmutableList.of("Restart", "Reboot")) + .put("SDNC", ImmutableList.of("Reroute")) + .put("SDNR", ImmutableList.of("ModifyConfig")) + .put("SO", ImmutableList.of("VF Module Create", "VF Module Delete")) + .put("VFC", ImmutableList.of("Restart")) .build(); // if (operPolicy.getRecipe() != null -- cgit 1.2.3-korg