aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorChenfei Gao <cgao@research.att.com>2019-11-25 11:22:38 -0500
committerChenfei Gao <cgao@research.att.com>2019-11-25 11:24:16 -0500
commit6f904473b5c75947d870fad1a67a23aaf236d241 (patch)
tree4c0390c5bc74c1e08d3be6bef5f7f03eb4b04f83 /main
parentd9f395e503ed6cd01e7af3b0ee8cc0f360865c88 (diff)
Preload the policy types for native policies
Issue-ID: POLICY-2212, POLICY-2213 Change-Id: I03be8132699b5af9ea60a06cb0e1332c05886ad9 Signed-off-by: Chenfei Gao <cgao@research.att.com>
Diffstat (limited to 'main')
-rw-r--r--main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java4
-rw-r--r--main/src/test/resources/parameters/ApiConfigParameters.json5
-rw-r--r--main/src/test/resources/parameters/ApiConfigParameters_Https.json5
3 files changed, 10 insertions, 4 deletions
diff --git a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
index 359533ff..89dba391 100644
--- a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
+++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
@@ -704,7 +704,7 @@ public class TestApiRestServer {
Response rawResponse = readResource(POLICYTYPES, true, APP_JSON);
assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
- assertEquals(21, response.getPolicyTypes().size());
+ assertEquals(25, response.getPolicyTypes().size());
}
@Test
@@ -714,7 +714,7 @@ public class TestApiRestServer {
Response rawResponse = readResource(POLICYTYPES, true, APP_YAML);
assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
- assertEquals(21, response.getPolicyTypes().size());
+ assertEquals(25, response.getPolicyTypes().size());
}
@Test
diff --git a/main/src/test/resources/parameters/ApiConfigParameters.json b/main/src/test/resources/parameters/ApiConfigParameters.json
index 91e304fe..bfb02f1e 100644
--- a/main/src/test/resources/parameters/ApiConfigParameters.json
+++ b/main/src/test/resources/parameters/ApiConfigParameters.json
@@ -33,6 +33,9 @@
"policytypes/onap.policies.controlloop.guard.MinMax.yaml",
"policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml",
"policytypes/onap.policies.controlloop.Operational.yaml",
- "policytypes/onap.policies.Naming.yaml"
+ "policytypes/onap.policies.Naming.yaml",
+ "policytypes/onap.policies.drools.Controller.yaml",
+ "policytypes/onap.policies.native.Drools.yaml",
+ "policytypes/onap.policies.native.Xacml.yaml"
]
}
diff --git a/main/src/test/resources/parameters/ApiConfigParameters_Https.json b/main/src/test/resources/parameters/ApiConfigParameters_Https.json
index e4b2b6d6..d395e1fb 100644
--- a/main/src/test/resources/parameters/ApiConfigParameters_Https.json
+++ b/main/src/test/resources/parameters/ApiConfigParameters_Https.json
@@ -34,6 +34,9 @@
"policytypes/onap.policies.controlloop.guard.MinMax.yaml",
"policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml",
"policytypes/onap.policies.controlloop.Operational.yaml",
- "policytypes/onap.policies.Naming.yaml"
+ "policytypes/onap.policies.Naming.yaml",
+ "policytypes/onap.policies.drools.Controller.yaml",
+ "policytypes/onap.policies.native.Drools.yaml",
+ "policytypes/onap.policies.native.Xacml.yaml"
]
}