diff options
| author |   Hockla, Ali (ah999m) <ah999m@att.com> | 2017-09-13 09:24:43 -0500 |
|---|---|---|
| committer | Ali Hockla <ah999m@att.com> | 2017-09-14 15:03:17 +0000 |
| commit | c5f38f5de2f49d3f2fa7f03808f9f063f1cb2ed9 (patch) | |
| tree | 93454ef45c37e7b033b45918ef2e1da0050980cb /controlloop/templates/template.demo/src/main | |
| parent | bc4267d043427c080b1cc1fe42ea0860bed9fa97 (diff) | |
Added changes for vDNS Use Case
-Renamed remaining MSO classes and packages to SO and modified drl
accordingly
-Connected SO Interface to SO Simulator
-Added vDNS Control Loop junit
-Modified SOActorServiceProvider to reflect AAI class changes (POLICY-103)
Issue-ID: POLICY-102
Change-Id: Iea5d3f096c4ccfedde68e79d7593d66331127aaf
Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
Diffstat (limited to 'controlloop/templates/template.demo/src/main')
| -rw-r--r-- | controlloop/templates/template.demo/src/main/resources/ControlLoop_Template_xacml_guard.drl | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/controlloop/templates/template.demo/src/main/resources/ControlLoop_Template_xacml_guard.drl b/controlloop/templates/template.demo/src/main/resources/ControlLoop_Template_xacml_guard.drl index f832ea5e2..82899f08b 100644 --- a/controlloop/templates/template.demo/src/main/resources/ControlLoop_Template_xacml_guard.drl +++ b/controlloop/templates/template.demo/src/main/resources/ControlLoop_Template_xacml_guard.drl @@ -39,18 +39,18 @@ import org.onap.policy.appclcm.LCMResponse; import org.onap.policy.appclcm.LCMCommonHeader; import org.onap.policy.vfc.VFCRequest; import org.onap.policy.vfc.VFCManager; -import org.onap.policy.mso.SOManager; -import org.onap.policy.mso.SORequest; -import org.onap.policy.mso.SORequestStatus; -import org.onap.policy.mso.SORequestDetails; -import org.onap.policy.mso.SOModelInfo; -import org.onap.policy.mso.SOCloudConfiguration; -import org.onap.policy.mso.SORequestInfo; -import org.onap.policy.mso.SORequestParameters; -import org.onap.policy.mso.SORelatedInstanceListElement; -import org.onap.policy.mso.SORelatedInstance; -import org.onap.policy.mso.SOResponse; -import org.onap.policy.controlloop.actor.mso.MSOActorServiceProvider; +import org.onap.policy.so.SOManager; +import org.onap.policy.so.SORequest; +import org.onap.policy.so.SORequestStatus; +import org.onap.policy.so.SORequestDetails; +import org.onap.policy.so.SOModelInfo; +import org.onap.policy.so.SOCloudConfiguration; +import org.onap.policy.so.SORequestInfo; +import org.onap.policy.so.SORequestParameters; +import org.onap.policy.so.SORelatedInstanceListElement; +import org.onap.policy.so.SORelatedInstance; +import org.onap.policy.so.SOResponse; +import org.onap.policy.controlloop.actor.so.SOActorServiceProvider; import org.onap.policy.guard.PolicyGuard; import org.onap.policy.guard.PolicyGuard.LockResult; import org.onap.policy.guard.TargetLock; @@ -517,7 +517,7 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED" if(request instanceof SORequest) { // Call SO. The response will be inserted into memory once it's received - MSOActorServiceProvider.sendRequest(drools.getWorkingMemory(), request); + SOActorServiceProvider.sendRequest(drools.getWorkingMemory(), request); } break; case "VFC": @@ -926,10 +926,8 @@ rule "${policyName}.SO.RESPONSE" $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.closedLoopControlName, onset.requestID == $event.requestID ) $opTimer : OperationTimer( closedLoopControlName == $event.closedLoopControlName, requestID == $event.requestID.toString() ) $lock : TargetLock (requestID == $event.requestID) - $request : SORequest( requestId == $event.requestID.toString() ) - $response : SOResponse( request.requestId == $event.requestID.toString() ) - then - + $response : SOResponse( requestReferences.requestId.toString() == $event.requestID.toString() ) + then // // Logging Logger.info("------------------------------------------------------------------------------------------------"); @@ -941,7 +939,6 @@ rule "${policyName}.SO.RESPONSE" Logger.metrics($opTimer); Logger.metrics($lock); Logger.metrics($response); - // Get the result of the operation // PolicyResult policyResult = $operation.onResponse($response); |