summaryrefslogtreecommitdiffstats
path: root/models-interactions/model-simulators/src
diff options
context:
space:
mode:
Diffstat (limited to 'models-interactions/model-simulators/src')
-rw-r--r--models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java20
-rw-r--r--models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/XacmlSimulatorJaxRs.java (renamed from models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/GuardSimulatorJaxRs.java)2
-rw-r--r--models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/XacmlSimulatorTest.java (renamed from models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java)8
3 files changed, 20 insertions, 10 deletions
diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java
index 29d665416..24fd7ece5 100644
--- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java
+++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java
@@ -40,13 +40,13 @@ public final class Util {
public static final String AAISIM_SERVER_NAME = "aaiSim";
public static final String SOSIM_SERVER_NAME = "soSim";
public static final String VFCSIM_SERVER_NAME = "vfcSim";
- public static final String GUARDSIM_SERVER_NAME = "guardSim";
+ public static final String XACMLSIM_SERVER_NAME = "xacmlSim";
public static final String SDNCSIM_SERVER_NAME = "sdncSim";
public static final int AAISIM_SERVER_PORT = 6666;
public static final int SOSIM_SERVER_PORT = 6667;
public static final int VFCSIM_SERVER_PORT = 6668;
- public static final int GUARDSIM_SERVER_PORT = 6669;
+ public static final int XACMLSIM_SERVER_PORT = 6669;
public static final int SDNCSIM_SERVER_PORT = 6670;
public static final int CDSSIM_SERVER_PORT = 6671;
public static final int DMAAPSIM_SERVER_PORT = 3904;
@@ -137,9 +137,19 @@ public final class Util {
* @throws InterruptedException if a thread is interrupted
*/
public static HttpServletServer buildGuardSim() throws InterruptedException {
- HttpServletServer testServer = HttpServletServerFactoryInstance.getServerFactory().build(GUARDSIM_SERVER_NAME,
- LOCALHOST, GUARDSIM_SERVER_PORT, "/", false, true);
- testServer.addServletClass("/*", GuardSimulatorJaxRs.class.getName());
+ return buildXacmlSim();
+ }
+
+ /**
+ * Build a xacml simulator.
+ *
+ * @return the simulator
+ * @throws InterruptedException if a thread is interrupted
+ */
+ public static HttpServletServer buildXacmlSim() throws InterruptedException {
+ HttpServletServer testServer = HttpServletServerFactoryInstance.getServerFactory().build(XACMLSIM_SERVER_NAME,
+ LOCALHOST, XACMLSIM_SERVER_PORT, "/", false, true);
+ testServer.addServletClass("/*", XacmlSimulatorJaxRs.class.getName());
testServer.waitedStart(5000);
waitForServerToListen(testServer.getPort());
return testServer;
diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/GuardSimulatorJaxRs.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/XacmlSimulatorJaxRs.java
index 7a33a1950..f25b65c04 100644
--- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/GuardSimulatorJaxRs.java
+++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/XacmlSimulatorJaxRs.java
@@ -32,7 +32,7 @@ import org.onap.policy.models.decisions.concepts.DecisionRequest;
import org.onap.policy.models.decisions.concepts.DecisionResponse;
@Path("/policy/pdpx/v1")
-public class GuardSimulatorJaxRs {
+public class XacmlSimulatorJaxRs {
public static final String DENY_CLNAME = "denyGuard";
/**
diff --git a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/XacmlSimulatorTest.java
index e553636ec..53b476fb2 100644
--- a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java
+++ b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/XacmlSimulatorTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* simulators
* ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,7 +38,7 @@ import org.onap.policy.models.decisions.concepts.DecisionRequest;
import org.onap.policy.models.decisions.concepts.DecisionResponse;
import org.onap.policy.rest.RestManager;
-public class GuardSimulatorTest {
+public class XacmlSimulatorTest {
private static final StandardCoder coder = new StandardCoder();
/**
@@ -47,7 +47,7 @@ public class GuardSimulatorTest {
@BeforeClass
public static void setupSimulator() {
try {
- org.onap.policy.simulators.Util.buildGuardSim();
+ org.onap.policy.simulators.Util.buildXacmlSim();
} catch (Exception e) {
fail(e.getMessage());
}
@@ -61,7 +61,7 @@ public class GuardSimulatorTest {
@Test
public void testGuard() throws CoderException {
String request = makeRequest("test_actor_id", "test_op_id", "test_target", "test_clName");
- String url = "http://localhost:" + Util.GUARDSIM_SERVER_PORT + "/policy/pdpx/v1/decision";
+ String url = "http://localhost:" + Util.XACMLSIM_SERVER_PORT + "/policy/pdpx/v1/decision";
Pair<Integer, String> response =
new RestManager().post(url, "testUname", "testPass", null, "application/json", request);
assertNotNull(response);