From 5f919673b13d8fd40a6a90b97f4e662ade068304 Mon Sep 17 00:00:00 2001 From: Rashmi Pujar Date: Fri, 4 Feb 2022 21:49:30 -0500 Subject: Migrate policy api startup & config, controller to springboot Issue-ID: POLICY-3753 Signed-off-by: Rashmi Pujar Change-Id: I4537ed49b7fc57683bfc487f0d212642b7e69f17 --- main/src/test/resources/application-test.yaml | 8 ++++ main/src/test/resources/logback-test.xml | 53 -------------------- .../parameters/ApiConfigParameters_Https.json | 56 ---------------------- .../ApiConfigParameters_InvalidName.json | 19 -------- ...nfigParameters_InvalidRestServerParameters.json | 20 -------- .../parameters/ApiConfigParameters_Postgres.json | 56 ---------------------- .../test/resources/parameters/BadParameters.json | 3 -- .../test/resources/parameters/EmptyParameters.json | 0 .../resources/parameters/InvalidParameters.json | 3 -- .../resources/parameters/MinimumParameters.json | 20 -------- .../test/resources/parameters/NoParameters.json | 19 -------- .../resources/parameters/RestServerParameters.json | 6 --- .../parameters/RestServerParametersEmpty.json | 2 - 13 files changed, 8 insertions(+), 257 deletions(-) create mode 100644 main/src/test/resources/application-test.yaml delete mode 100644 main/src/test/resources/logback-test.xml delete mode 100644 main/src/test/resources/parameters/ApiConfigParameters_Https.json delete mode 100644 main/src/test/resources/parameters/ApiConfigParameters_InvalidName.json delete mode 100644 main/src/test/resources/parameters/ApiConfigParameters_InvalidRestServerParameters.json delete mode 100644 main/src/test/resources/parameters/ApiConfigParameters_Postgres.json delete mode 100644 main/src/test/resources/parameters/BadParameters.json delete mode 100644 main/src/test/resources/parameters/EmptyParameters.json delete mode 100644 main/src/test/resources/parameters/InvalidParameters.json delete mode 100644 main/src/test/resources/parameters/MinimumParameters.json delete mode 100644 main/src/test/resources/parameters/NoParameters.json delete mode 100644 main/src/test/resources/parameters/RestServerParameters.json delete mode 100644 main/src/test/resources/parameters/RestServerParametersEmpty.json (limited to 'main/src/test/resources') diff --git a/main/src/test/resources/application-test.yaml b/main/src/test/resources/application-test.yaml new file mode 100644 index 00000000..240d3640 --- /dev/null +++ b/main/src/test/resources/application-test.yaml @@ -0,0 +1,8 @@ +database: + name: PolicyProviderParameterGroup + implementation: org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl + driver: org.h2.Driver + url: jdbc:h2:mem:testdb + user: policy_user + password: policy_user + persistenceUnit: ToscaConceptTest \ No newline at end of file diff --git a/main/src/test/resources/logback-test.xml b/main/src/test/resources/logback-test.xml deleted file mode 100644 index 88187371..00000000 --- a/main/src/test/resources/logback-test.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - policy-api - - - - - - %d %contextName [%t] %level %logger{36} - %msg%n - - - - - - - - - - - - - - - - - - - - - - - diff --git a/main/src/test/resources/parameters/ApiConfigParameters_Https.json b/main/src/test/resources/parameters/ApiConfigParameters_Https.json deleted file mode 100644 index 1d33e2ec..00000000 --- a/main/src/test/resources/parameters/ApiConfigParameters_Https.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "name":"ApiGroup", - "restServerParameters":{ - "host":"0.0.0.0", - "port":6969, - "userName":"policyadmin", - "password":"zb!XztG34", - "https":true - }, - "databaseProviderParameters": { - "name": "PolicyProviderParameterGroup", - "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl", - "databaseDriver": "org.h2.Driver", - "databaseUrl": "jdbc:h2:mem:testdb", - "databaseUser": "policy", - "databasePassword": "UDAxaWNZ", - "persistenceUnit": "ToscaConceptTest" - }, - "preloadPolicyTypes": [ - "policytypes/onap.policies.monitoring.tcagen2.yaml", - "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml", - "policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml", - "policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml", - "policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml", - "policytypes/onap.policies.Optimization.yaml", - "policytypes/onap.policies.optimization.Resource.yaml", - "policytypes/onap.policies.optimization.Service.yaml", - "policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml", - "policytypes/onap.policies.optimization.resource.DistancePolicy.yaml", - "policytypes/onap.policies.optimization.resource.HpaPolicy.yaml", - "policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml", - "policytypes/onap.policies.optimization.resource.PciPolicy.yaml", - "policytypes/onap.policies.optimization.service.QueryPolicy.yaml", - "policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml", - "policytypes/onap.policies.optimization.resource.Vim_fit.yaml", - "policytypes/onap.policies.optimization.resource.VnfPolicy.yaml", - "policytypes/onap.policies.controlloop.guard.Common.yaml", - "policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml", - "policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml", - "policytypes/onap.policies.controlloop.guard.common.MinMax.yaml", - "policytypes/onap.policies.controlloop.guard.common.Filter.yaml", - "policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml", - "policytypes/onap.policies.controlloop.Operational.yaml", - "policytypes/onap.policies.Naming.yaml", - "policytypes/onap.policies.Match.yaml", - "policytypes/onap.policies.native.Drools.yaml", - "policytypes/onap.policies.native.Xacml.yaml", - "policytypes/onap.policies.native.Apex.yaml", - "policytypes/onap.policies.controlloop.operational.Common.yaml", - "policytypes/onap.policies.controlloop.operational.common.Apex.yaml", - "policytypes/onap.policies.controlloop.operational.common.Drools.yaml" - ], - "preloadPolicies" : [ - "policies/sdnc.policy.naming.input.tosca.yaml" - ] -} diff --git a/main/src/test/resources/parameters/ApiConfigParameters_InvalidName.json b/main/src/test/resources/parameters/ApiConfigParameters_InvalidName.json deleted file mode 100644 index 832035ec..00000000 --- a/main/src/test/resources/parameters/ApiConfigParameters_InvalidName.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name":" ", - "restServerParameters":{ - "host":"0.0.0.0", - "port":6969, - "userName":"policyadmin", - "password":"zb!XztG34" - }, - "databaseProviderParameters": { - "name": "PolicyProviderParameterGroup", - "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl", - "databaseUrl": "jdbc:h2:mem:testdb", - "databaseUser": "policy", - "databasePassword": "UDAxaWNZ", - "persistenceUnit": "ToscaConceptTest" - }, - "preloadPolicyTypes": [], - "preloadPolicies": [] -} diff --git a/main/src/test/resources/parameters/ApiConfigParameters_InvalidRestServerParameters.json b/main/src/test/resources/parameters/ApiConfigParameters_InvalidRestServerParameters.json deleted file mode 100644 index 4e9083ec..00000000 --- a/main/src/test/resources/parameters/ApiConfigParameters_InvalidRestServerParameters.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name":"ApiGroup", - "restServerParameters":{ - "host":"", - "port":-1, - "userName":"", - "password":"" - }, - "databaseProviderParameters": { - "name": "PolicyProviderParameterGroup", - "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl", - "databaseDriver": "org.h2.Driver", - "databaseUrl": "jdbc:h2:mem:testdb", - "databaseUser": "policy", - "databasePassword": "UDAxaWNZ", - "persistenceUnit": "ToscaConceptTest" - }, - "preloadPolicyTypes": [], - "preloadPolicies": [] -} diff --git a/main/src/test/resources/parameters/ApiConfigParameters_Postgres.json b/main/src/test/resources/parameters/ApiConfigParameters_Postgres.json deleted file mode 100644 index e5c375a0..00000000 --- a/main/src/test/resources/parameters/ApiConfigParameters_Postgres.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "name":"ApiGroup", - "restServerParameters":{ - "host":"0.0.0.0", - "port":6968, - "userName":"healthcheck", - "password":"zb!XztG34", - "https":false - }, - "databaseProviderParameters": { - "name": "PolicyProviderParameterGroup", - "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl", - "databaseDriver": "org.postgresql.Driver", - "databaseUrl": "jdbc:postgresql://localhost:5432/policyadmin", - "databaseUser": "policy_user", - "databasePassword": "policy_user", - "persistenceUnit": "PolicyDb" - }, - "preloadPolicyTypes": [ - "policytypes/onap.policies.monitoring.tcagen2.yaml", - "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml", - "policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml", - "policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml", - "policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml", - "policytypes/onap.policies.Optimization.yaml", - "policytypes/onap.policies.optimization.Resource.yaml", - "policytypes/onap.policies.optimization.Service.yaml", - "policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml", - "policytypes/onap.policies.optimization.resource.DistancePolicy.yaml", - "policytypes/onap.policies.optimization.resource.HpaPolicy.yaml", - "policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml", - "policytypes/onap.policies.optimization.resource.PciPolicy.yaml", - "policytypes/onap.policies.optimization.service.QueryPolicy.yaml", - "policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml", - "policytypes/onap.policies.optimization.resource.Vim_fit.yaml", - "policytypes/onap.policies.optimization.resource.VnfPolicy.yaml", - "policytypes/onap.policies.controlloop.guard.Common.yaml", - "policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml", - "policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml", - "policytypes/onap.policies.controlloop.guard.common.MinMax.yaml", - "policytypes/onap.policies.controlloop.guard.common.Filter.yaml", - "policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml", - "policytypes/onap.policies.controlloop.Operational.yaml", - "policytypes/onap.policies.Naming.yaml", - "policytypes/onap.policies.Match.yaml", - "policytypes/onap.policies.native.Drools.yaml", - "policytypes/onap.policies.native.Xacml.yaml", - "policytypes/onap.policies.native.Apex.yaml", - "policytypes/onap.policies.controlloop.operational.Common.yaml", - "policytypes/onap.policies.controlloop.operational.common.Apex.yaml", - "policytypes/onap.policies.controlloop.operational.common.Drools.yaml" - ], - "preloadPolicies" : [ - "policies/sdnc.policy.naming.input.tosca.yaml" - ] -} diff --git a/main/src/test/resources/parameters/BadParameters.json b/main/src/test/resources/parameters/BadParameters.json deleted file mode 100644 index de2040cc..00000000 --- a/main/src/test/resources/parameters/BadParameters.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name" : [] -} \ No newline at end of file diff --git a/main/src/test/resources/parameters/EmptyParameters.json b/main/src/test/resources/parameters/EmptyParameters.json deleted file mode 100644 index e69de29b..00000000 diff --git a/main/src/test/resources/parameters/InvalidParameters.json b/main/src/test/resources/parameters/InvalidParameters.json deleted file mode 100644 index de2040cc..00000000 --- a/main/src/test/resources/parameters/InvalidParameters.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name" : [] -} \ No newline at end of file diff --git a/main/src/test/resources/parameters/MinimumParameters.json b/main/src/test/resources/parameters/MinimumParameters.json deleted file mode 100644 index 5d671d2f..00000000 --- a/main/src/test/resources/parameters/MinimumParameters.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name":"ApiGroup", - "restServerParameters":{ - "host":"0.0.0.0", - "port":6969, - "userName":"policyadmin", - "password":"zb!XztG34" - }, - "databaseProviderParameters": { - "name": "PolicyProviderParameterGroup", - "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl", - "databaseDriver": "org.h2.Driver", - "databaseUrl": "jdbc:h2:mem:testdb", - "databaseUser": "policy", - "databasePassword": "UDAxaWNZ", - "persistenceUnit": "ToscaConceptTest" - }, - "preloadPolicyTypes": [], - "preloadPolicies": [] -} \ No newline at end of file diff --git a/main/src/test/resources/parameters/NoParameters.json b/main/src/test/resources/parameters/NoParameters.json deleted file mode 100644 index 36e33afb..00000000 --- a/main/src/test/resources/parameters/NoParameters.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "restServerParameters":{ - "host":"0.0.0.0", - "port":6969, - "userName":"policyadmin", - "password":"zb!XztG34" - }, - "databaseProviderParameters": { - "name": "PolicyProviderParameterGroup", - "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl", - "databaseDriver": "org.h2.Driver", - "databaseUrl": "jdbc:h2:mem:testdb", - "databaseUser": "policy", - "databasePassword": "UDAxaWNZ", - "persistenceUnit": "ToscaConceptTest" - }, - "preloadPolicyTypes": [], - "preloadPolicies": [] -} \ No newline at end of file diff --git a/main/src/test/resources/parameters/RestServerParameters.json b/main/src/test/resources/parameters/RestServerParameters.json deleted file mode 100644 index 8d3bc580..00000000 --- a/main/src/test/resources/parameters/RestServerParameters.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "host": "0.0.0.0", - "port": 6969, - "userName": "policyadmin", - "password": "zb!XztG34" -} diff --git a/main/src/test/resources/parameters/RestServerParametersEmpty.json b/main/src/test/resources/parameters/RestServerParametersEmpty.json deleted file mode 100644 index e02aef27..00000000 --- a/main/src/test/resources/parameters/RestServerParametersEmpty.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file -- cgit 1.2.3-korg