aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2018-09-17 15:09:23 -0400
committerJim Hahn <jrh3@att.com>2018-09-17 15:27:04 -0400
commit3aebcae2c3725496dcbfac5a187f6ec5020d5fa2 (patch)
treead98825b2a8e2145b16a6d66df55c5e229631c63
parent8c16c0756ab3b78028db7c5f2022097587867e0e (diff)
remove volumeGroup from SO request
After a new round of discussion with the SO team, it was learned that the SO scale-out request should NOT include the volumeGroup in relatedInstanceList[0]; that item should be eliminated altogether. Re-ordered some imports. Updated license date. Left volumeGroup in TestDemo, as it's a pseudo VID request. Change-Id: I94e82b7e8fe6a41695b99888f291e24b7103687d Issue-ID: POLICY-962 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java21
1 files changed, 10 insertions, 11 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 f7df1826c..9904bac37 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
@@ -27,7 +27,6 @@ import java.lang.reflect.Type;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import org.drools.core.WorkingMemory;
import org.onap.policy.aai.AaiNqExtraProperty;
import org.onap.policy.aai.AaiNqInventoryResponseItem;
@@ -36,7 +35,16 @@ import org.onap.policy.controlloop.ControlLoopOperation;
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.*;
+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.SoOperationType;
import org.onap.policy.so.util.Serialization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -212,19 +220,11 @@ public class SOActorServiceProvider implements Actor {
request.getRequestDetails().getRequestInfo().setInstanceName(vfModuleName);
// relatedInstanceList
- SORelatedInstanceListElement relatedInstanceListElement0 = new SORelatedInstanceListElement();
SORelatedInstanceListElement relatedInstanceListElement1 = new SORelatedInstanceListElement();
SORelatedInstanceListElement relatedInstanceListElement2 = new SORelatedInstanceListElement();
relatedInstanceListElement1.setRelatedInstance(new SORelatedInstance());
relatedInstanceListElement2.setRelatedInstance(new SORelatedInstance());
- // Volume Group Item
- relatedInstanceListElement0.setRelatedInstance(new SORelatedInstance());
- relatedInstanceListElement0.getRelatedInstance().setInstanceId(UUID.randomUUID().toString());
- relatedInstanceListElement0.getRelatedInstance().setInstanceName(vfModuleName + "_vol");
- relatedInstanceListElement0.getRelatedInstance().setModelInfo(new SOModelInfo());
- relatedInstanceListElement0.getRelatedInstance().getModelInfo().setModelType("volumeGroup");
-
// Service Item
relatedInstanceListElement1.getRelatedInstance()
.setInstanceId(vnfServiceItem.getServiceInstance().getServiceInstanceId());
@@ -268,7 +268,6 @@ public class SOActorServiceProvider implements Actor {
.setModelCustomizationId(vnfItem.getGenericVnf().getModelCustomizationId());
// Insert the Service Item and VNF Item
- request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement0);
request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement1);
request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement2);