From 304afadb59bdc83c25df315dbf16bd217b0ba5de Mon Sep 17 00:00:00 2001 From: Chenfei Gao Date: Tue, 12 Nov 2019 22:29:37 -0500 Subject: Added changes to make the list of preloaded policy types configurable Issue-ID: POLICY-2210 Change-Id: I84b512a783c1fdc0834cf79bdce4c48a7803b884 Signed-off-by: Chenfei Gao --- .../resources/parameters/ApiConfigParameters.json | 22 +++++++++++++++++++++- .../parameters/ApiConfigParameters_Https.json | 22 +++++++++++++++++++++- .../ApiConfigParameters_InvalidName.json | 3 ++- ...nfigParameters_InvalidRestServerParameters.json | 3 ++- .../resources/parameters/MinimumParameters.json | 5 +++-- .../test/resources/parameters/NoParameters.json | 3 ++- 6 files changed, 51 insertions(+), 7 deletions(-) (limited to 'main/src/test/resources/parameters') diff --git a/main/src/test/resources/parameters/ApiConfigParameters.json b/main/src/test/resources/parameters/ApiConfigParameters.json index be9f5811..91e304fe 100644 --- a/main/src/test/resources/parameters/ApiConfigParameters.json +++ b/main/src/test/resources/parameters/ApiConfigParameters.json @@ -14,5 +14,25 @@ "databaseUser": "policy", "databasePassword": "UDAxaWNZ", "persistenceUnit": "ToscaConceptTest" - } + }, + "preloadPolicyTypes": [ + "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml", + "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml", + "policytypes/onap.policies.Optimization.yaml", + "policytypes/onap.policies.optimization.AffinityPolicy.yaml", + "policytypes/onap.policies.optimization.DistancePolicy.yaml", + "policytypes/onap.policies.optimization.HpaPolicy.yaml", + "policytypes/onap.policies.optimization.OptimizationPolicy.yaml", + "policytypes/onap.policies.optimization.PciPolicy.yaml", + "policytypes/onap.policies.optimization.QueryPolicy.yaml", + "policytypes/onap.policies.optimization.SubscriberPolicy.yaml", + "policytypes/onap.policies.optimization.Vim_fit.yaml", + "policytypes/onap.policies.optimization.VnfPolicy.yaml", + "policytypes/onap.policies.controlloop.guard.Blacklist.yaml", + "policytypes/onap.policies.controlloop.guard.FrequencyLimiter.yaml", + "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" + ] } diff --git a/main/src/test/resources/parameters/ApiConfigParameters_Https.json b/main/src/test/resources/parameters/ApiConfigParameters_Https.json index d7774fcd..e4b2b6d6 100644 --- a/main/src/test/resources/parameters/ApiConfigParameters_Https.json +++ b/main/src/test/resources/parameters/ApiConfigParameters_Https.json @@ -15,5 +15,25 @@ "databaseUser": "policy", "databasePassword": "UDAxaWNZ", "persistenceUnit": "ToscaConceptTest" - } + }, + "preloadPolicyTypes": [ + "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml", + "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml", + "policytypes/onap.policies.Optimization.yaml", + "policytypes/onap.policies.optimization.AffinityPolicy.yaml", + "policytypes/onap.policies.optimization.DistancePolicy.yaml", + "policytypes/onap.policies.optimization.HpaPolicy.yaml", + "policytypes/onap.policies.optimization.OptimizationPolicy.yaml", + "policytypes/onap.policies.optimization.PciPolicy.yaml", + "policytypes/onap.policies.optimization.QueryPolicy.yaml", + "policytypes/onap.policies.optimization.SubscriberPolicy.yaml", + "policytypes/onap.policies.optimization.Vim_fit.yaml", + "policytypes/onap.policies.optimization.VnfPolicy.yaml", + "policytypes/onap.policies.controlloop.guard.Blacklist.yaml", + "policytypes/onap.policies.controlloop.guard.FrequencyLimiter.yaml", + "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" + ] } diff --git a/main/src/test/resources/parameters/ApiConfigParameters_InvalidName.json b/main/src/test/resources/parameters/ApiConfigParameters_InvalidName.json index 24cc69f3..1a539cf6 100644 --- a/main/src/test/resources/parameters/ApiConfigParameters_InvalidName.json +++ b/main/src/test/resources/parameters/ApiConfigParameters_InvalidName.json @@ -13,5 +13,6 @@ "databaseUser": "policy", "databasePassword": "UDAxaWNZ", "persistenceUnit": "ToscaConceptTest" - } + }, + "preloadPolicyTypes": [] } diff --git a/main/src/test/resources/parameters/ApiConfigParameters_InvalidRestServerParameters.json b/main/src/test/resources/parameters/ApiConfigParameters_InvalidRestServerParameters.json index 339c20b6..daf9c749 100644 --- a/main/src/test/resources/parameters/ApiConfigParameters_InvalidRestServerParameters.json +++ b/main/src/test/resources/parameters/ApiConfigParameters_InvalidRestServerParameters.json @@ -14,5 +14,6 @@ "databaseUser": "policy", "databasePassword": "UDAxaWNZ", "persistenceUnit": "ToscaConceptTest" - } + }, + "preloadPolicyTypes": [] } diff --git a/main/src/test/resources/parameters/MinimumParameters.json b/main/src/test/resources/parameters/MinimumParameters.json index 8ac10805..4b2db7af 100644 --- a/main/src/test/resources/parameters/MinimumParameters.json +++ b/main/src/test/resources/parameters/MinimumParameters.json @@ -14,5 +14,6 @@ "databaseUser": "policy", "databasePassword": "UDAxaWNZ", "persistenceUnit": "ToscaConceptTest" - } -} + }, + "preloadPolicyTypes": [] +} \ No newline at end of file diff --git a/main/src/test/resources/parameters/NoParameters.json b/main/src/test/resources/parameters/NoParameters.json index 6f933890..091900c9 100644 --- a/main/src/test/resources/parameters/NoParameters.json +++ b/main/src/test/resources/parameters/NoParameters.json @@ -13,5 +13,6 @@ "databaseUser": "policy", "databasePassword": "UDAxaWNZ", "persistenceUnit": "ToscaConceptTest" - } + }, + "preloadPolicyTypes": [] } \ No newline at end of file -- cgit 1.2.3-korg