From 6f904473b5c75947d870fad1a67a23aaf236d241 Mon Sep 17 00:00:00 2001 From: Chenfei Gao Date: Mon, 25 Nov 2019 11:22:38 -0500 Subject: [PATCH] Preload the policy types for native policies Issue-ID: POLICY-2212, POLICY-2213 Change-Id: I03be8132699b5af9ea60a06cb0e1332c05886ad9 Signed-off-by: Chenfei Gao --- .../test/java/org/onap/policy/api/main/rest/TestApiRestServer.java | 4 ++-- main/src/test/resources/parameters/ApiConfigParameters.json | 5 ++++- main/src/test/resources/parameters/ApiConfigParameters_Https.json | 5 ++++- .../policy-api-tarball/src/main/resources/etc/defaultConfig.json | 5 ++++- packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json | 5 ++++- 5 files changed, 18 insertions(+), 6 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" ] } diff --git a/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json b/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json index 8cca7cda..1e8d0d00 100644 --- a/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json +++ b/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json @@ -35,6 +35,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/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json b/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json index 7c6da000..9bd23f2a 100644 --- a/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json +++ b/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json @@ -35,6 +35,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" ] } \ No newline at end of file -- 2.16.6