X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=controlloop%2Ftemplates%2Ftemplate.demo.v1.0.0%2Farchetype-closedloop-demo-rules%2Fsrc%2Fmain%2Fresources%2Farchetype-resources%2Fsrc%2Fmain%2Fresources%2FControlLoopDemo__closedLoopControlName__.drl;fp=archetype-closedloop-demo-rules%2Fsrc%2Fmain%2Fresources%2Farchetype-resources%2Fsrc%2Fmain%2Fresources%2FControlLoopDemo__closedLoopControlName__.drl;h=98b7b060c96785bd6577c1427135ee8f162f887a;hb=68377161605e39c8c74ea77d0b504177480788f3;hp=c5614e006a67cd62255ecb171dc11306d2787d5e;hpb=f0c29b57e132e6335f0fa7bbad885d403e4c85df;p=policy%2Fdrools-applications.git diff --git a/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl similarity index 92% rename from archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl rename to controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl index c5614e006..98b7b060c 100644 --- a/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl +++ b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policy.controlloop; +package org.onap.policy.controlloop; import java.util.List; import java.util.LinkedList; @@ -26,57 +26,57 @@ import java.util.Map; import java.util.HashMap; import java.util.UUID; -import org.openecomp.policy.controlloop.VirtualControlLoopEvent; -import org.openecomp.policy.controlloop.ControlLoopEventStatus; -import org.openecomp.policy.controlloop.VirtualControlLoopNotification; -import org.openecomp.policy.controlloop.ControlLoopNotificationType; -import org.openecomp.policy.controlloop.ControlLoopOperation; -import org.openecomp.policy.controlloop.ControlLoopOperationWrapper; -import org.openecomp.policy.template.demo.ControlLoopException; +import org.onap.policy.controlloop.VirtualControlLoopEvent; +import org.onap.policy.controlloop.ControlLoopEventStatus; +import org.onap.policy.controlloop.VirtualControlLoopNotification; +import org.onap.policy.controlloop.ControlLoopNotificationType; +import org.onap.policy.controlloop.ControlLoopOperation; +import org.onap.policy.controlloop.ControlLoopOperationWrapper; +import org.onap.policy.controlloop.ControlLoopException; -import org.openecomp.policy.aai.AAINQF199.AAINQF199CloudRegion; -import org.openecomp.policy.aai.AAINQF199.AAINQF199ExtraProperties; -import org.openecomp.policy.aai.AAINQF199.AAINQF199ExtraProperty; -import org.openecomp.policy.aai.AAINQF199.AAINQF199GenericVNF; -import org.openecomp.policy.aai.AAINQF199.AAINQF199InstanceFilters; -import org.openecomp.policy.aai.AAINQF199.AAINQF199InventoryResponseItem; -import org.openecomp.policy.aai.AAINQF199.AAINQF199InventoryResponseItems; -import org.openecomp.policy.aai.AAINQF199.AAINQF199Manager; -import org.openecomp.policy.aai.AAINQF199.AAINQF199NamedQuery; -import org.openecomp.policy.aai.AAINQF199.AAINQF199QueryParameters; -import org.openecomp.policy.aai.AAINQF199.AAINQF199Request; -import org.openecomp.policy.aai.AAINQF199.AAINQF199RequestWrapper; -import org.openecomp.policy.aai.AAINQF199.AAINQF199Response; -import org.openecomp.policy.aai.AAINQF199.AAINQF199ResponseWrapper; -import org.openecomp.policy.aai.AAINQF199.AAINQF199ServiceInstance; -import org.openecomp.policy.aai.AAINQF199.AAINQF199Tenant; -import org.openecomp.policy.aai.AAINQF199.AAINQF199VfModule; -import org.openecomp.policy.aai.AAINQF199.AAINQF199VServer; -import org.openecomp.policy.aai.util.Serialization; +import org.onap.policy.aai.AAINQF199.AAINQF199CloudRegion; +import org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperties; +import org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperty; +import org.onap.policy.aai.AAINQF199.AAINQF199GenericVNF; +import org.onap.policy.aai.AAINQF199.AAINQF199InstanceFilters; +import org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItem; +import org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItems; +import org.onap.policy.aai.AAINQF199.AAINQF199Manager; +import org.onap.policy.aai.AAINQF199.AAINQF199NamedQuery; +import org.onap.policy.aai.AAINQF199.AAINQF199QueryParameters; +import org.onap.policy.aai.AAINQF199.AAINQF199Request; +import org.onap.policy.aai.AAINQF199.AAINQF199RequestWrapper; +import org.onap.policy.aai.AAINQF199.AAINQF199Response; +import org.onap.policy.aai.AAINQF199.AAINQF199ResponseWrapper; +import org.onap.policy.aai.AAINQF199.AAINQF199ServiceInstance; +import org.onap.policy.aai.AAINQF199.AAINQF199Tenant; +import org.onap.policy.aai.AAINQF199.AAINQF199VfModule; +import org.onap.policy.aai.AAINQF199.AAINQF199VServer; +import org.onap.policy.aai.util.Serialization; -import org.openecomp.policy.appc.CommonHeader; -import org.openecomp.policy.appc.Request; -import org.openecomp.policy.appc.Response; -import org.openecomp.policy.appc.ResponseCode; -import org.openecomp.policy.appc.ResponseStatus; -import org.openecomp.policy.appc.ResponseValue; +import org.onap.policy.appc.CommonHeader; +import org.onap.policy.appc.Request; +import org.onap.policy.appc.Response; +import org.onap.policy.appc.ResponseCode; +import org.onap.policy.appc.ResponseStatus; +import org.onap.policy.appc.ResponseValue; -import org.openecomp.policy.template.demo.EventManager; -import org.openecomp.policy.vnf.trafficgenerator.PGRequest; -import org.openecomp.policy.vnf.trafficgenerator.PGStream; -import org.openecomp.policy.vnf.trafficgenerator.PGStreams; +import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager; +import org.onap.policy.vnf.trafficgenerator.PGRequest; +import org.onap.policy.vnf.trafficgenerator.PGStream; +import org.onap.policy.vnf.trafficgenerator.PGStreams; -import org.openecomp.policy.mso.MSOManager; -import org.openecomp.policy.mso.MSORequest; -import org.openecomp.policy.mso.MSORequestStatus; -import org.openecomp.policy.mso.MSORequestDetails; -import org.openecomp.policy.mso.MSOModelInfo; -import org.openecomp.policy.mso.MSOCloudConfiguration; -import org.openecomp.policy.mso.MSORequestInfo; -import org.openecomp.policy.mso.MSORequestParameters; -import org.openecomp.policy.mso.MSORelatedInstanceListElement; -import org.openecomp.policy.mso.MSORelatedInstance; -import org.openecomp.policy.mso.MSOResponse; +import org.onap.policy.mso.MSOManager; +import org.onap.policy.mso.MSORequest; +import org.onap.policy.mso.MSORequestStatus; +import org.onap.policy.mso.MSORequestDetails; +import org.onap.policy.mso.MSOModelInfo; +import org.onap.policy.mso.MSOCloudConfiguration; +import org.onap.policy.mso.MSORequestInfo; +import org.onap.policy.mso.MSORequestParameters; +import org.onap.policy.mso.MSORelatedInstanceListElement; +import org.onap.policy.mso.MSORelatedInstance; +import org.onap.policy.mso.MSOResponse; import org.openecomp.policy.drools.system.PolicyEngine; @@ -138,7 +138,7 @@ rule "${policyName}.EVENT" when $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" ) $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET ) - not ( EventManager( closedLoopControlName == $event.closedLoopControlName )) + not ( ControlLoopEventManager( closedLoopControlName == $event.closedLoopControlName )) then System.out.println("rule EVENT is triggered."); try { @@ -173,7 +173,7 @@ rule "${policyName}.EVENT" // // Create an EventManager // - EventManager manager = new EventManager($params.getClosedLoopControlName(), $event.requestID, $event.target); + ControlLoopEventManager manager = new ControlLoopEventManager($params.getClosedLoopControlName(), $event.requestID); // // Determine if EventManager can actively process the event (i.e. syntax) // @@ -259,19 +259,19 @@ rule "${policyName}.EVENT.MANAGER" when $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" ) $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET ) - $manager : EventManager( closedLoopControlName == $event.closedLoopControlName, controlLoopResult == null) + $manager : ControlLoopEventManager( closedLoopControlName == $event.closedLoopControlName, controlLoopResult == null) then System.out.println("rule EVENT.MANAGER is triggered."); // // Check which event this is. // - EventManager.NEW_EVENT_STATUS eventStatus = $manager.onNewEvent($event); + ControlLoopEventManager.NEW_EVENT_STATUS eventStatus = $manager.onNewEvent($event); // // We only want the initial ONSET event in memory, // all the other events need to be retracted to support // cleanup and avoid the other rules being fired for this event. // - if (eventStatus != EventManager.NEW_EVENT_STATUS.FIRST_ONSET) { + if (eventStatus != ControlLoopEventManager.NEW_EVENT_STATUS.FIRST_ONSET) { System.out.println("Retracting "+eventStatus+" Event."); retract($event); return; @@ -444,7 +444,7 @@ rule "${policyName}.EVENT.MANAGER.AAINQF199REQUEST" when $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" ) $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET ) - $manager : EventManager( closedLoopControlName == $event.closedLoopControlName ) + $manager : ControlLoopEventManager( closedLoopControlName == $event.closedLoopControlName ) $aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID) then System.out.println("rule EVENT.MANAGER.AAINQF199REQUEST is triggered."); @@ -453,6 +453,7 @@ rule "${policyName}.EVENT.MANAGER.AAINQF199REQUEST" // AAINQF199Response aainqf199response = AAINQF199Manager.postQuery($params.getAaiURL(), $params.getAaiUsername(), $params.getAaiPassword(), $aainqf199RequestWrapper.aainqf199request, $event.requestID); + // // Check AAI response // @@ -485,7 +486,7 @@ rule "${policyName}.EVENT.MANAGER.AAINQF199RESPONSE" when $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" ) $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET ) - $manager : EventManager( closedLoopControlName == $event.closedLoopControlName ) + $manager : ControlLoopEventManager( closedLoopControlName == $event.closedLoopControlName ) $aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID) $aainqf199ResponseWrapper : AAINQF199ResponseWrapper(requestID == $event.requestID) then @@ -822,7 +823,8 @@ rule "${policyName}.EVENT.MANAGER.AAINQF199RESPONSE" // Call MSO // MSOResponse response = MSOManager.createModuleInstance(MSOUrl, $params.getMsoURL(), $params.getMsoUsername(), $params.getMsoPassword(), request); - // + + if (response != null) { // // Assign requestId @@ -886,7 +888,7 @@ rule "${policyName}.APPC.RESPONSE" when $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" ) $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET ) - $manager : EventManager( closedLoopControlName == $event.closedLoopControlName ) + $manager : ControlLoopEventManager( closedLoopControlName == $event.closedLoopControlName ) $operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID ) $request : Request( getCommonHeader().RequestID == $event.requestID ) $response : Response( getCommonHeader().RequestID == $event.requestID ) @@ -1029,7 +1031,7 @@ rule "${policyName}.MSO.RESPONSE" when $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" ) $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET ) - $manager : EventManager( closedLoopControlName == $event.closedLoopControlName ) + $manager : ControlLoopEventManager( closedLoopControlName == $event.closedLoopControlName ) $operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID ) $request : MSORequest( requestId == $event.requestID.toString() ) $response : MSOResponse( request.requestId == $event.requestID.toString() ) @@ -1131,7 +1133,7 @@ query "${policyName}.QUERY.EVENT.ONSET" end query "${policyName}.QUERY.MANAGER.RNA" (String aRequestId, Integer numOnsetsLowerBound, Boolean aActivated) - manager : EventManager( closedLoopControlName == "${closedLoopControlName}", + manager : ControlLoopEventManager( closedLoopControlName == "${closedLoopControlName}", requestID.toString() == aRequestId, numOnsets > numOnsetsLowerBound, activated == aActivated )