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 <jrh3@att.com>

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 f18752a..d3d8a02 100644 (file)
--- 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<String> actors = ImmutableList.of("APPC", "AOTS", "MSO", "SDNO", "SDNR", "AAI");
+        ImmutableList<String> 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<String, List<String>> recipes = new ImmutableMap.Builder<String, List<String>>()
                 .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