From b93f16723309cdc47f5de6b2840bc410657d41e7 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Thu, 4 Nov 2021 14:25:39 +0000 Subject: Rename user for API and PAP references. Use an account other than healthcheck in API and PAP for provisioning of policies. Issue-ID: POLICY-2744 Change-Id: I2d626276daba25d405be24cf81233ae848a8674e Signed-off-by: adheli.tavares --- .../src/main/resources/etc/defaultConfig.json | 4 ++-- .../src/main/resources/etc/s3pConfig.json | 4 ++-- .../lifecycle/api/LifecycleApiForwarderParametersTest.java | 6 +++--- .../forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java | 8 ++++---- .../distribution/forwarding/testclasses/CommonTestData.java | 5 +---- .../parameters/LifecycleApiPolicyForwarderParameters.json | 4 ++-- .../parameters/LifecycleApiPolicyForwarderParametersInvalid.json | 4 ++-- .../src/test/resources/parameters/RestServerParameters.json | 2 +- .../performance/src/main/resources/testplans/clearuppolicies.sh | 2 +- .../performance/src/main/resources/testplans/performance.jmx | 8 ++++---- .../main/resources/setup/config/jsonConfigs/apiConfigFile.json | 2 +- .../main/resources/setup/config/jsonConfigs/papConfigFile.json | 4 ++-- .../src/main/resources/setup/distribution/etc/defaultConfig.json | 4 ++-- testsuites/stability/src/main/resources/testplans/stability.jmx | 4 ++-- 14 files changed, 29 insertions(+), 32 deletions(-) diff --git a/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json b/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json index a9c9a136..bda3b11f 100644 --- a/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json +++ b/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json @@ -76,7 +76,7 @@ "hostname": "policy-api", "port": 6969, "useHttps": true, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "papParameters": { @@ -84,7 +84,7 @@ "hostname": "policy-pap", "port": 6969, "useHttps": true, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "deployPolicies": true diff --git a/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json b/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json index f293b98c..7059f5b4 100644 --- a/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json +++ b/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json @@ -55,7 +55,7 @@ "hostname": "policy-api", "port": 6969, "useHttps": true, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "papParameters": { @@ -63,7 +63,7 @@ "hostname": "policy-pap", "port": 6969, "useHttps": true, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "deployPolicies": true diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java index 04bcbeaf..6d4ab363 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,11 +39,11 @@ public class LifecycleApiForwarderParametersTest { private static final String POLICY_API_HOST_NAME = "0.0.0.0"; private static final int POLICY_API_PORT = 6969; - private static final String POLICY_API_USER = "healthcheck"; + private static final String POLICY_API_USER = "policyadmin"; private static final String POLICY_API_PASSWORD = "zb!XztG34"; private static final String POLICY_PAP_HOST_NAME = "0.0.0.0"; private static final int POLICY_PAP_PORT = 6969; - private static final String POLICY_PAP_USER = "healthcheck"; + private static final String POLICY_PAP_USER = "policyadmin"; private static final String POLICY_PAP_PASSWORD = "zb!XztG34"; diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java index d9b64ce2..759ec1d3 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2020 AT&T Inc. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -51,8 +51,8 @@ public class LifecycleApiPolicyForwarderTest { private static final String POLICY = "src/test/resources/parameters/sample_policy.json"; private static final String POLICY_ERROR = "src/test/resources/parameters/sample_policy_failure.json"; private static final String POLICY_TYPE = "src/test/resources/parameters/sample_policy_type.json"; - private StandardCoder standardCoder = new StandardCoder(); - private static LifecycleApiSimulatorMain simulator = new LifecycleApiSimulatorMain(); + private final StandardCoder standardCoder = new StandardCoder(); + private static final LifecycleApiSimulatorMain simulator = new LifecycleApiSimulatorMain(); /** * Set up. @@ -126,7 +126,7 @@ public class LifecycleApiPolicyForwarderTest { .hasMessageContaining("Failed forwarding the following entities:"); } - class UnsupportedPolicy extends ToscaEntity { + static class UnsupportedPolicy extends ToscaEntity { @Override public String getName() { diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/CommonTestData.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/CommonTestData.java index 72edc123..2273cec5 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/CommonTestData.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/CommonTestData.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,6 @@ package org.onap.policy.distribution.forwarding.testclasses; import java.io.File; -import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; @@ -32,8 +31,6 @@ import org.onap.policy.common.utils.coder.StandardCoder; */ public class CommonTestData { - public static final Coder coder = new StandardCoder(); - /** * Returns PolicyForwarderParameters for test cases. * diff --git a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json index ba6058b2..13e4d881 100644 --- a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json +++ b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json @@ -4,7 +4,7 @@ "hostname": "0.0.0.0", "port": 6969, "useHttps": false, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "papParameters": { @@ -12,7 +12,7 @@ "hostname": "0.0.0.0", "port": 6969, "useHttps": false, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "deployPolicies": true diff --git a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json index 88dd74ba..8ac97323 100644 --- a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json +++ b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json @@ -4,7 +4,7 @@ "hostname": "", "port": -1, "useHttps": false, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "papParameters": { @@ -12,7 +12,7 @@ "hostname": "", "port": -2, "useHttps": false, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "deployPolicies": true diff --git a/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json b/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json index 86aee276..8d3bc580 100644 --- a/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json +++ b/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json @@ -1,6 +1,6 @@ { "host": "0.0.0.0", "port": 6969, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" } diff --git a/testsuites/performance/src/main/resources/testplans/clearuppolicies.sh b/testsuites/performance/src/main/resources/testplans/clearuppolicies.sh index e9b4252a..875d1498 100755 --- a/testsuites/performance/src/main/resources/testplans/clearuppolicies.sh +++ b/testsuites/performance/src/main/resources/testplans/clearuppolicies.sh @@ -30,7 +30,7 @@ POLICY_PAP_PORT=$4 send_delete_request(){ ARG=$(echo $@ | sed 's/ //g') echo $ARG - curl -k -u 'healthcheck:zb!XztG34' -X DELETE "$ARG" + curl -k -u 'policyadmin:zb!XztG34' -X DELETE "$ARG" } COUNTER=1 diff --git a/testsuites/performance/src/main/resources/testplans/performance.jmx b/testsuites/performance/src/main/resources/testplans/performance.jmx index fbc3203b..530f1312 100644 --- a/testsuites/performance/src/main/resources/testplans/performance.jmx +++ b/testsuites/performance/src/main/resources/testplans/performance.jmx @@ -94,14 +94,14 @@ http://${PAP_HOST}:${PAP_PORT}/policy/pap/v1 - healthcheck + policyadmin zb!XztG34 http://${API_HOST}:${API_PORT}/policy/api/v1 - healthcheck + policyadmin zb!XztG34 @@ -498,14 +498,14 @@ http://${PAP_HOST}:${PAP_PORT}/policy/pap/v1 - healthcheck + policyadmin zb!XztG34 http://${API_HOST}:${API_PORT}/policy/api/v1 - healthcheck + policyadmin zb!XztG34 diff --git a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/apiConfigFile.json b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/apiConfigFile.json index 00715129..e6f076ab 100644 --- a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/apiConfigFile.json +++ b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/apiConfigFile.json @@ -3,7 +3,7 @@ "restServerParameters": { "host": "0.0.0.0", "port": 6969, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34", "https": false, "aaf": false, diff --git a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/papConfigFile.json b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/papConfigFile.json index 790a8ea6..9b6f3b40 100644 --- a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/papConfigFile.json +++ b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/papConfigFile.json @@ -3,7 +3,7 @@ "restServerParameters": { "host": "0.0.0.0", "port": 6969, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34", "https": false, "aaf": false, @@ -62,7 +62,7 @@ "clientName": "api", "hostname": "policy-api", "port": 6969, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34", "useHttps": false, "basePath": "policy/api/v1/healthcheck" diff --git a/testsuites/stability/src/main/resources/setup/distribution/etc/defaultConfig.json b/testsuites/stability/src/main/resources/setup/distribution/etc/defaultConfig.json index 22970c40..a4cf85a8 100644 --- a/testsuites/stability/src/main/resources/setup/distribution/etc/defaultConfig.json +++ b/testsuites/stability/src/main/resources/setup/distribution/etc/defaultConfig.json @@ -57,7 +57,7 @@ "hostname": "policy-api", "port": 6969, "useHttps": false, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "papParameters": { @@ -65,7 +65,7 @@ "hostname": "policy-pap", "port": 6969, "useHttps": false, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "deployPolicies": true diff --git a/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx index 0596f483..9182a97d 100644 --- a/testsuites/stability/src/main/resources/testplans/stability.jmx +++ b/testsuites/stability/src/main/resources/testplans/stability.jmx @@ -114,14 +114,14 @@ http://${PAP_HOST}:${PAP_PORT}/policy/pap/v1 - healthcheck + policyadmin zb!XztG34 http://${API_HOST}:${API_PORT}/policy/api/v1 - healthcheck + policyadmin zb!XztG34 -- cgit 1.2.3-korg