summaryrefslogtreecommitdiffstats
path: root/controlloop/common/actors
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2017-11-09 04:03:10 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-09 04:03:10 +0000
commit40d761966d4c867007015c894b5dd783edf96cfd (patch)
tree70365857e1de82b7bfd5efadce34677db0267df4 /controlloop/common/actors
parentb444334ec9d80aabb6dc7cefae1f2dfd3dd62577 (diff)
parent48c62738bf4c5653e36c6ea1e8e33e649b8526fc (diff)
Merge "Fix SO Request body"
Diffstat (limited to 'controlloop/common/actors')
-rw-r--r--controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
index bf00a51d3..9cb211b22 100644
--- a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
+++ b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
@@ -327,7 +327,7 @@ public class SOActorServiceProvider implements Actor {
// Construct SO Request
SORequest request = new SORequest();
- request.requestId = onset.requestID;
+// request.requestId = onset.requestID;
request.requestDetails = new SORequestDetails();
request.requestDetails.modelInfo = new SOModelInfo();
request.requestDetails.cloudConfiguration = new SOCloudConfiguration();
@@ -344,7 +344,7 @@ public class SOActorServiceProvider implements Actor {
//
request.requestDetails.modelInfo.modelType = "vfModule";
request.requestDetails.modelInfo.modelInvariantId = getVfModuleItemModelInvariantId();
- request.requestDetails.modelInfo.modelNameVersionId = getVfModuleItemModelNameVersionId();
+ request.requestDetails.modelInfo.modelVersionId = getVfModuleItemModelNameVersionId();
request.requestDetails.modelInfo.modelName = getVfModuleItemModelName();
request.requestDetails.modelInfo.modelVersion = getVfModuleItemModelVersionId();
//
@@ -365,7 +365,7 @@ public class SOActorServiceProvider implements Actor {
relatedInstanceListElement1.relatedInstance.modelInfo = new SOModelInfo();
relatedInstanceListElement1.relatedInstance.modelInfo.modelType = "service";
relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = getServiceItemModelInvariantId();
- relatedInstanceListElement1.relatedInstance.modelInfo.modelNameVersionId = getServiceItemModelNameVersionId();
+ relatedInstanceListElement1.relatedInstance.modelInfo.modelVersionId = getServiceItemModelNameVersionId();
relatedInstanceListElement1.relatedInstance.modelInfo.modelName = getServiceItemModelName();
relatedInstanceListElement1.relatedInstance.modelInfo.modelVersion = getServiceItemModelVersion();
//
@@ -373,7 +373,7 @@ public class SOActorServiceProvider implements Actor {
relatedInstanceListElement2.relatedInstance.modelInfo = new SOModelInfo();
relatedInstanceListElement2.relatedInstance.modelInfo.modelType = "vnf";
relatedInstanceListElement2.relatedInstance.modelInfo.modelInvariantId = getVnfItemModelInvariantId();
- relatedInstanceListElement2.relatedInstance.modelInfo.modelNameVersionId = getVnfItemModelNameVersionId();
+ relatedInstanceListElement2.relatedInstance.modelInfo.modelVersionId = getVnfItemModelNameVersionId();
relatedInstanceListElement2.relatedInstance.modelInfo.modelName = getVnfItemModelName();
relatedInstanceListElement2.relatedInstance.modelInfo.modelVersion = getVnfItemModelVersion();
relatedInstanceListElement2.relatedInstance.modelInfo.modelCustomizationName = getVnfItemVnfType();
@@ -397,9 +397,9 @@ public class SOActorServiceProvider implements Actor {
* @param wm
* @param request
*/
- public static void sendRequest(WorkingMemory wm, Object request) {
+ public static void sendRequest(String requestID, WorkingMemory wm, Object request) {
SOManager Mm = new SOManager();
- Mm.asyncSORestCall(wm, getServiceItemServiceInstanceId(), getVnfItemVnfId(), (SORequest)request);
+ Mm.asyncSORestCall(requestID, wm, getServiceItemServiceInstanceId(), getVnfItemVnfId(), (SORequest)request);
}
/**