aboutsummaryrefslogtreecommitdiffstats
path: root/models-interactions/model-impl/so
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-04-05 21:07:07 -0400
committerPamela Dragosh <pdragosh@research.att.com>2019-04-08 10:42:22 -0400
commitada55be1b59899e461dc5177782e381f89cbc407 (patch)
tree7bdb3eb5fe44e166a75a3333bf81f2293a3585de /models-interactions/model-impl/so
parenteb7127ac85b3df30a09277721a5f9271033843e7 (diff)
Remove drools PDP dependency
Removing working memory and use of PolicyEngine from drools in these classes. Cleaned up some unused imports and checkstyle. Issue-ID: POLICY-1264 Change-Id: Id059da9689a721b0eafc6b310adcbdad43574ce7 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'models-interactions/model-impl/so')
-rw-r--r--models-interactions/model-impl/so/pom.xml12
-rw-r--r--models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java73
-rw-r--r--models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DummyWorkingMemory.java316
-rw-r--r--models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoManagerTest.java73
4 files changed, 82 insertions, 392 deletions
diff --git a/models-interactions/model-impl/so/pom.xml b/models-interactions/model-impl/so/pom.xml
index 030d34976..59bda9041 100644
--- a/models-interactions/model-impl/so/pom.xml
+++ b/models-interactions/model-impl/so/pom.xml
@@ -43,12 +43,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-core</artifactId>
- <version>6.5.0.Final</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
<artifactId>rest</artifactId>
<version>${project.version}</version>
@@ -60,12 +54,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.onap.policy.drools-pdp</groupId>
- <artifactId>policy-management</artifactId>
- <version>${policy.drools-pdp.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-grizzly2-http</artifactId>
<version>2.25.1</version>
diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java
index 4c9ba66bd..888afe2ae 100644
--- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java
+++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java
@@ -30,11 +30,9 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.drools.core.WorkingMemory;
import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
import org.onap.policy.common.endpoints.utils.NetLoggerUtil;
import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
-import org.onap.policy.drools.system.PolicyEngine;
import org.onap.policy.rest.RestManager;
import org.onap.policy.rest.RestManager.Pair;
import org.onap.policy.so.util.Serialization;
@@ -66,10 +64,21 @@ public final class SoManager {
private long restGetTimeout = GET_REQUEST_WAIT_INTERVAL;
+ private String url;
+ private String user;
+ private String password;
+
+ public interface SoCallback {
+ public void onSoResponseWrapper(SoResponseWrapper wrapper);
+ }
+
/**
* Default constructor.
*/
- public SoManager() {
+ public SoManager(String url, String user, String password) {
+ this.url = url;
+ this.user = user;
+ this.password = password;
restManager = new RestManager();
}
@@ -106,10 +115,10 @@ public final class SoManager {
* except the vfModuleInstanceId is always null.
*
*/
- public Future<SoResponse> asyncSoRestCall(final String requestId, final WorkingMemory wm,
+ public Future<SoResponse> asyncSoRestCall(final String requestId, final SoCallback callback,
final String serviceInstanceId, final String vnfInstanceId,
final SoRequest request) {
- return asyncSoRestCall(requestId, wm, serviceInstanceId, vnfInstanceId, null, request);
+ return asyncSoRestCall(requestId, callback, serviceInstanceId, vnfInstanceId, null, request);
}
/**
@@ -117,7 +126,7 @@ public final class SoManager {
* Drools working memory.
*
* @param requestId the request id
- * @param wm the Drools working memory
+ * @param callback callback method
* @param serviceInstanceId service instance id to construct the request url
* @param vnfInstanceId vnf instance id to construct the request url
* @param vfModuleInstanceId vfModule instance id to construct the request url (required in case of delete vf
@@ -126,12 +135,13 @@ public final class SoManager {
* @return a concurrent Future for the thread that handles the request
*/
public Future<SoResponse> asyncSoRestCall(final String requestId,
- final WorkingMemory wm,
+ final SoCallback callback,
final String serviceInstanceId,
final String vnfInstanceId,
- final String vfModuleInstanceId, final SoRequest request) {
- return executors.submit(new AsyncSoRestCallThread(requestId, wm, serviceInstanceId, vnfInstanceId,
- vfModuleInstanceId, request));
+ final String vfModuleInstanceId,
+ final SoRequest request) {
+ return executors.submit(new AsyncSoRestCallThread(requestId, callback, serviceInstanceId, vnfInstanceId,
+ vfModuleInstanceId, request, this.url, this.user, this.password));
}
/**
@@ -139,11 +149,14 @@ public final class SoManager {
*/
private class AsyncSoRestCallThread implements Callable<SoResponse> {
final String requestId;
- final WorkingMemory wm;
+ final SoCallback callback;
final String serviceInstanceId;
final String vnfInstanceId;
final String vfModuleInstanceId;
final SoRequest request;
+ final String baseUrl;
+ final String user;
+ final String password;
/**
* Constructor, sets the context of the request.
@@ -156,15 +169,21 @@ public final class SoManager {
* @param request the request itself
*/
private AsyncSoRestCallThread(final String requestId,
- final WorkingMemory wm, final String serviceInstanceId,
+ final SoCallback callback, final String serviceInstanceId,
final String vnfInstanceId, final String vfModuleInstanceId,
- final SoRequest request) {
+ final SoRequest request,
+ final String url,
+ final String user,
+ final String password) {
this.requestId = requestId;
- this.wm = wm;
+ this.callback = callback;
this.serviceInstanceId = serviceInstanceId;
this.vnfInstanceId = vnfInstanceId;
this.vfModuleInstanceId = vfModuleInstanceId;
this.request = request;
+ this.baseUrl = url;
+ this.user = user;
+ this.password = password;
}
/**
@@ -172,37 +191,39 @@ public final class SoManager {
*/
@Override
public SoResponse call() {
- String urlBase = PolicyEngine.manager.getEnvironmentProperty("so.url");
- String username = PolicyEngine.manager.getEnvironmentProperty("so.username");
- String password = PolicyEngine.manager.getEnvironmentProperty("so.password");
// Create a JSON representation of the request
String soJson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create().toJson(request);
- String url = null;
+ String initialUrl = null;
Pair<Integer, String> httpResponse = null;
if (request.getOperationType() != null && request.getOperationType()
.equals(SoOperationType.SCALE_OUT)) {
- url = urlBase + "/serviceInstantiation/v7/serviceInstances/" + serviceInstanceId + "/vnfs/"
+ initialUrl = this.baseUrl + "/serviceInstantiation/v7/serviceInstances/" + serviceInstanceId + "/vnfs/"
+ vnfInstanceId + "/vfModules/scaleOut";
- NetLoggerUtil.log(EventType.OUT, CommInfrastructure.REST, url, soJson);
- httpResponse = restManager.post(url, username, password, createSimpleHeaders(), MEDIA_TYPE, soJson);
+ NetLoggerUtil.log(EventType.OUT, CommInfrastructure.REST, initialUrl, soJson);
+ httpResponse = restManager.post(initialUrl, this.user, this.password, createSimpleHeaders(),
+ MEDIA_TYPE, soJson);
} else if (request.getOperationType() != null && request.getOperationType()
.equals(SoOperationType.DELETE_VF_MODULE)) {
- url = urlBase + "/serviceInstances/v7/" + serviceInstanceId + "/vnfs/" + vnfInstanceId
+ initialUrl = this.baseUrl + "/serviceInstances/v7/" + serviceInstanceId + "/vnfs/" + vnfInstanceId
+ "/vfModules/" + vfModuleInstanceId;
- NetLoggerUtil.log(EventType.OUT, CommInfrastructure.REST, url, soJson);
- httpResponse = restManager.delete(url, username, password, createSimpleHeaders(), MEDIA_TYPE, soJson);
+ NetLoggerUtil.log(EventType.OUT, CommInfrastructure.REST, initialUrl, soJson);
+ httpResponse = restManager.delete(initialUrl, this.user, this.password, createSimpleHeaders(),
+ MEDIA_TYPE, soJson);
} else {
return null;
}
// Process the response from SO
- SoResponse response = waitForSoOperationCompletion(urlBase, username, password, url, httpResponse);
+ SoResponse response = waitForSoOperationCompletion(this.baseUrl, this.user, this.password, initialUrl,
+ httpResponse);
// Return the response to Drools in its working memory
SoResponseWrapper soWrapper = new SoResponseWrapper(response, requestId);
- wm.insert(soWrapper);
+ if (this.callback != null) {
+ this.callback.onSoResponseWrapper(soWrapper);
+ }
return response;
}
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DummyWorkingMemory.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DummyWorkingMemory.java
deleted file mode 100644
index caffef43d..000000000
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DummyWorkingMemory.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.so;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.drools.core.WorkingMemory;
-import org.drools.core.WorkingMemoryEntryPoint;
-import org.drools.core.common.InternalFactHandle;
-import org.drools.core.impl.InternalKnowledgeBase;
-import org.drools.core.spi.AsyncExceptionHandler;
-import org.drools.core.spi.GlobalResolver;
-import org.kie.api.event.kiebase.KieBaseEventListener;
-import org.kie.api.event.rule.AgendaEventListener;
-import org.kie.api.event.rule.RuleRuntimeEventListener;
-import org.kie.api.runtime.Environment;
-import org.kie.api.runtime.ObjectFilter;
-import org.kie.api.runtime.process.ProcessInstance;
-import org.kie.api.runtime.process.WorkItemManager;
-import org.kie.api.runtime.rule.Agenda;
-import org.kie.api.runtime.rule.AgendaFilter;
-import org.kie.api.runtime.rule.FactHandle;
-import org.kie.api.runtime.rule.FactHandle.State;
-import org.kie.api.runtime.rule.QueryResults;
-import org.kie.api.time.SessionClock;
-
-public class DummyWorkingMemory implements WorkingMemory {
-
- @Override
- public void addEventListener(RuleRuntimeEventListener listener) {
- }
-
- @Override
- public void addEventListener(AgendaEventListener listener) {
- }
-
- @Override
- public void addEventListener(KieBaseEventListener listener) {
- }
-
- @Override
- public void removeEventListener(RuleRuntimeEventListener listener) {
- }
-
- @Override
- public void removeEventListener(AgendaEventListener listener) {
- }
-
- @Override
- public void removeEventListener(KieBaseEventListener listener) {
- }
-
- @Override
- public Collection<RuleRuntimeEventListener> getRuleRuntimeEventListeners() {
- return null;
- }
-
- @Override
- public Collection<AgendaEventListener> getAgendaEventListeners() {
- return null;
- }
-
- @Override
- public Collection<KieBaseEventListener> getKieBaseEventListeners() {
- return null;
- }
-
- @Override
- public FactHandle insert(Object object, boolean dynamic) {
- return null;
- }
-
- @Override
- public FactHandle insert(Object object) {
- return null;
- }
-
- @Override
- public void dispose() {
- }
-
- @Override
- public String getEntryPointId() {
- return null;
- }
-
- @Override
- public void retract(FactHandle handle) {
- }
-
- @Override
- public void delete(FactHandle handle) {
- }
-
- @Override
- public void delete(FactHandle handle, State fhState) {
-
-
- }
-
- @Override
- public void update(FactHandle handle, Object object) {
- }
-
- @Override
- public void update(FactHandle handle, Object object, String... modifiedProperties) {
- }
-
- @Override
- public Collection<? extends Object> getObjects() {
- return null;
- }
-
- @Override
- public Collection<? extends Object> getObjects(ObjectFilter filter) {
- return null;
- }
-
- @Override
- public <T extends FactHandle> Collection<T> getFactHandles() {
- return null;
- }
-
- @Override
- public <T extends FactHandle> Collection<T> getFactHandles(ObjectFilter filter) {
- return null;
- }
-
- @Override
- public long getFactCount() {
- return 0;
- }
-
- @Override
- public Agenda getAgenda() {
- return null;
- }
-
- @Override
- public void setGlobal(String identifier, Object value) {
- }
-
- @Override
- public Object getGlobal(String identifier) {
- return null;
- }
-
- @Override
- public Environment getEnvironment() {
- return null;
- }
-
- @Override
- public void setGlobalResolver(GlobalResolver globalResolver) {
- }
-
- @Override
- public GlobalResolver getGlobalResolver() {
- return null;
- }
-
- @Override
- public InternalKnowledgeBase getKnowledgeBase() {
- return null;
- }
-
- @Override
- public int fireAllRules() {
- return 0;
- }
-
- @Override
- public int fireAllRules(AgendaFilter agendaFilter) {
- return 0;
- }
-
- @Override
- public int fireAllRules(int fireLimit) {
- return 0;
- }
-
- @Override
- public int fireAllRules(AgendaFilter agendaFilter, int fireLimit) {
- return 0;
- }
-
- @Override
- public Object getObject(FactHandle handle) {
- return null;
- }
-
- @Override
- public FactHandle getFactHandle(Object object) {
- return null;
- }
-
- @Override
- public FactHandle getFactHandleByIdentity(Object object) {
- return null;
- }
-
- @Override
- public Iterator<?> iterateObjects() {
- return null;
- }
-
- @Override
- public Iterator<?> iterateObjects(ObjectFilter filter) {
- return null;
- }
-
- @Override
- public Iterator<InternalFactHandle> iterateFactHandles() {
- return null;
- }
-
- @Override
- public Iterator<InternalFactHandle> iterateFactHandles(ObjectFilter filter) {
- return null;
- }
-
- @Override
- public void setFocus(String focus) {
- }
-
- @Override
- public QueryResults getQueryResults(String query, Object... arguments) {
- return null;
- }
-
- @Override
- public void setAsyncExceptionHandler(AsyncExceptionHandler handler) {
- }
-
- @Override
- public void clearAgenda() {
- }
-
- @Override
- public void clearAgendaGroup(String group) {
- }
-
- @Override
- public void clearActivationGroup(String group) {
- }
-
- @Override
- public void clearRuleFlowGroup(String group) {
- }
-
- @Override
- public ProcessInstance startProcess(String processId) {
- return null;
- }
-
- @Override
- public ProcessInstance startProcess(String processId, Map<String, Object> parameters) {
- return null;
- }
-
- @Override
- public Collection<ProcessInstance> getProcessInstances() {
- return null;
- }
-
- @Override
- public ProcessInstance getProcessInstance(long id) {
- return null;
- }
-
- @Override
- public ProcessInstance getProcessInstance(long id, boolean readOnly) {
- return null;
- }
-
- @Override
- public WorkItemManager getWorkItemManager() {
- return null;
- }
-
- @Override
- public void halt() {
- }
-
- @Override
- public WorkingMemoryEntryPoint getWorkingMemoryEntryPoint(String id) {
- return null;
- }
-
- @Override
- public SessionClock getSessionClock() {
- return null;
- }
-
-}
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoManagerTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoManagerTest.java
index 4d7228ff7..03ac06dd5 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoManagerTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoManagerTest.java
@@ -40,16 +40,15 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.drools.core.WorkingMemory;
import org.glassfish.grizzly.http.server.HttpServer;
import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
import org.glassfish.jersey.server.ResourceConfig;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onap.policy.drools.system.PolicyEngine;
+import org.onap.policy.so.SoManager.SoCallback;
-public class SoManagerTest {
+public class SoManagerTest implements SoCallback {
private static final String BASE_URI = "http://localhost:46553/TestSOManager";
private static final String BASE_SO_URI = BASE_URI + "/SO";
private static HttpServer server;
@@ -86,7 +85,7 @@ public class SoManagerTest {
@Test
public void testServiceInstantiation() throws IOException {
- SoManager manager = new SoManager();
+ SoManager manager = new SoManager(null, null, null);
assertNotNull(manager);
manager.setRestGetTimeout(100);
@@ -161,19 +160,13 @@ public class SoManagerTest {
@Test
public void testVfModuleCreation() throws IOException {
- SoManager manager = new SoManager();
+ SoManager manager = new SoManager("http:/localhost:99999999", "sean", "citizen");
assertNotNull(manager);
manager.setRestGetTimeout(100);
- PolicyEngine.manager.setEnvironmentProperty("so.username", "sean");
- PolicyEngine.manager.setEnvironmentProperty("so.password", "citizen");
-
- WorkingMemory wm = new DummyWorkingMemory();
-
SoRequest soRequest = new SoRequest();
soRequest.setOperationType(SoOperationType.SCALE_OUT);
- PolicyEngine.manager.setEnvironmentProperty("so.url", "http:/localhost:99999999");
- Future<SoResponse> asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm,
+ Future<SoResponse> asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this,
UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -182,8 +175,9 @@ public class SoManagerTest {
fail("test should not throw an exception");
}
- PolicyEngine.manager.setEnvironmentProperty("so.url", BASE_SO_URI);
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ manager = new SoManager(BASE_SO_URI, "sean", "citizen");
+ manager.setRestGetTimeout(100);
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), soRequest);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -201,7 +195,7 @@ public class SoManagerTest {
request.getRequestStatus().setRequestState("ONGOING");
request.setOperationType(SoOperationType.SCALE_OUT);
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -212,7 +206,7 @@ public class SoManagerTest {
request.setRequestType("ReturnCompleted");
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -222,7 +216,7 @@ public class SoManagerTest {
}
request.setRequestType("ReturnFailed");
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -235,7 +229,7 @@ public class SoManagerTest {
request.setRequestType("ReturnOnging200");
request.setRequestScope(new Integer(10).toString());
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -247,7 +241,7 @@ public class SoManagerTest {
request.setRequestType("ReturnOnging202");
request.setRequestScope(new Integer(20).toString());
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -260,7 +254,7 @@ public class SoManagerTest {
// Test timeout after 20 attempts for a response
request.setRequestType("ReturnOnging202");
request.setRequestScope(new Integer(21).toString());
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -272,7 +266,7 @@ public class SoManagerTest {
// Test bad response after 3 attempts for a response
request.setRequestType("ReturnBadAfterWait");
request.setRequestScope(new Integer(3).toString());
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -284,19 +278,13 @@ public class SoManagerTest {
@Test
public void testVfModuleDeletion() {
- SoManager manager = new SoManager();
+ SoManager manager = new SoManager("http:/localhost:99999999", "sean", "citizen");
assertNotNull(manager);
manager.setRestGetTimeout(100);
- PolicyEngine.manager.setEnvironmentProperty("so.username", "sean");
- PolicyEngine.manager.setEnvironmentProperty("so.password", "citizen");
-
- WorkingMemory wm = new DummyWorkingMemory();
-
SoRequest soRequest = new SoRequest();
soRequest.setOperationType(SoOperationType.DELETE_VF_MODULE);
- PolicyEngine.manager.setEnvironmentProperty("so.url", "http:/localhost:99999999");
- Future<SoResponse> asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm,
+ Future<SoResponse> asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this,
UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -305,8 +293,10 @@ public class SoManagerTest {
fail("test should not throw an exception");
}
- PolicyEngine.manager.setEnvironmentProperty("so.url", BASE_SO_URI);
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ manager = new SoManager(BASE_SO_URI, "sean", "citizen");
+ manager.setRestGetTimeout(100);
+
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -324,7 +314,7 @@ public class SoManagerTest {
request.getRequestStatus().setRequestState("ONGOING");
request.setOperationType(SoOperationType.DELETE_VF_MODULE);
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -335,7 +325,7 @@ public class SoManagerTest {
request.setRequestType("ReturnCompleted");
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -345,7 +335,7 @@ public class SoManagerTest {
}
request.setRequestType("ReturnFailed");
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -358,7 +348,7 @@ public class SoManagerTest {
request.setRequestType("ReturnOnging200");
request.setRequestScope(new Integer(10).toString());
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -370,7 +360,7 @@ public class SoManagerTest {
request.setRequestType("ReturnOnging202");
request.setRequestScope(new Integer(20).toString());
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -383,7 +373,7 @@ public class SoManagerTest {
// Test timeout after 20 attempts for a response
request.setRequestType("ReturnOnging202");
request.setRequestScope(new Integer(21).toString());
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -395,7 +385,7 @@ public class SoManagerTest {
// Test bad response after 3 attempts for a response
request.setRequestType("ReturnBadAfterWait");
request.setRequestScope(new Integer(3).toString());
- asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
SoResponse response = asyncRestCallFuture.get();
@@ -404,4 +394,11 @@ public class SoManagerTest {
fail("test should not throw an exception");
}
}
+
+ @Override
+ public void onSoResponseWrapper(SoResponseWrapper wrapper) {
+ //
+ // Nothing really needed to do
+ //
+ }
}