* ============LICENSE_START=======================================================
* SOActorServiceProvider
* ================================================================================
- * 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.
import org.onap.policy.controlloop.VirtualControlLoopEvent;
import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
import org.onap.policy.controlloop.policy.Policy;
-import org.onap.policy.so.SOCloudConfiguration;
-import org.onap.policy.so.SOManager;
-import org.onap.policy.so.SOModelInfo;
-import org.onap.policy.so.SORelatedInstance;
-import org.onap.policy.so.SORelatedInstanceListElement;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestDetails;
-import org.onap.policy.so.SORequestInfo;
-import org.onap.policy.so.SORequestParameters;
+import org.onap.policy.so.SoCloudConfiguration;
+import org.onap.policy.so.SoManager;
+import org.onap.policy.so.SoModelInfo;
import org.onap.policy.so.SoOperationType;
+import org.onap.policy.so.SoRelatedInstance;
+import org.onap.policy.so.SoRelatedInstanceListElement;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoRequestDetails;
+import org.onap.policy.so.SoRequestInfo;
+import org.onap.policy.so.SoRequestParameters;
import org.onap.policy.so.util.Serialization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* @param aaiResponseWrapper wrapper for AAI vserver named-query response
* @return a SO request conforming to the lcm API using the DMAAP wrapper
*/
- public SORequest constructRequest(VirtualControlLoopEvent onset, ControlLoopOperation operation, Policy policy,
+ public SoRequest constructRequest(VirtualControlLoopEvent onset, ControlLoopOperation operation, Policy policy,
AaiNqResponseWrapper aaiResponseWrapper) {
if (!SO_ACTOR.equals(policy.getActor()) || !recipes().contains(policy.getRecipe())) {
return null;
* @param vfModuleItem vf module item from A&AI named-query response
* @return SO create vf-module request
*/
- private SORequest constructCreateRequest(AaiNqResponseWrapper aaiResponseWrapper, Policy policy,
+ private SoRequest constructCreateRequest(AaiNqResponseWrapper aaiResponseWrapper, Policy policy,
AaiNqInventoryResponseItem tenantItem, AaiNqInventoryResponseItem vnfItem,
AaiNqInventoryResponseItem vnfServiceItem,
AaiNqInventoryResponseItem vfModuleItem) {
- SORequest request = new SORequest();
+ SoRequest request = new SoRequest();
request.setOperationType(SoOperationType.SCALE_OUT);
//
//
// Do NOT send So the requestId, they do not support this field
//
- request.setRequestDetails(new SORequestDetails());
- request.getRequestDetails().setRequestParameters(new SORequestParameters());
+ request.setRequestDetails(new SoRequestDetails());
+ request.getRequestDetails().setRequestParameters(new SoRequestParameters());
request.getRequestDetails().getRequestParameters().setUserParams(null);
// cloudConfiguration
request.getRequestDetails().getRequestInfo().setInstanceName(vfModuleName);
// relatedInstanceList
- SORelatedInstanceListElement relatedInstanceListElement1 = new SORelatedInstanceListElement();
- SORelatedInstanceListElement relatedInstanceListElement2 = new SORelatedInstanceListElement();
- relatedInstanceListElement1.setRelatedInstance(new SORelatedInstance());
- relatedInstanceListElement2.setRelatedInstance(new SORelatedInstance());
+ SoRelatedInstanceListElement relatedInstanceListElement1 = new SoRelatedInstanceListElement();
+ SoRelatedInstanceListElement relatedInstanceListElement2 = new SoRelatedInstanceListElement();
+ relatedInstanceListElement1.setRelatedInstance(new SoRelatedInstance());
+ relatedInstanceListElement2.setRelatedInstance(new SoRelatedInstance());
// Service Item
relatedInstanceListElement1.getRelatedInstance()
.setInstanceId(vnfServiceItem.getServiceInstance().getServiceInstanceId());
- relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SOModelInfo());
+ relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SoModelInfo());
relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelType("service");
relatedInstanceListElement1.getRelatedInstance().getModelInfo()
.setModelInvariantId(vnfServiceItem.getServiceInstance().getModelInvariantId());
// VNF Item
relatedInstanceListElement2.getRelatedInstance().setInstanceId(vnfItem.getGenericVnf().getVnfId());
- relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SOModelInfo());
+ relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SoModelInfo());
relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelType("vnf");
relatedInstanceListElement2.getRelatedInstance().getModelInfo()
.setModelInvariantId(vnfItem.getGenericVnf().getModelInvariantId());
* @param vfModuleItem vf module item from A&AI named-query response
* @return SO delete vf-module request
*/
- private SORequest constructDeleteRequest(AaiNqInventoryResponseItem tenantItem, AaiNqInventoryResponseItem
+ private SoRequest constructDeleteRequest(AaiNqInventoryResponseItem tenantItem, AaiNqInventoryResponseItem
vnfItem, AaiNqInventoryResponseItem vnfServiceItem, AaiNqInventoryResponseItem vfModuleItem) {
- SORequest request = new SORequest();
+ SoRequest request = new SoRequest();
request.setOperationType(SoOperationType.DELETE_VF_MODULE);
- request.setRequestDetails(new SORequestDetails());
+ request.setRequestDetails(new SoRequestDetails());
request.getRequestDetails().setRelatedInstanceList(null);
request.getRequestDetails().setConfigurationParameters(null);
*
* @return SO request information
*/
- private SORequestInfo constructRequestInfo() {
- SORequestInfo soRequestInfo = new SORequestInfo();
+ private SoRequestInfo constructRequestInfo() {
+ SoRequestInfo soRequestInfo = new SoRequestInfo();
soRequestInfo.setSource("POLICY");
soRequestInfo.setSuppressRollback(false);
soRequestInfo.setRequestorId("policy");
* @param vfModuleItem vf module item from A&AI named-query response
* @return SO Model info for the vfModule
*/
- private SOModelInfo constructVfModuleModelInfo(AaiNqInventoryResponseItem vfModuleItem) {
- SOModelInfo soModelInfo = new SOModelInfo();
+ private SoModelInfo constructVfModuleModelInfo(AaiNqInventoryResponseItem vfModuleItem) {
+ SoModelInfo soModelInfo = new SoModelInfo();
soModelInfo.setModelType("vfModule");
soModelInfo.setModelInvariantId(vfModuleItem.getVfModule().getModelInvariantId());
soModelInfo.setModelCustomizationId(vfModuleItem.getVfModule().getModelCustomizationId());
* @param tenantItem tenant item from A&AI named-query response
* @return SO cloud configuration
*/
- private SOCloudConfiguration constructCloudConfiguration(AaiNqInventoryResponseItem tenantItem) {
- SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();
+ private SoCloudConfiguration constructCloudConfiguration(AaiNqInventoryResponseItem tenantItem) {
+ SoCloudConfiguration cloudConfiguration = new SoCloudConfiguration();
cloudConfiguration.setTenantId(tenantItem.getTenant().getTenantId());
cloudConfiguration.setLcpCloudRegionId(tenantItem.getItems().getInventoryResponseItems().get(0)
.getCloudRegion().getCloudRegionId());
* @param request the request
*/
public static void sendRequest(String requestId, WorkingMemory wm, Object request) {
- SOManager soManager = new SOManager();
- soManager.asyncSORestCall(requestId, wm, lastServiceItemServiceInstanceId, lastVNFItemVnfId,
- lastVfModuleItemVfModuleInstanceId, (SORequest) request);
+ SoManager soManager = new SoManager();
+ soManager.asyncSoRestCall(requestId, wm, lastServiceItemServiceInstanceId, lastVNFItemVnfId,
+ lastVfModuleItemVfModuleInstanceId, (SoRequest) request);
}
/**
* @param policy the policy
* @param request request into which to stick the request parameters
*/
- private void buildRequestParameters(Policy policy, SORequestDetails request) {
+ private void buildRequestParameters(Policy policy, SoRequestDetails request) {
// assume null until proven otherwise
request.setRequestParameters(null);
return;
}
- request.setRequestParameters(Serialization.gsonPretty.fromJson(json, SORequestParameters.class));
+ request.setRequestParameters(Serialization.gsonPretty.fromJson(json, SoRequestParameters.class));
}
/**
* @param policy the policy
* @param request request into which to stick the configuration parameters
*/
- private void buildConfigurationParameters(Policy policy, SORequestDetails request) {
+ private void buildConfigurationParameters(Policy policy, SoRequestDetails request) {
// assume null until proven otherwise
request.setConfigurationParameters(null);
-/*-
+/*
* ============LICENSE_START=======================================================
* TestSOActorServiceProvider
* ================================================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018 AT&T. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright (C) 2018-2019 AT&T. 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.
import org.onap.policy.controlloop.ControlLoopOperation;
import org.onap.policy.controlloop.VirtualControlLoopEvent;
import org.onap.policy.controlloop.policy.Policy;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestParameters;
import org.onap.policy.so.SoOperationType;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoRequestParameters;
import org.onap.policy.so.util.Serialization;
public class SoActorServiceProviderTest {
policy.setRecipe(VF_MODULE_CREATE);
// empty policy payload
- SORequest request = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
+ SoRequest request = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
assertNotNull(request);
assertEquals("my_module_3", request.getRequestDetails().getRequestInfo().getInstanceName());
loadAaiResponse(onset, "aai/AaiNqResponse-NoNonBase.json")));
policy.setRecipe(VF_MODULE_DELETE);
- SORequest deleteRequest = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
+ SoRequest deleteRequest = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
assertNotNull(deleteRequest);
assertEquals(SoOperationType.DELETE_VF_MODULE, deleteRequest.getOperationType());
* @return request parameters, encoded as JSON
*/
private String makeReqParams() {
- SORequestParameters params = new SORequestParameters();
+ SoRequestParameters params = new SoRequestParameters();
params.setUsePreload(true);
import org.onap.policy.guard.Util;
import org.onap.policy.sdnc.SdncResponse;
import org.onap.policy.sdnr.PciResponseWrapper;
-import org.onap.policy.so.SOResponseWrapper;
+import org.onap.policy.so.SoResponseWrapper;
import org.onap.policy.vfc.VfcResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
// Cast SDNR response and handle it
//
return onResponse((PciResponseWrapper) response);
- } else if (response instanceof SOResponseWrapper) {
+ } else if (response instanceof SoResponseWrapper) {
//
// Cast SO response and handle it
//
- return onResponse((SOResponseWrapper) response);
+ return onResponse((SoResponseWrapper) response);
} else if (response instanceof VfcResponse) {
//
// Cast VFC response and handle it
* @param msoResponse the SO response
* @return The result of the response handling
*/
- private PolicyResult onResponse(SOResponseWrapper msoResponse) {
+ private PolicyResult onResponse(SoResponseWrapper msoResponse) {
switch (msoResponse.getSoResponse().getHttpResponseCode()) {
case 200:
case 202:
import org.onap.policy.controlloop.policy.TargetType;
import org.onap.policy.controlloop.processor.ControlLoopProcessor;
import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.so.SOResponse;
-import org.onap.policy.so.SOResponseWrapper;
+import org.onap.policy.so.SoResponse;
+import org.onap.policy.so.SoResponseWrapper;
import org.onap.policy.vfc.VfcResponse;
import org.onap.policy.vfc.VfcResponseDescriptor;
import org.slf4j.Logger;
lcmCh.setSubRequestId("12345");
assertEquals(PolicyResult.FAILURE_EXCEPTION, clom.onResponse(lrw));
- SOResponse soResponse = new SOResponse();
- SOResponseWrapper soRw = new SOResponseWrapper(soResponse, null);
+ SoResponse soResponse = new SoResponse();
+ SoResponseWrapper soRw = new SoResponseWrapper(soResponse, null);
soResponse.setHttpResponseCode(200);
assertEquals(PolicyResult.SUCCESS, clom.onResponse(soRw));
clom.startOperation(onsetEvent);
- SOResponse soResponse = new SOResponse();
- final SOResponseWrapper soRw = new SOResponseWrapper(soResponse, null);
+ SoResponse soResponse = new SoResponse();
+ final SoResponseWrapper soRw = new SoResponseWrapper(soResponse, null);
PolicyEngine.manager.setEnvironmentProperty("guard.disabled", "false");
PolicyEngine.manager.setEnvironmentProperty(org.onap.policy.guard.Util.ONAP_KEY_URL,
assertNotNull(clom);
assertTrue(clom.isOperationRunning());
- SOResponse soResponse = new SOResponse();
- final SOResponseWrapper soRw = new SOResponseWrapper(soResponse, null);
+ SoResponse soResponse = new SoResponse();
+ final SoResponseWrapper soRw = new SoResponseWrapper(soResponse, null);
PolicyEngine.manager.setEnvironmentProperty("guard.disabled", "false");
PolicyEngine.manager.setEnvironmentProperty(org.onap.policy.guard.Util.ONAP_KEY_URL,
+++ /dev/null
-<?xml version="1.0"?>
-<!--
- ============LICENSE_START=======================================================
- Copyright (C) 2018 AT&T Technologies. 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.
- 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.
-
- SPDX-License-Identifier: Apache-2.0
- ============LICENSE_END=========================================================
--->
-
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.0//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-
-<suppressions>
- <suppress checks="AbbreviationAsWordInName"
- files="SORequest.java|SORequestDetails.java|SORequestReference.java|SORequestInfo.java|SORequestError.java|SORequestParameters.java|SOResponse.java|SOResponseWrapper.java|SOServiceExceptionHolder.java|SOSubscriberInfo.java|SOManager.java|SOCloudConfiguration.java|SOAsyncRequestStatus.java|SOInstanceReferences.java|SOModelInfo.java|SORelatedInstance.java|SORelatedInstanceList.java|SORequestStatus.java|SORequestReferences.java|SOPolicyExceptionHolder.java|SORelatedInstanceListElement.java"
- lines="1-9999"/>
-</suppressions>
============LICENSE_START=======================================================
Drools PDP Application Models
================================================================================
- 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.
<includeTestResources>true</includeTestResources>
<excludes>
</excludes>
- <suppressionsLocation>${project.basedir}/checkstyle-suppressions.xml</suppressionsLocation>
<consoleOutput>true</consoleOutput>
<failsOnViolation>true</failsOnViolation>
<violationSeverity>warning</violationSeverity>
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
import java.time.LocalDateTime;
-public class SOAsyncRequestStatus implements Serializable {
+public class SoAsyncRequestStatus implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
private String requestId;
@SerializedName("instanceReferences")
- private SOInstanceReferences instanceReferences;
+ private SoInstanceReferences instanceReferences;
@SerializedName("startTime")
private LocalDateTime startTime;
private String requestType;
@SerializedName("requestStatus")
- private SORequestStatus requestStatus;
+ private SoRequestStatus requestStatus;
- public SOAsyncRequestStatus() {
+ public SoAsyncRequestStatus() {
// required by author
}
return finishTime;
}
- public SOInstanceReferences getInstanceReferences() {
+ public SoInstanceReferences getInstanceReferences() {
return instanceReferences;
}
return requestScope;
}
- public SORequestStatus getRequestStatus() {
+ public SoRequestStatus getRequestStatus() {
return requestStatus;
}
this.finishTime = finishTime;
}
- public void setInstanceReferences(SOInstanceReferences instanceReferences) {
+ public void setInstanceReferences(SoInstanceReferences instanceReferences) {
this.instanceReferences = instanceReferences;
}
this.requestScope = requestScope;
}
- public void setRequestStatus(SORequestStatus requestStatus) {
+ public void setRequestStatus(SoRequestStatus requestStatus) {
this.requestStatus = requestStatus;
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SOCloudConfiguration implements Serializable {
+public class SoCloudConfiguration implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("tenantId")
private String tenantId;
- public SOCloudConfiguration() {
+ public SoCloudConfiguration() {
//required by author
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SOInstanceReferences implements Serializable {
+public class SoInstanceReferences implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("instanceId")
private String instanceId;
- public SOInstanceReferences() {
+ public SoInstanceReferences() {
//requried by author
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
* http://onap.readthedocs.io/en/latest/submodules/so.git/docs/SO_R1_Interface.html#get-orchestration-request
*
*/
-public final class SOManager {
- private static final Logger logger = LoggerFactory.getLogger(SOManager.class);
+public final class SoManager {
+ private static final Logger logger = LoggerFactory.getLogger(SoManager.class);
private static final Logger netLogger =
LoggerFactory.getLogger(org.onap.policy.common.endpoints.event.comm.Topic.NETWORK_LOGGER);
private static ExecutorService executors = Executors.newCachedThreadPool();
/**
* Default constructor.
*/
- public SOManager() {
+ public SoManager() {
restManager = new RESTManager();
}
* @param request the request to issue to SO
* @return the SO Response object
*/
- public SOResponse createModuleInstance(final String url, final String urlBase, final String username,
- final String password, final SORequest request) {
+ public SoResponse createModuleInstance(final String url, final String urlBase, final String username,
+ final String password, final SoRequest request) {
// Issue the HTTP POST request to SO to create the service instance
String requestJson = Serialization.gsonPretty.toJson(request);
netLogger.info("[OUT|{}|{}|{}|{}|{}|{}|]{}{}", "SO", url, username, password, createSimpleHeaders(), MEDIA_TYPE,
restManager.post(url, username, password, createSimpleHeaders(), MEDIA_TYPE, requestJson);
// Process the response from SO
- SOResponse response = waitForSoOperationCompletion(urlBase, username, password, url, httpResponse);
+ SoResponse response = waitForSoOperationCompletion(urlBase, username, password, url, httpResponse);
if (SO_RESPONSE_ERROR != response.getHttpResponseCode()) {
return response;
} else {
* except the vfModuleInstanceId is always null.
*
*/
- public Future<SOResponse> asyncSORestCall(final String requestId, final WorkingMemory wm,
+ public Future<SoResponse> asyncSoRestCall(final String requestId, final WorkingMemory wm,
final String serviceInstanceId, final String vnfInstanceId,
- final SORequest request) {
- return asyncSORestCall(requestId, wm, serviceInstanceId, vnfInstanceId, null, request);
+ final SoRequest request) {
+ return asyncSoRestCall(requestId, wm, serviceInstanceId, vnfInstanceId, null, request);
}
/**
* @param request the SO request
* @return a concurrent Future for the thread that handles the request
*/
- public Future<SOResponse> asyncSORestCall(final String requestId,
+ public Future<SoResponse> asyncSoRestCall(final String requestId,
final WorkingMemory wm,
final String serviceInstanceId,
final String vnfInstanceId,
- final String vfModuleInstanceId, final SORequest request) {
+ final String vfModuleInstanceId, final SoRequest request) {
return executors.submit(new AsyncSoRestCallThread(requestId, wm, serviceInstanceId, vnfInstanceId,
vfModuleInstanceId, request));
}
/**
* This class handles an asynchronous request to SO as a thread.
*/
- private class AsyncSoRestCallThread implements Callable<SOResponse> {
+ private class AsyncSoRestCallThread implements Callable<SoResponse> {
final String requestId;
final WorkingMemory wm;
final String serviceInstanceId;
final String vnfInstanceId;
final String vfModuleInstanceId;
- final SORequest request;
+ final SoRequest request;
/**
* Constructor, sets the context of the request.
private AsyncSoRestCallThread(final String requestId,
final WorkingMemory wm, final String serviceInstanceId,
final String vnfInstanceId, final String vfModuleInstanceId,
- final SORequest request) {
+ final SoRequest request) {
this.requestId = requestId;
this.wm = wm;
this.serviceInstanceId = serviceInstanceId;
* Process the asynchronous SO request.
*/
@Override
- public SOResponse call() {
+ public SoResponse call() {
String urlBase = PolicyEngine.manager.getEnvironmentProperty("so.url");
String username = PolicyEngine.manager.getEnvironmentProperty("so.username");
String password = PolicyEngine.manager.getEnvironmentProperty("so.password");
}
// Process the response from SO
- SOResponse response = waitForSoOperationCompletion(urlBase, username, password, url, httpResponse);
+ SoResponse response = waitForSoOperationCompletion(urlBase, username, password, url, httpResponse);
// Return the response to Drools in its working memory
- SOResponseWrapper soWrapper = new SOResponseWrapper(response, requestId);
+ SoResponseWrapper soWrapper = new SoResponseWrapper(response, requestId);
wm.insert(soWrapper);
return response;
/**
* Wait for the SO operation we have ordered to complete.
*
- * @param urlBaseSO The base URL for SO
+ * @param urlBaseSo The base URL for SO
* @param username user name on SO
* @param password password on SO
- * @param initialRequestURL The URL of the initial HTTP request
- * @param initialHTTPResponse The initial HTTP message returned from SO
+ * @param initialRequestUrl The URL of the initial HTTP request
+ * @param initialHttpResponse The initial HTTP message returned from SO
* @return The parsed final response of SO to the request
*/
- private SOResponse waitForSoOperationCompletion(final String urlBaseSO, final String username,
- final String password, final String initialRequestURL,
- final Pair<Integer, String> initialHTTPResponse) {
+ private SoResponse waitForSoOperationCompletion(final String urlBaseSo, final String username,
+ final String password, final String initialRequestUrl,
+ final Pair<Integer, String> initialHttpResponse) {
// Process the initial response from SO, the response to a post
- SOResponse response = processSoResponse(initialRequestURL, initialHTTPResponse);
+ SoResponse response = processSoResponse(initialRequestUrl, initialHttpResponse);
if (SO_RESPONSE_ERROR == response.getHttpResponseCode()) {
return response;
}
// The SO URL to use to get the status of orchestration requests
- String urlGet = urlBaseSO + "/orchestrationRequests/v5/" + response.getRequestReferences().getRequestId();
+ String urlGet = urlBaseSo + "/orchestrationRequests/v5/" + response.getRequestReferences().getRequestId();
// The HTTP status code of the latest response
- Pair<Integer, String> latestHttpResponse = initialHTTPResponse;
+ Pair<Integer, String> latestHttpResponse = initialHttpResponse;
// Wait for the response from SO
for (int attemptsLeft = GET_REQUESTS_BEFORE_TIMEOUT; attemptsLeft >= 0; attemptsLeft--) {
* @param httpResponse The HTTP message returned from SO
* @return The parsed response
*/
- private SOResponse processSoResponse(final String requestUrl, final Pair<Integer, String> httpResponse) {
- SOResponse response = new SOResponse();
+ private SoResponse processSoResponse(final String requestUrl, final Pair<Integer, String> httpResponse) {
+ SoResponse response = new SoResponse();
// A null httpDetails indicates a HTTP problem, a valid response from SO must be
// either 200
// Parse the JSON of the response into our POJO
try {
- response = Serialization.gsonPretty.fromJson(httpResponse.second, SOResponse.class);
+ response = Serialization.gsonPretty.fromJson(httpResponse.second, SoResponse.class);
} catch (JsonSyntaxException e) {
logger.error("Failed to deserialize HTTP response into SOResponse: ", e);
response.setHttpResponseCode(SO_RESPONSE_ERROR);
* @param response The response to check
* @return true if the request for the response is defined
*/
- private boolean isRequestStateDefined(final SOResponse response) {
+ private boolean isRequestStateDefined(final SoResponse response) {
return response != null && response.getRequest() != null && response.getRequest().getRequestStatus() != null
&& response.getRequest().getRequestStatus().getRequestState() != null;
}
* @param response The response to check
* @return true if the request for the response is finished
*/
- private boolean isRequestStateFinished(final Pair<Integer, String> latestHttpDetails, final SOResponse response) {
+ private boolean isRequestStateFinished(final Pair<Integer, String> latestHttpDetails, final SoResponse response) {
if (latestHttpDetails != null && 200 == latestHttpDetails.first && isRequestStateDefined(response)) {
String requestState = response.getRequest().getRequestStatus().getRequestState();
return "COMPLETE".equalsIgnoreCase(requestState) || "FAILED".equalsIgnoreCase(requestState);
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SOModelInfo implements Serializable {
+public class SoModelInfo implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("modelCustomizationId")
private String modelCustomizationId;
- public SOModelInfo() {
+ public SoModelInfo() {
//required by author
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SOPolicyExceptionHolder implements Serializable {
+public class SoPolicyExceptionHolder implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("text")
private String text;
- public SOPolicyExceptionHolder() {
+ public SoPolicyExceptionHolder() {
//required by author
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SORelatedInstance implements Serializable {
+public class SoRelatedInstance implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
private String instanceName;
@SerializedName("modelInfo")
- private SOModelInfo modelInfo;
+ private SoModelInfo modelInfo;
- public SORelatedInstance() {
+ public SoRelatedInstance() {
//required by author
}
return instanceName;
}
- public SOModelInfo getModelInfo() {
+ public SoModelInfo getModelInfo() {
return modelInfo;
}
}
- public void setModelInfo(SOModelInfo modelInfo) {
+ public void setModelInfo(SoModelInfo modelInfo) {
this.modelInfo = modelInfo;
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SORelatedInstanceListElement implements Serializable {
+public class SoRelatedInstanceListElement implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("relatedInstance")
- private SORelatedInstance relatedInstance;
+ private SoRelatedInstance relatedInstance;
- public SORelatedInstanceListElement() {
+ public SoRelatedInstanceListElement() {
//required by author
}
- public SORelatedInstance getRelatedInstance() {
+ public SoRelatedInstance getRelatedInstance() {
return relatedInstance;
}
- public void setRelatedInstance(SORelatedInstance relatedInstance) {
+ public void setRelatedInstance(SoRelatedInstance relatedInstance) {
this.relatedInstance = relatedInstance;
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.time.LocalDateTime;
import java.util.UUID;
-public class SORequest implements Serializable {
+public class SoRequest implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
private String requestType;
@SerializedName("requestDetails")
- private SORequestDetails requestDetails;
+ private SoRequestDetails requestDetails;
@SerializedName("requestStatus")
- private SORequestStatus requestStatus;
+ private SoRequestStatus requestStatus;
private transient SoOperationType operationType;
- public SORequest() {
+ public SoRequest() {
// required by author
}
return finishTime;
}
- public SORequestDetails getRequestDetails() {
+ public SoRequestDetails getRequestDetails() {
return requestDetails;
}
return requestScope;
}
- public SORequestStatus getRequestStatus() {
+ public SoRequestStatus getRequestStatus() {
return requestStatus;
}
this.finishTime = finishTime;
}
- public void setRequestDetails(SORequestDetails requestDetails) {
+ public void setRequestDetails(SoRequestDetails requestDetails) {
this.requestDetails = requestDetails;
}
this.requestScope = requestScope;
}
- public void setRequestStatus(SORequestStatus requestStatus) {
+ public void setRequestStatus(SoRequestStatus requestStatus) {
this.requestStatus = requestStatus;
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.util.List;
import java.util.Map;
-public class SORequestDetails implements Serializable {
+public class SoRequestDetails implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("modelInfo")
- private SOModelInfo modelInfo;
+ private SoModelInfo modelInfo;
@SerializedName("cloudConfiguration")
- private SOCloudConfiguration cloudConfiguration;
+ private SoCloudConfiguration cloudConfiguration;
@SerializedName("requestInfo")
- private SORequestInfo requestInfo;
+ private SoRequestInfo requestInfo;
@SerializedName("subscriberInfo")
- private SOSubscriberInfo subscriberInfo;
+ private SoSubscriberInfo subscriberInfo;
@SerializedName("relatedInstanceList")
- private List<SORelatedInstanceListElement> relatedInstanceList = new LinkedList<>();
+ private List<SoRelatedInstanceListElement> relatedInstanceList = new LinkedList<>();
@SerializedName("requestParameters")
- private SORequestParameters requestParameters;
+ private SoRequestParameters requestParameters;
@SerializedName("configurationParameters")
private List<Map<String, String>> configurationParameters = new LinkedList<>();
- public SORequestDetails() {
+ public SoRequestDetails() {
}
*
* @param soRequestDetails copy object
*/
- public SORequestDetails(SORequestDetails soRequestDetails) {
+ public SoRequestDetails(SoRequestDetails soRequestDetails) {
this.modelInfo = soRequestDetails.modelInfo;
this.cloudConfiguration = soRequestDetails.cloudConfiguration;
this.requestInfo = soRequestDetails.requestInfo;
if (getClass() != obj.getClass()) {
return false;
}
- SORequestDetails other = (SORequestDetails) obj;
+ SoRequestDetails other = (SoRequestDetails) obj;
if (cloudConfiguration == null) {
if (other.cloudConfiguration != null) {
return false;
return true;
}
- public SOCloudConfiguration getCloudConfiguration() {
+ public SoCloudConfiguration getCloudConfiguration() {
return cloudConfiguration;
}
- public SOModelInfo getModelInfo() {
+ public SoModelInfo getModelInfo() {
return modelInfo;
}
- public List<SORelatedInstanceListElement> getRelatedInstanceList() {
+ public List<SoRelatedInstanceListElement> getRelatedInstanceList() {
return relatedInstanceList;
}
- public SORequestInfo getRequestInfo() {
+ public SoRequestInfo getRequestInfo() {
return requestInfo;
}
- public SORequestParameters getRequestParameters() {
+ public SoRequestParameters getRequestParameters() {
return requestParameters;
}
return configurationParameters;
}
- public SOSubscriberInfo getSubscriberInfo() {
+ public SoSubscriberInfo getSubscriberInfo() {
return subscriberInfo;
}
return result;
}
- public void setCloudConfiguration(SOCloudConfiguration cloudConfiguration) {
+ public void setCloudConfiguration(SoCloudConfiguration cloudConfiguration) {
this.cloudConfiguration = cloudConfiguration;
}
- public void setModelInfo(SOModelInfo modelInfo) {
+ public void setModelInfo(SoModelInfo modelInfo) {
this.modelInfo = modelInfo;
}
- public void setRequestInfo(SORequestInfo requestInfo) {
+ public void setRequestInfo(SoRequestInfo requestInfo) {
this.requestInfo = requestInfo;
}
- public void setRequestParameters(SORequestParameters requestParameters) {
+ public void setRequestParameters(SoRequestParameters requestParameters) {
this.requestParameters = requestParameters;
}
this.configurationParameters = configurationParameters;
}
- public void setSubscriberInfo(SOSubscriberInfo subscriberInfo) {
+ public void setSubscriberInfo(SoSubscriberInfo subscriberInfo) {
this.subscriberInfo = subscriberInfo;
}
- public void setRelatedInstanceList(List<SORelatedInstanceListElement> relatedInstanceList) {
+ public void setRelatedInstanceList(List<SoRelatedInstanceListElement> relatedInstanceList) {
this.relatedInstanceList = relatedInstanceList;
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SORequestError implements Serializable {
+public class SoRequestError implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("policyException")
- private SOPolicyExceptionHolder policyException;
+ private SoPolicyExceptionHolder policyException;
@SerializedName("serviceException")
- private SOServiceExceptionHolder serviceException;
+ private SoServiceExceptionHolder serviceException;
- public SORequestError() {
+ public SoRequestError() {
// required by author
}
- public SOPolicyExceptionHolder getPolicyException() {
+ public SoPolicyExceptionHolder getPolicyException() {
return policyException;
}
- public SOServiceExceptionHolder getServiceException() {
+ public SoServiceExceptionHolder getServiceException() {
return serviceException;
}
- public void setPolicyException(SOPolicyExceptionHolder policyException) {
+ public void setPolicyException(SoPolicyExceptionHolder policyException) {
this.policyException = policyException;
}
- public void setServiceException(SOServiceExceptionHolder serviceException) {
+ public void setServiceException(SoServiceExceptionHolder serviceException) {
this.serviceException = serviceException;
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SORequestInfo implements Serializable {
+public class SoRequestInfo implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("requestorId")
private String requestorId;
- public SORequestInfo() {
+ public SoRequestInfo() {
// required by author
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.util.List;
import java.util.Map;
-public class SORequestParameters implements Serializable {
+public class SoRequestParameters implements Serializable {
private static final long serialVersionUID = -3283942659786236033L;
@SerializedName("userParams")
private List<Map<String, String>> userParams = new LinkedList<>();
- public SORequestParameters() {
+ public SoRequestParameters() {
// required by author
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SORequestReferences implements Serializable {
+public class SoRequestReferences implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SORequestStatus implements Serializable {
+public class SoRequestStatus implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("wasRolledBack")
private boolean wasRolledBack;
- public SORequestStatus() {
+ public SoRequestStatus() {
//required by author
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SOResponse implements Serializable {
+public class SoResponse implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("requestReferences")
- private SORequestReferences requestReferences;
+ private SoRequestReferences requestReferences;
@SerializedName("requestError")
- private SORequestError requestError;
+ private SoRequestError requestError;
@SerializedName("request")
- private SORequest request;
+ private SoRequest request;
private int httpResponseCode;
- public SOResponse() {
+ public SoResponse() {
// required by author
}
return httpResponseCode;
}
- public SORequest getRequest() {
+ public SoRequest getRequest() {
return request;
}
- public SORequestError getRequestError() {
+ public SoRequestError getRequestError() {
return requestError;
}
- public SORequestReferences getRequestReferences() {
+ public SoRequestReferences getRequestReferences() {
return requestReferences;
}
this.httpResponseCode = httpResponseCode;
}
- public void setRequest(SORequest request) {
+ public void setRequest(SoRequest request) {
this.request = request;
}
- public void setRequestError(SORequestError requestError) {
+ public void setRequestError(SoRequestError requestError) {
this.requestError = requestError;
}
- public void setRequestReferences(SORequestReferences requestReferences) {
+ public void setRequestReferences(SoRequestReferences requestReferences) {
this.requestReferences = requestReferences;
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SOResponseWrapper implements Serializable {
+public class SoResponseWrapper implements Serializable {
private static final long serialVersionUID = 7673023687132889069L;
@SerializedName("SoResponse")
- private SOResponse soResponse;
+ private SoResponse soResponse;
- private transient String requestID;
+ private transient String requestId;
- public SOResponseWrapper(SOResponse response, String reqID) {
+ public SoResponseWrapper(SoResponse response, String reqId) {
this.soResponse = response;
- this.requestID = reqID;
+ this.requestId = reqId;
}
@Override
if (getClass() != obj.getClass()) {
return false;
}
- SOResponseWrapper other = (SOResponseWrapper) obj;
+ SoResponseWrapper other = (SoResponseWrapper) obj;
if (soResponse == null) {
if (other.soResponse != null) {
return false;
else if (!soResponse.equals(other.soResponse)) {
return false;
}
- if (requestID == null) {
- if (other.requestID != null) {
+ if (requestId == null) {
+ if (other.requestId != null) {
return false;
}
}
- else if (!requestID.equals(other.requestID)) {
+ else if (!requestId.equals(other.requestId)) {
return false;
}
return true;
}
- public String getRequestID() {
- return requestID;
+ public String getRequestId() {
+ return requestId;
}
- public SOResponse getSoResponse() {
+ public SoResponse getSoResponse() {
return soResponse;
}
final int prime = 31;
int result = super.hashCode();
result = prime * result + ((soResponse == null) ? 0 : soResponse.hashCode());
- result = prime * result + ((requestID == null) ? 0 : requestID.hashCode());
+ result = prime * result + ((requestId == null) ? 0 : requestId.hashCode());
return result;
}
- public void setRequestID(String requestId) {
- this.requestID = requestId;
+ public void setRequestId(String requestId) {
+ this.requestId = requestId;
}
- public void setSoResponse(SOResponse response) {
+ public void setSoResponse(SoResponse response) {
soResponse = response;
}
@Override
public String toString() {
- return "SOResponseWrapper [SOResponse=" + soResponse + ", RequestID=" + requestID + "]";
+ return "SOResponseWrapper [SOResponse=" + soResponse + ", RequestID=" + requestId + "]";
}
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.util.LinkedList;
import java.util.List;
-public class SOServiceExceptionHolder implements Serializable {
+public class SoServiceExceptionHolder implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("variables")
private List<String> variables = new LinkedList<>();
- public SOServiceExceptionHolder() {
+ public SoServiceExceptionHolder() {
// required by author
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * 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.
import java.io.Serializable;
-public class SOSubscriberInfo implements Serializable {
+public class SoSubscriberInfo implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("subscriberName")
private String subscriberName;
- public SOSubscriberInfo() {
+ public SoSubscriberInfo() {
//required by author
}
* ============LICENSE_START=======================================================
* mso
* ================================================================================
- * Copyright (C) 2017 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.
import java.util.Map;
import org.junit.Test;
-import org.onap.policy.so.SOCloudConfiguration;
-import org.onap.policy.so.SOModelInfo;
-import org.onap.policy.so.SORelatedInstance;
-import org.onap.policy.so.SORelatedInstanceListElement;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestDetails;
-import org.onap.policy.so.SORequestInfo;
-import org.onap.policy.so.SORequestParameters;
+import org.onap.policy.so.SoCloudConfiguration;
+import org.onap.policy.so.SoModelInfo;
+import org.onap.policy.so.SoRelatedInstance;
+import org.onap.policy.so.SoRelatedInstanceListElement;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoRequestDetails;
+import org.onap.policy.so.SoRequestInfo;
+import org.onap.policy.so.SoRequestParameters;
import org.onap.policy.so.util.Serialization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Test
public void test() {
- SORequest request = new SORequest();
- request.setRequestDetails(new SORequestDetails());
- request.getRequestDetails().setModelInfo(new SOModelInfo());
- request.getRequestDetails().setCloudConfiguration(new SOCloudConfiguration());
- request.getRequestDetails().setRequestInfo(new SORequestInfo());
- request.getRequestDetails().setRequestParameters(new SORequestParameters());
+ SoRequest request = new SoRequest();
+ request.setRequestDetails(new SoRequestDetails());
+ request.getRequestDetails().setModelInfo(new SoModelInfo());
+ request.getRequestDetails().setCloudConfiguration(new SoCloudConfiguration());
+ request.getRequestDetails().setRequestInfo(new SoRequestInfo());
+ request.getRequestDetails().setRequestParameters(new SoRequestParameters());
request.getRequestDetails().getModelInfo().setModelType("vfModule");
request.getRequestDetails().getModelInfo().setModelInvariantId("ff5256d2-5a33-55df-13ab-12abad84e7ff");
request.getRequestDetails().getRequestInfo().setSource("VID");
request.getRequestDetails().getRequestInfo().setSuppressRollback(true);
- SORelatedInstanceListElement relatedInstanceListElement1 =
- new SORelatedInstanceListElement();
- SORelatedInstanceListElement relatedInstanceListElement2 =
- new SORelatedInstanceListElement();
- SORelatedInstanceListElement relatedInstanceListElement3 =
- new SORelatedInstanceListElement();
- relatedInstanceListElement1.setRelatedInstance(new SORelatedInstance());
- relatedInstanceListElement2.setRelatedInstance(new SORelatedInstance());
- relatedInstanceListElement3.setRelatedInstance(new SORelatedInstance());
+ SoRelatedInstanceListElement relatedInstanceListElement1 =
+ new SoRelatedInstanceListElement();
+ SoRelatedInstanceListElement relatedInstanceListElement2 =
+ new SoRelatedInstanceListElement();
+ SoRelatedInstanceListElement relatedInstanceListElement3 =
+ new SoRelatedInstanceListElement();
+ relatedInstanceListElement1.setRelatedInstance(new SoRelatedInstance());
+ relatedInstanceListElement2.setRelatedInstance(new SoRelatedInstance());
+ relatedInstanceListElement3.setRelatedInstance(new SoRelatedInstance());
relatedInstanceListElement1.getRelatedInstance().setInstanceId(
"17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c");
relatedInstanceListElement1.getRelatedInstance().setInstanceName(
"SOTESTVOL103a-vSAMP12_base_module-0_vol");
- relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SOModelInfo());
+ relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SoModelInfo());
relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelType("volumeGroup");
relatedInstanceListElement2.getRelatedInstance().setInstanceId("serviceInstanceId");
- relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SOModelInfo());
+ relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SoModelInfo());
relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelType("service");
relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelInvariantId(
"ff3514e3-5a33-55df-13ab-12abad84e7ff");
relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelVersion("1.0");
relatedInstanceListElement3.getRelatedInstance().setInstanceId("vnfInstanceId");
- relatedInstanceListElement3.getRelatedInstance().setModelInfo(new SOModelInfo());
+ relatedInstanceListElement3.getRelatedInstance().setModelInfo(new SoModelInfo());
relatedInstanceListElement3.getRelatedInstance().getModelInfo().setModelType("vnf");
relatedInstanceListElement3.getRelatedInstance().getModelInfo().setModelInvariantId(
"ff5256d1-5a33-55df-13ab-12abad84e7ff");
logger.debug("** HACK **");
- SORequest request = new SORequest();
+ SoRequest request = new SoRequest();
- request.setRequestDetails(new SORequestDetails());
- request.getRequestDetails().setModelInfo(new SOModelInfo());
- request.getRequestDetails().setCloudConfiguration(new SOCloudConfiguration());
- request.getRequestDetails().setRequestInfo(new SORequestInfo());
- request.getRequestDetails().setRequestParameters(new SORequestParameters());
+ request.setRequestDetails(new SoRequestDetails());
+ request.getRequestDetails().setModelInfo(new SoModelInfo());
+ request.getRequestDetails().setCloudConfiguration(new SoCloudConfiguration());
+ request.getRequestDetails().setRequestInfo(new SoRequestInfo());
+ request.getRequestDetails().setRequestParameters(new SoRequestParameters());
request.getRequestDetails().getRequestParameters().setUserParams(null);
request.getRequestDetails().getModelInfo().setModelType("vfModule");
request.getRequestDetails().getRequestInfo().setSource("POLICY");
request.getRequestDetails().getRequestInfo().setSuppressRollback(false);
- SORelatedInstanceListElement relatedInstanceListElement1 =
- new SORelatedInstanceListElement();
- SORelatedInstanceListElement relatedInstanceListElement2 =
- new SORelatedInstanceListElement();
- relatedInstanceListElement1.setRelatedInstance(new SORelatedInstance());
- relatedInstanceListElement2.setRelatedInstance(new SORelatedInstance());
+ SoRelatedInstanceListElement relatedInstanceListElement1 =
+ new SoRelatedInstanceListElement();
+ SoRelatedInstanceListElement relatedInstanceListElement2 =
+ new SoRelatedInstanceListElement();
+ relatedInstanceListElement1.setRelatedInstance(new SoRelatedInstance());
+ relatedInstanceListElement2.setRelatedInstance(new SoRelatedInstance());
String serviceInstanceId = "98af39ce-6408-466b-921f-c2c7a8f59ed6";
relatedInstanceListElement1.getRelatedInstance().setInstanceId(serviceInstanceId);
- relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SOModelInfo());
+ relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SoModelInfo());
relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelType("service");
relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelInvariantId(
"24329a0c-1d57-4210-b1af-a65df64e9d59");
String vnfInstanceId = "8eb411b8-a936-412f-b01f-9a9a435c0e93";
relatedInstanceListElement2.getRelatedInstance().setInstanceId(vnfInstanceId);
- relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SOModelInfo());
+ relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SoModelInfo());
relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelType("vnf");
relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelInvariantId(
"09fd971e-db5f-475d-997c-cf6704b6b8fe");
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SOAsyncRequestStatus obj = new SOAsyncRequestStatus();
+ SoAsyncRequestStatus obj = new SoAsyncRequestStatus();
assertTrue(obj.getCorrelator() == null);
assertTrue(obj.getFinishTime() == null);
@Test
public void testSetGet() {
- SOAsyncRequestStatus obj = new SOAsyncRequestStatus();
+ SoAsyncRequestStatus obj = new SoAsyncRequestStatus();
obj.setCorrelator("correlator");
assertEquals("correlator", obj.getCorrelator());
obj.setFinishTime(finishTime);
assertEquals(finishTime, obj.getFinishTime());
- SOInstanceReferences instanceReferences = new SOInstanceReferences();
+ SoInstanceReferences instanceReferences = new SoInstanceReferences();
obj.setInstanceReferences(instanceReferences);
assertEquals(instanceReferences, obj.getInstanceReferences());
obj.setRequestScope("requestScope");
assertEquals("requestScope", obj.getRequestScope());
- SORequestStatus requestStatus = new SORequestStatus();
+ SoRequestStatus requestStatus = new SoRequestStatus();
obj.setRequestStatus(requestStatus);
assertEquals(requestStatus, obj.getRequestStatus());
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SOCloudConfiguration obj = new SOCloudConfiguration();
+ SoCloudConfiguration obj = new SoCloudConfiguration();
assertTrue(obj.getLcpCloudRegionId() == null);
assertTrue(obj.getTenantId() == null);
@Test
public void testSetGet() {
- SOCloudConfiguration obj = new SOCloudConfiguration();
+ SoCloudConfiguration obj = new SoCloudConfiguration();
obj.setLcpCloudRegionId("lcpCloudRegionId");
assertEquals("lcpCloudRegionId", obj.getLcpCloudRegionId());
* ================================================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* ================================================================================
- * Modifications Copyright (C) 2018 AT&T. All rights reserved.
+ * Modifications Copyright (C) 2018-2019 AT&T. 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.
private static int getMessagesReceived = 0;
private static int deleteMessagesReceived = 0;
- private static Map<String, SOResponse> ongoingRequestMap = new ConcurrentHashMap<>();
+ private static Map<String, SoResponse> ongoingRequestMap = new ConcurrentHashMap<>();
/**
* Stats method.
@Path("/orchestrationRequests/v5/{nsInstanceId}")
public Response soRequestStatus(@PathParam("nsInstanceId") final String nsInstanceId) {
- SOResponse response = ongoingRequestMap.get(nsInstanceId);
+ SoResponse response = ongoingRequestMap.get(nsInstanceId);
int iterationsLeft = Integer.valueOf(response.getRequest().getRequestScope());
if (--iterationsLeft > 0) {
response.getRequest().setRequestScope(new Integer(iterationsLeft).toString());
- String responseString = new Gson().toJson(response, SOResponse.class);
+ String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode()).entity(responseString).build();
}
response.getRequest().getRequestStatus().setRequestState("COMPLETE");
response.getRequest().setRequestScope("0");
response.setHttpResponseCode(200);
- String responseString = new Gson().toJson(response, SOResponse.class);
+ String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode()).entity(responseString).build();
}
return Response.status(400).build();
}
- SORequest request = null;
+ SoRequest request = null;
try {
- request = new Gson().fromJson(jsonString, SORequest.class);
+ request = new Gson().fromJson(jsonString, SoRequest.class);
} catch (Exception e) {
return Response.status(400).build();
}
+ ",\"DELETE\": " + deleteMessagesReceived + "}").build();
}
- SOResponse response = new SOResponse();
+ SoResponse response = new SoResponse();
response.setRequest(request);
- response.setRequestReferences(new SORequestReferences());
+ response.setRequestReferences(new SoRequestReferences());
response.getRequestReferences().setRequestId(request.getRequestId().toString());
if ("ReturnCompleted".equals(request.getRequestType())) {
response.getRequest().getRequestStatus().setRequestState("COMPLETE");
response.setHttpResponseCode(200);
- String responseString = new Gson().toJson(response, SOResponse.class);
+ String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
.entity(responseString)
.build();
if ("ReturnFailed".equals(request.getRequestType())) {
response.getRequest().getRequestStatus().setRequestState("FAILED");
response.setHttpResponseCode(200);
- String responseString = new Gson().toJson(response, SOResponse.class);
+ String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
.entity(responseString)
.build();
response.getRequest().getRequestStatus().setRequestState("ONGOING");
response.setHttpResponseCode(202);
- String responseString = new Gson().toJson(response, SOResponse.class);
+ String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
.entity(responseString)
.build();
response.getRequest().getRequestStatus().setRequestState("ONGOING");
response.setHttpResponseCode(200);
- String responseString = new Gson().toJson(response, SOResponse.class);
+ String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
.entity(responseString)
.build();
response.getRequest().getRequestStatus().setRequestState("ONGOING");
response.setHttpResponseCode(200);
- String responseString = new Gson().toJson(response, SOResponse.class);
+ String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
.entity(responseString)
.build();
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SOInstanceReferences obj = new SOInstanceReferences();
+ SoInstanceReferences obj = new SoInstanceReferences();
assertTrue(obj.getInstanceId() == null);
assertTrue(obj.getRequestId() == null);
@Test
public void testSetGet() {
- SOInstanceReferences obj = new SOInstanceReferences();
+ SoInstanceReferences obj = new SoInstanceReferences();
obj.setInstanceId("instanceId");
assertEquals("instanceId", obj.getInstanceId());
* TestSOManager
* ================================================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright (C) 2018-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.
@Test
public void testServiceInstantiation() throws IOException {
- SOManager manager = new SOManager();
+ SoManager manager = new SoManager();
assertNotNull(manager);
manager.setRestGetTimeout(100);
- SOResponse response = manager.createModuleInstance("http:/localhost:99999999", BASE_SO_URI, "sean",
+ SoResponse response = manager.createModuleInstance("http:/localhost:99999999", BASE_SO_URI, "sean",
"citizen", null);
assertNull(response);
assertNull(response);
response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
- "citizen", new SORequest());
+ "citizen", new SoRequest());
assertNull(response);
- SORequest request = new SORequest();
+ SoRequest request = new SoRequest();
request.setRequestId(UUID.randomUUID());
request.setRequestScope("Test");
request.setRequestType("ReturnBadJson");
request.setStartTime("2018-03-23 16:31");
- request.setRequestStatus(new SORequestStatus());
+ request.setRequestStatus(new SoRequestStatus());
request.getRequestStatus().setRequestState("ONGOING");
response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
@Test
public void testVfModuleCreation() throws IOException {
- SOManager manager = new SOManager();
+ SoManager manager = new SoManager();
assertNotNull(manager);
manager.setRestGetTimeout(100);
WorkingMemory wm = new DummyWorkingMemory();
- SORequest soRequest = new SORequest();
+ 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(), wm,
UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals(999, response.getHttpResponseCode());
} catch (Exception e) {
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(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), soRequest);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals(999, response.getHttpResponseCode());
} catch (Exception e) {
fail("test should not throw an exception");
}
- SORequest request = new SORequest();
+ SoRequest request = new SoRequest();
request.setRequestId(UUID.randomUUID());
request.setRequestScope("Test");
request.setRequestType("ReturnBadJson");
request.setStartTime("2018-03-23 16:31");
- request.setRequestStatus(new SORequestStatus());
+ request.setRequestStatus(new SoRequestStatus());
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(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals(999, response.getHttpResponseCode());
} catch (Exception e) {
fail("test should not throw an exception");
request.setRequestType("ReturnCompleted");
- asyncRestCallFuture = manager.asyncSORestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
} catch (Exception e) {
fail("test should not throw an exception");
}
request.setRequestType("ReturnFailed");
- asyncRestCallFuture = manager.asyncSORestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals("FAILED", response.getRequest().getRequestStatus().getRequestState());
} catch (Exception e) {
fail("test should not throw an exception");
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(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertNotNull(response.getRequest());
assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
} catch (Exception e) {
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(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertNotNull(response.getRequest());
assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
} catch (Exception e) {
// 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(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals(999, response.getHttpResponseCode());
} catch (Exception e) {
fail("test should not throw an exception");
// 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(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals(999, response.getHttpResponseCode());
} catch (Exception e) {
fail("test should not throw an exception");
@Test
public void testVfModuleDeletion() {
- SOManager manager = new SOManager();
+ SoManager manager = new SoManager();
assertNotNull(manager);
manager.setRestGetTimeout(100);
WorkingMemory wm = new DummyWorkingMemory();
- SORequest soRequest = new SORequest();
+ 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(), wm,
UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals(999, response.getHttpResponseCode());
} catch (Exception e) {
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(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals(999, response.getHttpResponseCode());
} catch (Exception e) {
fail("test should not throw an exception");
}
- SORequest request = new SORequest();
+ SoRequest request = new SoRequest();
request.setRequestId(UUID.randomUUID());
request.setRequestScope("Test");
request.setRequestType("ReturnBadJson");
request.setStartTime("2018-03-23 16:31");
- request.setRequestStatus(new SORequestStatus());
+ request.setRequestStatus(new SoRequestStatus());
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(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals(999, response.getHttpResponseCode());
} catch (Exception e) {
fail("test should not throw an exception");
request.setRequestType("ReturnCompleted");
- asyncRestCallFuture = manager.asyncSORestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
} catch (Exception e) {
fail("test should not throw an exception");
}
request.setRequestType("ReturnFailed");
- asyncRestCallFuture = manager.asyncSORestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
+ asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals("FAILED", response.getRequest().getRequestStatus().getRequestState());
} catch (Exception e) {
fail("test should not throw an exception");
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(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertNotNull(response.getRequest());
assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
} catch (Exception e) {
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(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertNotNull(response.getRequest());
assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
} catch (Exception e) {
// 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(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals(999, response.getHttpResponseCode());
} catch (Exception e) {
fail("test should not throw an exception");
// 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(), wm, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
try {
- SOResponse response = asyncRestCallFuture.get();
+ SoResponse response = asyncRestCallFuture.get();
assertEquals(999, response.getHttpResponseCode());
} catch (Exception e) {
fail("test should not throw an exception");
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SOModelInfo obj = new SOModelInfo();
+ SoModelInfo obj = new SoModelInfo();
assertTrue(obj.getModelCustomizationId() == null);
assertTrue(obj.getModelCustomizationName() == null);
@Test
public void testSetGet() {
- SOModelInfo obj = new SOModelInfo();
+ SoModelInfo obj = new SoModelInfo();
obj.setModelCustomizationId("modelCustomizationId");
assertEquals("modelCustomizationId", obj.getModelCustomizationId());
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * Copyright (C) 2017 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.
@Test
public void testConstructor() {
- SOPolicyExceptionHolder obj = new SOPolicyExceptionHolder();
+ SoPolicyExceptionHolder obj = new SoPolicyExceptionHolder();
assertTrue(obj.getMessageId() == null);
assertTrue(obj.getText() == null);
@Test
public void testSetGet() {
- SOPolicyExceptionHolder obj = new SOPolicyExceptionHolder();
+ SoPolicyExceptionHolder obj = new SoPolicyExceptionHolder();
obj.setMessageId("messageId");
assertEquals("messageId", obj.getMessageId());
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SORelatedInstanceListElement obj = new SORelatedInstanceListElement();
+ SoRelatedInstanceListElement obj = new SoRelatedInstanceListElement();
assertTrue(obj.getRelatedInstance() == null);
}
@Test
public void testSetGet() {
- SORelatedInstanceListElement obj = new SORelatedInstanceListElement();
+ SoRelatedInstanceListElement obj = new SoRelatedInstanceListElement();
- SORelatedInstance relatedInstance = new SORelatedInstance();
+ SoRelatedInstance relatedInstance = new SoRelatedInstance();
obj.setRelatedInstance(relatedInstance);
assertEquals(relatedInstance, obj.getRelatedInstance());
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * Copyright (C) 2017 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.
@Test
public void testConstructor() {
- SORelatedInstance obj = new SORelatedInstance();
+ SoRelatedInstance obj = new SoRelatedInstance();
assertTrue(obj.getInstanceId() == null);
assertTrue(obj.getInstanceName() == null);
@Test
public void testSetGet() {
- SORelatedInstance obj = new SORelatedInstance();
+ SoRelatedInstance obj = new SoRelatedInstance();
obj.setInstanceId("instanceId");
assertEquals("instanceId", obj.getInstanceId());
obj.setInstanceName("instanceName");
assertEquals("instanceName", obj.getInstanceName());
- SOModelInfo modelInfo = new SOModelInfo();
+ SoModelInfo modelInfo = new SoModelInfo();
obj.setModelInfo(modelInfo);
assertEquals(modelInfo, obj.getModelInfo());
}
* ================================================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* ================================================================================
+ * Modifications Copyright (C) 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.
* You may obtain a copy of the License at
@Test
public void testConstructor() {
- SORequestDetails obj = new SORequestDetails();
+ SoRequestDetails obj = new SoRequestDetails();
assertTrue(obj.getCloudConfiguration() == null);
assertTrue(obj.getModelInfo() == null);
@Test
public void testSetGet() {
- SORequestDetails obj = new SORequestDetails();
+ SoRequestDetails obj = new SoRequestDetails();
- SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();
+ SoCloudConfiguration cloudConfiguration = new SoCloudConfiguration();
obj.setCloudConfiguration(cloudConfiguration);
assertEquals(cloudConfiguration, obj.getCloudConfiguration());
- SOModelInfo modelInfo = new SOModelInfo();
+ SoModelInfo modelInfo = new SoModelInfo();
obj.setModelInfo(modelInfo);
assertEquals(modelInfo, obj.getModelInfo());
- SORequestInfo requestInfo = new SORequestInfo();
+ SoRequestInfo requestInfo = new SoRequestInfo();
obj.setRequestInfo(requestInfo);
assertEquals(requestInfo, obj.getRequestInfo());
- SORequestParameters requestParameters = new SORequestParameters();
+ SoRequestParameters requestParameters = new SoRequestParameters();
obj.setRequestParameters(requestParameters);
assertEquals(requestParameters, obj.getRequestParameters());
- SOSubscriberInfo subscriberInfo = new SOSubscriberInfo();
+ SoSubscriberInfo subscriberInfo = new SoSubscriberInfo();
obj.setSubscriberInfo(subscriberInfo);
assertEquals(subscriberInfo, obj.getSubscriberInfo());
}
@Test
public void testSoMRequestDetailsMethods() {
- SORequestDetails details = new SORequestDetails();
+ SoRequestDetails details = new SoRequestDetails();
assertNotNull(details);
assertNotEquals(0, details.hashCode());
- SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();
+ SoCloudConfiguration cloudConfiguration = new SoCloudConfiguration();
details.setCloudConfiguration(cloudConfiguration);
assertEquals(cloudConfiguration, details.getCloudConfiguration());
assertNotEquals(0, details.hashCode());
- SOModelInfo modelInfo = new SOModelInfo();
+ SoModelInfo modelInfo = new SoModelInfo();
details.setModelInfo(modelInfo);
assertEquals(modelInfo, details.getModelInfo());
assertNotEquals(0, details.hashCode());
- List<SORelatedInstanceListElement> relatedInstanceList = new ArrayList<>();
+ List<SoRelatedInstanceListElement> relatedInstanceList = new ArrayList<>();
details.setRelatedInstanceList(relatedInstanceList);
assertEquals(relatedInstanceList, details.getRelatedInstanceList());
assertNotEquals(0, details.hashCode());
- SORequestInfo requestInfo = new SORequestInfo();
+ SoRequestInfo requestInfo = new SoRequestInfo();
details.setRequestInfo(requestInfo);
assertEquals(requestInfo, details.getRequestInfo());
assertNotEquals(0, details.hashCode());
- SORequestParameters requestParameters = new SORequestParameters();
+ SoRequestParameters requestParameters = new SoRequestParameters();
details.setRequestParameters(requestParameters);
assertEquals(requestParameters, details.getRequestParameters());
assertNotEquals(0, details.hashCode());
- SOSubscriberInfo subscriberInfo = new SOSubscriberInfo();
+ SoSubscriberInfo subscriberInfo = new SoSubscriberInfo();
details.setSubscriberInfo(subscriberInfo);
assertEquals(subscriberInfo, details.getSubscriberInfo());
assertNotEquals(0, details.hashCode());
assertEquals("SORequestDetails [modelInfo=org.onap.policy.so", details.toString().substring(0, 46));
- SORequestDetails copiedDetails = new SORequestDetails(details);
+ SoRequestDetails copiedDetails = new SoRequestDetails(details);
assertTrue(details.equals(details));
assertTrue(details.equals(copiedDetails));
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SORequestError obj = new SORequestError();
+ SoRequestError obj = new SoRequestError();
assertTrue(obj.getPolicyException() == null);
assertTrue(obj.getServiceException() == null);
@Test
public void testSetGet() {
- SORequestError obj = new SORequestError();
+ SoRequestError obj = new SoRequestError();
- SOPolicyExceptionHolder policyException = new SOPolicyExceptionHolder();
+ SoPolicyExceptionHolder policyException = new SoPolicyExceptionHolder();
obj.setPolicyException(policyException);
assertEquals(policyException, obj.getPolicyException());
- SOServiceExceptionHolder serviceException = new SOServiceExceptionHolder();
+ SoServiceExceptionHolder serviceException = new SoServiceExceptionHolder();
obj.setServiceException(serviceException);
assertEquals(serviceException, obj.getServiceException());
}
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SORequestInfo obj = new SORequestInfo();
+ SoRequestInfo obj = new SoRequestInfo();
assertTrue(obj.getBillingAccountNumber() == null);
assertTrue(obj.getCallbackUrl() == null);
@Test
public void testSetGet() {
- SORequestInfo obj = new SORequestInfo();
+ SoRequestInfo obj = new SoRequestInfo();
obj.setBillingAccountNumber("billingAccountNumber");
assertEquals("billingAccountNumber", obj.getBillingAccountNumber());
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SORequestParameters obj = new SORequestParameters();
+ SoRequestParameters obj = new SoRequestParameters();
assertTrue(obj.getSubscriptionServiceType() == null);
assertTrue(obj.getUserParams() != null);
@Test
public void testSetGet() {
- SORequestParameters obj = new SORequestParameters();
+ SoRequestParameters obj = new SoRequestParameters();
obj.setSubscriptionServiceType("subscriptionServiceType");
assertEquals("subscriptionServiceType", obj.getSubscriptionServiceType());
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SORequestReferences obj = new SORequestReferences();
+ SoRequestReferences obj = new SoRequestReferences();
assertTrue(obj.getInstanceId() == null);
assertTrue(obj.getRequestId() == null);
@Test
public void testSetGet() {
- SORequestReferences obj = new SORequestReferences();
+ SoRequestReferences obj = new SoRequestReferences();
obj.setInstanceId("instanceId");
assertEquals("instanceId", obj.getInstanceId());
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SORequestStatus obj = new SORequestStatus();
+ SoRequestStatus obj = new SoRequestStatus();
assertEquals(0, obj.getPercentProgress());
assertTrue(obj.getRequestState() == null);
@Test
public void testSetGet() {
- SORequestStatus obj = new SORequestStatus();
+ SoRequestStatus obj = new SoRequestStatus();
obj.setPercentProgress(2008);
assertEquals(2008, obj.getPercentProgress());
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SORequest obj = new SORequest();
+ SoRequest obj = new SoRequest();
assertTrue(obj.getFinishTime() == null);
assertTrue(obj.getRequestDetails() == null);
@Test
public void testSetGet() {
- SORequest obj = new SORequest();
+ SoRequest obj = new SoRequest();
LocalDateTime finishTime = LocalDateTime.now();
obj.setFinishTime(finishTime);
obj.setRequestScope("requestScope");
assertEquals("requestScope", obj.getRequestScope());
- SORequestStatus requestStatus = new SORequestStatus();
+ SoRequestStatus requestStatus = new SoRequestStatus();
obj.setRequestStatus(requestStatus);
assertEquals(requestStatus, obj.getRequestStatus());
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SOResponse obj = new SOResponse();
+ SoResponse obj = new SoResponse();
assertEquals(0, obj.getHttpResponseCode());
assertTrue(obj.getRequest() == null);
@Test
public void testSetGet() {
- SOResponse obj = new SOResponse();
+ SoResponse obj = new SoResponse();
obj.setHttpResponseCode(2008);
assertEquals(2008, obj.getHttpResponseCode());
- SORequest request = new SORequest();
+ SoRequest request = new SoRequest();
obj.setRequest(request);
assertEquals(request, obj.getRequest());
- SORequestError requestError = new SORequestError();
+ SoRequestError requestError = new SoRequestError();
obj.setRequestError(requestError);
assertEquals(requestError, obj.getRequestError());
- SORequestReferences requestReferences = new SORequestReferences();
+ SoRequestReferences requestReferences = new SoRequestReferences();
obj.setRequestReferences(requestReferences);
assertEquals(requestReferences, obj.getRequestReferences());
}
* ============LICENSE_START=======================================================
* so
* ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-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.
@Test
public void testConstructor() {
- SOResponse response = new SOResponse();
- SOResponseWrapper obj = new SOResponseWrapper(response, "reqID");
+ SoResponse response = new SoResponse();
+ SoResponseWrapper obj = new SoResponseWrapper(response, "reqID");
assertEquals(response, obj.getSoResponse());
- assertEquals("reqID", obj.getRequestID());
+ assertEquals("reqID", obj.getRequestId());
}
@Test
public void testSetGet() {
- SOResponse response = new SOResponse();
- SOResponseWrapper obj = new SOResponseWrapper(response, "reqID");
+ SoResponse response = new SoResponse();
+ SoResponseWrapper obj = new SoResponseWrapper(response, "reqID");
- SOResponse response2 = new SOResponse();
+ SoResponse response2 = new SoResponse();
response2.setHttpResponseCode(2008);
obj.setSoResponse(response2);
assertEquals(response2, obj.getSoResponse());
- obj.setRequestID("id2");
- assertEquals("id2", obj.getRequestID());
+ obj.setRequestId("id2");
+ assertEquals("id2", obj.getRequestId());
}
@Test
public void testSoResponseWrapperMethods() {
String requestId = UUID.randomUUID().toString();
- SOResponse response = new SOResponse();
+ SoResponse response = new SoResponse();
- SOResponseWrapper responseWrapper = new SOResponseWrapper(response, requestId);
+ SoResponseWrapper responseWrapper = new SoResponseWrapper(response, requestId);
assertNotNull(responseWrapper);
assertNotEquals(0, responseWrapper.hashCode());
assertEquals("SOResponseWrapper [SOResponse=org.onap.policy.", responseWrapper.toString().substring(0, 46));
- SOResponseWrapper identicalResponseWrapper = new SOResponseWrapper(response, requestId);
+ SoResponseWrapper identicalResponseWrapper = new SoResponseWrapper(response, requestId);
assertEquals(responseWrapper, responseWrapper);
assertEquals(responseWrapper, identicalResponseWrapper);
assertFalse(responseWrapper.equals(null));
assertFalse(responseWrapper.equals("AString"));
- assertEquals(new SOResponseWrapper(null, null), new SOResponseWrapper(null, null));
- assertNotEquals(new SOResponseWrapper(null, null), identicalResponseWrapper);
+ assertEquals(new SoResponseWrapper(null, null), new SoResponseWrapper(null, null));
+ assertNotEquals(new SoResponseWrapper(null, null), identicalResponseWrapper);
- assertNotEquals(0, new SOResponseWrapper(null, null).hashCode());
+ assertNotEquals(0, new SoResponseWrapper(null, null).hashCode());
- identicalResponseWrapper.setSoResponse(new SOResponse());
+ identicalResponseWrapper.setSoResponse(new SoResponse());
assertNotEquals(responseWrapper, identicalResponseWrapper);
identicalResponseWrapper.setSoResponse(response);
assertEquals(responseWrapper, identicalResponseWrapper);
- identicalResponseWrapper.setRequestID(UUID.randomUUID().toString());
+ identicalResponseWrapper.setRequestId(UUID.randomUUID().toString());
assertNotEquals(responseWrapper, identicalResponseWrapper);
- identicalResponseWrapper.setRequestID(requestId);
+ identicalResponseWrapper.setRequestId(requestId);
assertEquals(responseWrapper, identicalResponseWrapper);
- responseWrapper.setRequestID(null);
+ responseWrapper.setRequestId(null);
assertNotEquals(responseWrapper, identicalResponseWrapper);
- identicalResponseWrapper.setRequestID(null);
+ identicalResponseWrapper.setRequestId(null);
assertEquals(responseWrapper, identicalResponseWrapper);
- responseWrapper.setRequestID(requestId);
+ responseWrapper.setRequestId(requestId);
assertNotEquals(responseWrapper, identicalResponseWrapper);
- identicalResponseWrapper.setRequestID(requestId);
+ identicalResponseWrapper.setRequestId(requestId);
assertEquals(responseWrapper, identicalResponseWrapper);
}
}
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SOServiceExceptionHolder obj = new SOServiceExceptionHolder();
+ SoServiceExceptionHolder obj = new SoServiceExceptionHolder();
assertTrue(obj.getMessageId() == null);
assertTrue(obj.getText() == null);
@Test
public void testSetGet() {
- SOServiceExceptionHolder obj = new SOServiceExceptionHolder();
+ SoServiceExceptionHolder obj = new SoServiceExceptionHolder();
obj.setMessageId("messageId");
assertEquals("messageId", obj.getMessageId());
* so
* ================================================================================
*
+ * Modifications Copyright (C) 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.
@Test
public void testConstructor() {
- SOSubscriberInfo obj = new SOSubscriberInfo();
+ SoSubscriberInfo obj = new SoSubscriberInfo();
assertTrue(obj.getGlobalSubscriberId() == null);
assertTrue(obj.getSubscriberCommonSiteId() == null);
@Test
public void testSetGet() {
- SOSubscriberInfo obj = new SOSubscriberInfo();
+ SoSubscriberInfo obj = new SoSubscriberInfo();
obj.setGlobalSubscriberId("globalSubscriberId");
assertEquals("globalSubscriberId", obj.getGlobalSubscriberId());
* ============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.
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestReferences;
-import org.onap.policy.so.SORequestStatus;
-import org.onap.policy.so.SOResponse;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoRequestReferences;
+import org.onap.policy.so.SoRequestStatus;
+import org.onap.policy.so.SoResponse;
@Path("/serviceInstantiation")
public class SoSimulatorJaxRs {
@Produces("application/json")
public String soPostQuery(@PathParam("serviceInstanceId") final String serviceInstanceId,
@PathParam("vnfInstanceId") final String vnfInstanceId) {
- final SORequest request = new SORequest();
- final SORequestStatus requestStatus = new SORequestStatus();
+ final SoRequest request = new SoRequest();
+ final SoRequestStatus requestStatus = new SoRequestStatus();
requestStatus.setRequestState("COMPLETE");
request.setRequestStatus(requestStatus);
request.setRequestId(UUID.randomUUID());
- final SOResponse response = new SOResponse();
+ final SoResponse response = new SoResponse();
- final SORequestReferences requestReferences = new SORequestReferences();
+ final SoRequestReferences requestReferences = new SoRequestReferences();
final String requestId = UUID.randomUUID().toString();
requestReferences.setRequestId(requestId);
response.setRequestReferences(requestReferences);
* ============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.
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.so.SOCloudConfiguration;
-import org.onap.policy.so.SOModelInfo;
-import org.onap.policy.so.SORelatedInstance;
-import org.onap.policy.so.SORelatedInstanceListElement;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestDetails;
-import org.onap.policy.so.SORequestInfo;
-import org.onap.policy.so.SORequestParameters;
-import org.onap.policy.so.SOResponse;
+import org.onap.policy.so.SoCloudConfiguration;
+import org.onap.policy.so.SoModelInfo;
+import org.onap.policy.so.SoRelatedInstance;
+import org.onap.policy.so.SoRelatedInstanceListElement;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoRequestDetails;
+import org.onap.policy.so.SoRequestInfo;
+import org.onap.policy.so.SoRequestParameters;
+import org.onap.policy.so.SoResponse;
import org.onap.policy.so.util.Serialization;
public class SoSimulatorTest {
/**
* Create dummy SO request for TestResponse() junit.
*/
- private SORequest createTestRequest() {
+ private SoRequest createTestRequest() {
// Construct SO Request
- final SORequest request = new SORequest();
+ final SoRequest request = new SoRequest();
request.setRequestId(UUID.randomUUID());
- request.setRequestDetails(new SORequestDetails());
- request.getRequestDetails().setModelInfo(new SOModelInfo());
- request.getRequestDetails().setCloudConfiguration(new SOCloudConfiguration());
- request.getRequestDetails().setRequestInfo(new SORequestInfo());
- request.getRequestDetails().setRequestParameters(new SORequestParameters());
+ request.setRequestDetails(new SoRequestDetails());
+ request.getRequestDetails().setModelInfo(new SoModelInfo());
+ request.getRequestDetails().setCloudConfiguration(new SoCloudConfiguration());
+ request.getRequestDetails().setRequestInfo(new SoRequestInfo());
+ request.getRequestDetails().setRequestParameters(new SoRequestParameters());
request.getRequestDetails().getRequestParameters().setUserParams(null);
//
// cloudConfiguration
//
// relatedInstanceList
//
- final SORelatedInstanceListElement relatedInstanceListElement1 = new SORelatedInstanceListElement();
- final SORelatedInstanceListElement relatedInstanceListElement2 = new SORelatedInstanceListElement();
- relatedInstanceListElement1.setRelatedInstance(new SORelatedInstance());
- relatedInstanceListElement2.setRelatedInstance(new SORelatedInstance());
+ final SoRelatedInstanceListElement relatedInstanceListElement1 = new SoRelatedInstanceListElement();
+ final SoRelatedInstanceListElement relatedInstanceListElement2 = new SoRelatedInstanceListElement();
+ relatedInstanceListElement1.setRelatedInstance(new SoRelatedInstance());
+ relatedInstanceListElement2.setRelatedInstance(new SoRelatedInstance());
//
relatedInstanceListElement1.getRelatedInstance().setInstanceId("cf8426a6-0b53-4e3d-bfa6-4b2f4d5913a5");
- relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SOModelInfo());
+ relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SoModelInfo());
relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelType("service");
relatedInstanceListElement1.getRelatedInstance().getModelInfo()
.setModelInvariantId("4fcbc1c0-7793-46d8-8aa1-fa1c2ed9ec7b");
relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelVersion("1.0");
//
relatedInstanceListElement2.getRelatedInstance().setInstanceId("594e2fe0-48b8-41ff-82e2-3d4bab69b192");
- relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SOModelInfo());
+ relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SoModelInfo());
relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelType("vnf");
relatedInstanceListElement2.getRelatedInstance().getModelInfo()
.setModelInvariantId("033a32ed-aa65-4764-a736-36f2942f1aa0");
"username",
"password", new HashMap<>(), "application/json", request);
assertNotNull(httpDetails);
- final SOResponse response = Serialization.gsonPretty.fromJson(httpDetails.second, SOResponse.class);
+ final SoResponse response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
assertNotNull(response);
}
}
import org.onap.policy.vfc.VfcRequest;
import org.onap.policy.vfc.VfcResponse;
import org.onap.policy.vfc.VfcManager;
-import org.onap.policy.so.SOManager;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestStatus;
-import org.onap.policy.so.SORequestDetails;
-import org.onap.policy.so.SOModelInfo;
-import org.onap.policy.so.SOCloudConfiguration;
-import org.onap.policy.so.SORequestInfo;
-import org.onap.policy.so.SORequestParameters;
-import org.onap.policy.so.SORelatedInstanceListElement;
-import org.onap.policy.so.SORelatedInstance;
-import org.onap.policy.so.SOResponse;
-import org.onap.policy.so.SOResponseWrapper;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoResponseWrapper;
import org.onap.policy.sdnc.SdncRequest;
import org.onap.policy.sdnc.SdncManager;
import org.onap.policy.sdnc.SdncResponse;
// the response recieved and used
// in the construction of the SO Request which is stored in operationRequest
- if(request instanceof SORequest) {
+ if(request instanceof SoRequest) {
// Call SO. The response will be inserted into memory once it's received
SoActorServiceProvider.sendRequest($event.getRequestId().toString(), drools.getWorkingMemory(),
request);
$opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(),
requestID == $event.getRequestId().toString(), timerType == "Operation", !expired )
$lock : TargetLock (requestID == $event.getRequestId())
- $response : SOResponseWrapper(requestID.toString() == $event.getRequestId().toString() )
+ $response : SoResponseWrapper(requestId.toString() == $event.getRequestId().toString() )
then
Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
import org.onap.policy.vfc.VfcRequest;
import org.onap.policy.vfc.VfcResponse;
import org.onap.policy.vfc.VfcManager;
-import org.onap.policy.so.SOManager;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestStatus;
-import org.onap.policy.so.SORequestDetails;
-import org.onap.policy.so.SOModelInfo;
-import org.onap.policy.so.SOCloudConfiguration;
-import org.onap.policy.so.SORequestInfo;
-import org.onap.policy.so.SORequestParameters;
-import org.onap.policy.so.SORelatedInstanceListElement;
-import org.onap.policy.so.SORelatedInstance;
-import org.onap.policy.so.SOResponse;
-import org.onap.policy.so.SOResponseWrapper;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoResponseWrapper;
import org.onap.policy.sdnc.SdncRequest;
import org.onap.policy.sdnc.SdncManager;
import org.onap.policy.sdnc.SdncResponse;
// at this point the AAI named query request should have already been made, the response
// recieved and used in the construction of the SO Request which is stored in operationRequest
- if(request instanceof SORequest) {
+ if(request instanceof SoRequest) {
// Call SO. The response will be inserted into memory once it's received
SoActorServiceProvider.sendRequest($event.getRequestId().toString(), drools.getWorkingMemory(), request);
}
$opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(),
requestID == $event.getRequestId().toString(), timerType == "Operation", !expired )
$lock : TargetLock (requestID == $event.getRequestId())
- $response : SOResponseWrapper(requestID.toString() == $event.getRequestId().toString() )
+ $response : SoResponseWrapper(requestId.toString() == $event.getRequestId().toString() )
then
Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
import org.onap.policy.vfc.VfcRequest;
import org.onap.policy.vfc.VfcResponse;
import org.onap.policy.vfc.VfcManager;
-import org.onap.policy.so.SOManager;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestStatus;
-import org.onap.policy.so.SORequestDetails;
-import org.onap.policy.so.SOModelInfo;
-import org.onap.policy.so.SOCloudConfiguration;
-import org.onap.policy.so.SORequestInfo;
-import org.onap.policy.so.SORequestParameters;
-import org.onap.policy.so.SORelatedInstanceListElement;
-import org.onap.policy.so.SORelatedInstance;
-import org.onap.policy.so.SOResponse;
-import org.onap.policy.so.SOResponseWrapper;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoResponseWrapper;
import org.onap.policy.guard.PolicyGuard;
import org.onap.policy.guard.PolicyGuard.LockResult;
import org.onap.policy.guard.TargetLock;
// at this point the AAI named query request should have already been made, the response received
// and used in the construction of the SO Request which is stored in operationRequest
- if(request instanceof SORequest) {
+ if(request instanceof SoRequest) {
// Call SO. The response will be inserted into memory once it's received
SoActorServiceProvider.sendRequest($event.getRequestId().toString(), drools.getWorkingMemory(),
request);
$operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), onset.getRequestId() == $event.getRequestId() )
$opTimer : OperationTimer( closedLoopControlName == $event.getClosedLoopControlName(), requestID == $event.getRequestId().toString() )
$lock : TargetLock (requestID == $event.getRequestId())
- $response : SOResponseWrapper(requestID.toString() == $event.getRequestId().toString() )
+ $response : SoResponseWrapper(requestId.toString() == $event.getRequestId().toString() )
then
Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
* ============LICENSE_START=======================================================
* demo
* ================================================================================
- * 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.
import org.onap.policy.drools.system.PolicyController;
import org.onap.policy.drools.system.PolicyEngine;
import org.onap.policy.drools.utils.logging.LoggerUtil;
-import org.onap.policy.so.SORequest;
+import org.onap.policy.so.SoRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
logger.debug("The control loop timed out");
fail("Control Loop Timed Out");
}
- } else if (obj instanceof SORequest) {
+ } else if (obj instanceof SoRequest) {
logger.debug("\n============ SO received the request!!! ===========\n");
}
}
Code Review / policy / drools-applications.git / commitdiff