Clean up and enhancement of Actor re-design

[policy/models.git] / models-interactions / model-actors / actor.sdnc / src / main / java / org / onap / policy / controlloop / actor / sdnc / BandwidthOnDemandOperator.java

diff --git a/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/BandwidthOnDemandOperator.java b/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/BandwidthOnDemandOperator.java
index 0e721bf..2927bd8 100644 (file)
--- a/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/BandwidthOnDemandOperator.java
+++ b/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/BandwidthOnDemandOperator.java
@@ -22,7 +22,7 @@ package org.onap.policy.controlloop.actor.sdnc;
 
 import java.util.UUID;
 import org.apache.commons.lang3.StringUtils;
-import org.onap.policy.controlloop.VirtualControlLoopEvent;
+import org.onap.policy.controlloop.actorserviceprovider.controlloop.ControlLoopEventContext;
 import org.onap.policy.sdnc.SdncHealRequest;
 import org.onap.policy.sdnc.SdncHealRequestHeaderInfo;
 import org.onap.policy.sdnc.SdncHealRequestInfo;
@@ -37,6 +37,12 @@ import org.onap.policy.sdnc.SdncRequest;
 public class BandwidthOnDemandOperator extends SdncOperator {
     public static final String NAME = "BandwidthOnDemand";
 
+    public static final String URI = "/GENERIC-RESOURCE-API:vf-module-topology-operation";
+
+    // fields in the enrichment data
+    public static final String SERVICE_ID_KEY = "service-instance.service-instance-id";
+    public static final String VNF_ID = "vnfId";
+
     /**
      * Constructs the object.
      *
@@ -47,19 +53,19 @@ public class BandwidthOnDemandOperator extends SdncOperator {
     }
 
     @Override
-    protected SdncRequest constructRequest(VirtualControlLoopEvent onset) {
-        String serviceInstance = onset.getAai().get("service-instance.service-instance-id");
+    protected SdncRequest constructRequest(ControlLoopEventContext context) {
+        String serviceInstance = context.getEnrichment().get(SERVICE_ID_KEY);
         if (StringUtils.isBlank(serviceInstance)) {
-            throw new IllegalArgumentException("missing enrichment data, service-instance-id");
+            throw new IllegalArgumentException("missing enrichment data, " + SERVICE_ID_KEY);
         }
 
         SdncHealVfModuleParameter bandwidth = new SdncHealVfModuleParameter();
         bandwidth.setName("bandwidth");
-        bandwidth.setValue(onset.getAai().get("bandwidth"));
+        bandwidth.setValue(context.getEnrichment().get("bandwidth"));
 
         SdncHealVfModuleParameter timeStamp = new SdncHealVfModuleParameter();
         timeStamp.setName("bandwidth-change-time");
-        timeStamp.setValue(onset.getAai().get("bandwidth-change-time"));
+        timeStamp.setValue(context.getEnrichment().get("bandwidth-change-time"));
 
         SdncHealVfModuleParametersInfo vfParametersInfo = new SdncHealVfModuleParametersInfo();
         vfParametersInfo.addParameters(bandwidth);
@@ -80,11 +86,11 @@ public class BandwidthOnDemandOperator extends SdncOperator {
 
         SdncRequest request = new SdncRequest();
         request.setNsInstanceId(serviceInstance);
-        request.setRequestId(onset.getRequestId());
-        request.setUrl("/GENERIC-RESOURCE-API:vf-module-topology-operation");
+        request.setRequestId(context.getRequestId());
+        request.setUrl(URI);
 
         SdncHealVnfInfo vnfInfo = new SdncHealVnfInfo();
-        vnfInfo.setVnfId(onset.getAai().get("vnfId"));
+        vnfInfo.setVnfId(context.getEnrichment().get(VNF_ID));
 
         SdncHealVfModuleInfo vfModuleInfo = new SdncHealVfModuleInfo();
         vfModuleInfo.setVfModuleId("");