X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rules%2Fccvpn2-rule.drl;h=54fa8a2d038e16e7eaf8d413360d777e6efd7686;hb=4627750077003db93420c053faa66310b27af7b1;hp=89ce5cacb66f51906dd87f636495347a3fe987ac;hpb=0615c0aee375288a994aae470ffa366ed0673462;p=holmes%2Frule-management.git

diff --git a/rules/ccvpn2-rule.drl b/rules/ccvpn2-rule.drl
index 89ce5ca..54fa8a2 100644
--- a/rules/ccvpn2-rule.drl
+++ b/rules/ccvpn2-rule.drl
@@ -1,4 +1,4 @@
-package org.onap.holmes.ccvpn;
+package org.onap.holmes.ccvpnBandwidth;
  
 dialect "java"
 
@@ -9,10 +9,9 @@ dialect "java"
     import org.onap.holmes.common.dmaap.entity.PolicyMsg;
     import org.onap.holmes.common.dmaap.DmaapService;
     import org.onap.holmes.common.utils.DroolsLog;
-    import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;
+    import org.onap.holmes.common.utils.SpringContextUtil;
 
-    import com.alibaba.fastjson.JSONArray;
-    import com.alibaba.fastjson.JSONObject;
+    import com.google.gson.JsonObject;
 
     import java.util.List;
     import java.util.Map;
@@ -32,17 +31,17 @@ dialect "java"
 
     function Map<String, Object> getAdditionalResourceInfo(VesAlarm a, String bandwidth) {
         AaiQuery4Ccvpn2 aai = AaiQuery4Ccvpn2.newInstance();
-        JSONObject instance = aai.getServiceInstance(getAdditionalField(a, "siteService")); 
+        JsonObject instance = aai.getServiceInstance(getAdditionalField(a, "siteService")); 
         Map<String, Object> ret = new HashMap<String, Object>();
-        ret.put("service-instance.service-instance-id", instance.getString("service-instance-id")); 
+        ret.put("service-instance.service-instance-id", instance.get("service-instance-id").getAsString()); 
          ret.put("vserver.vserver-name", "TBD");
-         ret.put("globalSubscriberId", instance.getString("globalSubscriberId"));
-         ret.put("serviceType", instance.getString("serviceType"));
+         ret.put("globalSubscriberId", instance.get("globalSubscriberId").getAsString());
+         ret.put("serviceType", instance.get("serviceType").getAsString());
          ret.put("vserver.is-closed-loop-disabled", "false");
          ret.put("vserver.prov-status", "ACTIVE");
          ret.put("bandwidth", bandwidth);
          ret.put("bandwidth-change-time", getAdditionalField(a, "timestamp"));
-         ret.put("vnfId", instance.getString("vnfId"));
+         ret.put("vnfId", instance.get("vnfId").getAsString());
          return ret;
     }
 
@@ -51,7 +50,7 @@ dialect "java"
         m.setPolicyVersion("2.0.0");
         m.setPolicyName("ccvpn");
         m.setPolicyScope("service=SOTNService,type=SampleType,closedLoopControlName=CL-CCVPN-d925ed73-8231-4d02-9545-db4e101f88f8");
-        m.setClosedLoopControlName(DmaapService.loopControlNames.get("org.onap.holmes.ccvpn"));
+        m.setClosedLoopControlName(DmaapService.loopControlNames.get("org.onap.holmes.ccvpnBandwidth"));
         m.setRequestID(UUID.randomUUID().toString());
         m.setClosedLoopAlarmStart(alarm.getStartEpochMicrosec());
         m.setClosedLoopAlarmEnd(alarm.getLastEpochMicrosec());
@@ -75,7 +74,7 @@ dialect "java"
                bandwidth = "10000";
            }
         PolicyMsg msg = createPolicyMsg($a, bandwidth);
-        DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
-        dmaapService.publishPolicyMsg(msg, "unauthenticated.DCAE_CL_OUTPUT");
+        DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);
+        dmaapService.publishPolicyMsg(msg, "dcae_cl_out");
         $a.setRootFlag(1);
     end