Preload control loop coordination type in API

Modified json based on input from Chenfei.

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

diff --git a/main/src/main/java/org/onap/policy/api/main/startstop/ApiDatabaseInitializer.java b/main/src/main/java/org/onap/policy/api/main/startstop/ApiDatabaseInitializer.java
index 27fc83a..ad82d4b 100644 (file)
--- a/main/src/main/java/org/onap/policy/api/main/startstop/ApiDatabaseInitializer.java
+++ b/main/src/main/java/org/onap/policy/api/main/startstop/ApiDatabaseInitializer.java
@@ -64,6 +64,7 @@ public class ApiDatabaseInitializer {
         "preloadedPolicyTypes/onap.policies.controlloop.guard.Blacklist.json",
         "preloadedPolicyTypes/onap.policies.controlloop.guard.FrequencyLimiter.json",
         "preloadedPolicyTypes/onap.policies.controlloop.guard.MinMax.json",
+        "preloadedPolicyTypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.json",
         "preloadedPolicyTypes/onap.policies.controlloop.Operational.json"
     };
 

diff --git a/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.Blacklist.json b/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.Blacklist.json
index 9391496..cc59ca4 100644 (file)
--- a/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.Blacklist.json
+++ b/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.Blacklist.json
@@ -37,7 +37,7 @@
                },
                "recipe": {
                   "type": "string",
-                  "description": "Specified the Recipe",
+                  "description": "Specifies the Recipe",
                   "required": true
                },
                "time_range": {

diff --git a/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.FrequencyLimiter.json b/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.FrequencyLimiter.json
index 598bd3c..d0e50b7 100644 (file)
--- a/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.FrequencyLimiter.json
+++ b/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.FrequencyLimiter.json
@@ -37,7 +37,7 @@
                },
                "recipe": {
                   "type": "string",
-                  "description": "Specified the Recipe",
+                  "description": "Specifies the Recipe",
                   "required": true
                },
                "time_window": {

diff --git a/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.MinMax.json b/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.MinMax.json
index 71658dd..c9ea671 100644 (file)
--- a/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.MinMax.json
+++ b/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.MinMax.json
@@ -36,7 +36,7 @@
                },
                "recipe": {
                   "type": "string",
-                  "description": "Specified the Recipe",
+                  "description": "Specifies the Recipe",
                   "required": true
                },
                "time_range": {

diff --git a/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.json b/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.json
new file mode 100644 (file)
index 0000000..43539d0
--- /dev/null
+++ b/main/src/main/resources/preloadedPolicyTypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.json
@@ -0,0 +1,38 @@
+{
+    "policy_types": [
+        {
+            "onap.policies.controlloop.Guard": {
+                "derived_from": "tosca.policies.Root",
+                "version": "1.0.0",
+                "description": "Guard Policies for Control Loop Operational Policies"
+            }
+        },
+        {
+            "onap.policies.controlloop.guard.Coordination": {
+                "derived_from": "onap.policies.controlloop.Guard",
+                "version": "1.0.0",
+                "description": "Guard Policies for Control Loop Coordination"
+            }
+        },
+        {
+            "onap.policies.controlloop.guard.coordination.FirstBlocksSecond": {
+                "derived_from": "onap.policies.controlloop.guard.Coordination",
+                "version": "1.0.0",
+                "description": "Supports one Control Loop blocking another",
+                "properties": {
+                    "controlLoop": {
+                        "type": "list",
+                        "description": "Specific Control Loops to which to apply this guard",
+                        "required": true,
+                        "constraint": {
+                            "length": 2
+                        },
+                        "entry_schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        }
+    ]
+}
\ No newline at end of file

diff --git a/main/src/test/java/org/onap/policy/api/main/startstop/TestApiCommandLineArguments.java b/main/src/test/java/org/onap/policy/api/main/startstop/TestApiCommandLineArguments.java
index 7350369..bf728dd 100644 (file)
--- a/main/src/test/java/org/onap/policy/api/main/startstop/TestApiCommandLineArguments.java
+++ b/main/src/test/java/org/onap/policy/api/main/startstop/TestApiCommandLineArguments.java
@@ -43,7 +43,7 @@ public class TestApiCommandLineArguments {
     @Test(expected = PolicyApiRuntimeException.class)
     public void testApiCommandLineArgumentsStringArray() {
         String [] args = {"---d"};
-        ApiCommandLineArguments apiCmdArgs1 = new ApiCommandLineArguments(args);
+        new ApiCommandLineArguments(args);
     }
 
     @Test