summaryrefslogtreecommitdiffstats
path: root/controlloop/common/simulators
diff options
context:
space:
mode:
Diffstat (limited to 'controlloop/common/simulators')
-rw-r--r--controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java14
-rw-r--r--controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java10
-rw-r--r--controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java6
-rw-r--r--controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java8
4 files changed, 19 insertions, 19 deletions
diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
index 79a484be7..b18e3da9d 100644
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* simulators
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ import org.onap.policy.aai.AaiNqRequest;
import org.onap.policy.aai.AaiNqResponse;
import org.onap.policy.common.endpoints.http.server.HttpServletServer;
import org.onap.policy.drools.utils.logging.LoggerUtil;
-import org.onap.policy.rest.RESTManager;
+import org.onap.policy.rest.RestManager;
public class AaiSimulatorTest {
@@ -68,7 +68,7 @@ public class AaiSimulatorTest {
@Test
public void testGet() {
- final AaiGetVnfResponse response = new AaiManager(new RESTManager()).getQueryByVnfId(
+ final AaiGetVnfResponse response = new AaiManager(new RestManager()).getQueryByVnfId(
"http://localhost:6666/aai/v11/network/generic-vnfs/generic-vnf/", "testUser", "testPass",
UUID.randomUUID(), "5e49ca06-2972-4532-9ed4-6d071588d792");
assertNotNull(response);
@@ -94,7 +94,7 @@ public class AaiSimulatorTest {
tempInstanceFilters.setInstanceFilter(tempInstanceFilter);
request.setInstanceFilters(tempInstanceFilters);
- AaiNqResponse response = new AaiManager(new RESTManager()).postQuery("http://localhost:6666", "testUser",
+ AaiNqResponse response = new AaiManager(new RestManager()).postQuery("http://localhost:6666", "testUser",
"testPass", request, UUID.randomUUID());
assertNotNull(response);
assertNotNull(response.getInventoryResponseItems());
@@ -102,7 +102,7 @@ public class AaiSimulatorTest {
// check error response for vserver query
tempInnerMap.put("vserver-name", "error");
- response = new AaiManager(new RESTManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
+ response = new AaiManager(new RestManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
UUID.randomUUID());
assertNotNull(response);
assertNotNull(response.getRequestError());
@@ -122,7 +122,7 @@ public class AaiSimulatorTest {
tempInstanceFilters.setInstanceFilter(tempInstanceFilter);
request.setInstanceFilters(tempInstanceFilters);
- response = new AaiManager(new RESTManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
+ response = new AaiManager(new RestManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
UUID.randomUUID());
assertNotNull(response);
assertNotNull(response.getInventoryResponseItems());
@@ -131,7 +131,7 @@ public class AaiSimulatorTest {
// check error response for generic-vnf query
tempInnerMap.put("vnf-id", "error");
- response = new AaiManager(new RESTManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
+ response = new AaiManager(new RestManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
UUID.randomUUID());
assertNotNull(response);
assertNotNull(response.getRequestError());
diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java
index 3768b1b32..c02f14334 100644
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* simulators
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.common.endpoints.http.server.HttpServletServer;
import org.onap.policy.drools.utils.logging.LoggerUtil;
-import org.onap.policy.rest.RESTManager;
-import org.onap.policy.rest.RESTManager.Pair;
+import org.onap.policy.rest.RestManager;
+import org.onap.policy.rest.RestManager.Pair;
public class GuardSimulatorTest {
@@ -58,14 +58,14 @@ public class GuardSimulatorTest {
String request = makeRequest("test_actor_id", "test_op_id", "test_target", "test_clName");
String url = "http://localhost:" + Util.GUARDSIM_SERVER_PORT + "/pdp/api/getDecision";
Pair<Integer, String> response =
- new RESTManager().post(url, "testUname", "testPass", null, "application/json", request);
+ new RestManager().post(url, "testUname", "testPass", null, "application/json", request);
assertNotNull(response);
assertNotNull(response.first);
assertNotNull(response.second);
assertEquals("{\"decision\": \"PERMIT\", \"details\": \"Decision Permit. OK!\"}", response.second);
request = makeRequest("test_actor_id", "test_op_id", "test_target", "denyGuard");
- response = new RESTManager().post(url, "testUname", "testPass", null, "application/json", request);
+ response = new RestManager().post(url, "testUname", "testPass", null, "application/json", request);
assertNotNull(response);
assertNotNull(response.first);
assertNotNull(response.second);
diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java
index c704f7653..c7545b005 100644
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java
@@ -30,8 +30,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.common.endpoints.http.server.HttpServletServer;
import org.onap.policy.drools.utils.logging.LoggerUtil;
-import org.onap.policy.rest.RESTManager;
-import org.onap.policy.rest.RESTManager.Pair;
+import org.onap.policy.rest.RestManager;
+import org.onap.policy.rest.RestManager.Pair;
import org.onap.policy.so.SoCloudConfiguration;
import org.onap.policy.so.SoModelInfo;
import org.onap.policy.so.SoRelatedInstance;
@@ -138,7 +138,7 @@ public class SoSimulatorTest {
@Test
public void testResponse() {
final String request = Serialization.gsonPretty.toJson(this.createTestRequest());
- final Pair<Integer, String> httpDetails = new RESTManager().post(
+ final Pair<Integer, String> httpDetails = new RestManager().post(
"http://localhost:6667/serviceInstantiation/v7/serviceInstances/12345/vnfs/12345/vfModules/scaleOut",
"username",
"password", new HashMap<>(), "application/json", request);
diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
index 6e778d86c..cb161d59f 100644
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
@@ -31,8 +31,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.common.endpoints.http.server.HttpServletServer;
import org.onap.policy.drools.utils.logging.LoggerUtil;
-import org.onap.policy.rest.RESTManager;
-import org.onap.policy.rest.RESTManager.Pair;
+import org.onap.policy.rest.RestManager;
+import org.onap.policy.rest.RestManager.Pair;
import org.onap.policy.vfc.VfcResponse;
import org.onap.policy.vfc.util.Serialization;
@@ -60,7 +60,7 @@ public class VfcSimulatorTest {
@Test
public void testPost() {
final Pair<Integer, String> httpDetails =
- new RESTManager().post("http://localhost:6668/api/nslcm/v1/ns/1234567890/heal", "username", "password",
+ new RestManager().post("http://localhost:6668/api/nslcm/v1/ns/1234567890/heal", "username", "password",
new HashMap<String, String>(), "application/json", "Some Request Here");
assertNotNull(httpDetails);
assertTrue(httpDetails.first == 202);
@@ -70,7 +70,7 @@ public class VfcSimulatorTest {
@Test
public void testGet() {
- final Pair<Integer, String> httpDetails = new RESTManager().get("http://localhost:6668/api/nslcm/v1/jobs/1234",
+ final Pair<Integer, String> httpDetails = new RestManager().get("http://localhost:6668/api/nslcm/v1/jobs/1234",
"username", "password", new HashMap<String, String>());
assertNotNull(httpDetails);
final VfcResponse response = Serialization.gsonPretty.fromJson(httpDetails.second, VfcResponse.class);