summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2019-05-17 14:04:48 -0500
committerjhh <jorge.hernandez-herrero@att.com>2019-05-17 15:01:12 -0500
commit8aa65370a1eeef842a002ad403c7172702a614ea (patch)
tree4ace93e4e459fd416941a84ebefe188ee592b64b
parentcf34cc6e78f38dec2a5925f70dd3e39f0c125b22 (diff)
PDP-X guard url is retrieved incorrectly.
Change-Id: Ibf3df9288268ca7c8edfc9007e15c31802a4e5e1 Issue-ID: POLICY-1780 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
-rw-r--r--controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java2
-rw-r--r--controlloop/common/guard/src/main/java/org/onap/policy/guard/Util.java2
-rw-r--r--controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java1
3 files changed, 3 insertions, 2 deletions
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java
index 8ff226f7a..fc9a2438f 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java
@@ -50,7 +50,7 @@ public class PolicyGuardXacmlHelper {
* Constructor.
*/
public PolicyGuardXacmlHelper() {
- this.url = PolicyEngine.manager.getEnvironmentProperty("pdpx.host");
+ this.url = PolicyEngine.manager.getEnvironmentProperty("guard.url");
this.user = PolicyEngine.manager.getEnvironmentProperty("pdpx.username");
this.pwd = PolicyEngine.manager.getEnvironmentProperty("pdpx.password");
}
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/Util.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/Util.java
index e378b61c9..d859fbe09 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/Util.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/Util.java
@@ -39,7 +39,7 @@ public final class Util {
/*
* Keys for guard properties
*/
- public static final String PROP_GUARD_URL = "pdpx.host";
+ public static final String PROP_GUARD_URL = "guard.url";
public static final String PROP_GUARD_USER = "pdpx.username";
public static final String PROP_GUARD_PASS = "pdpx.password";
public static final String PROP_GUARD_DISABLED = "guard.disabled";
diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java
index 25d602f6a..2418ac663 100644
--- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java
+++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java
@@ -45,6 +45,7 @@ public class PolicyGuardXacmlHelperTest {
LoggerUtil.setLevel("ROOT", "INFO");
LoggerUtil.setLevel("org.eclipse.jetty", "WARN");
try {
+ HttpServletServer.factory.destroy();
org.onap.policy.simulators.Util.buildGuardSim();
} catch (Exception e) {
fail(e.getMessage());