diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2017-11-09 04:03:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-09 04:03:10 +0000 |
| commit | 40d761966d4c867007015c894b5dd783edf96cfd (patch) | |
| tree | 70365857e1de82b7bfd5efadce34677db0267df4 /controlloop/templates | |
| parent | b444334ec9d80aabb6dc7cefae1f2dfd3dd62577 (diff) | |
| parent | 48c62738bf4c5653e36c6ea1e8e33e649b8526fc (diff) | |
Merge "Fix SO Request body"
Diffstat (limited to 'controlloop/templates')
| -rw-r--r-- | controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl index fbc46a3ee..07c7e2086 100644 --- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl +++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl @@ -55,6 +55,7 @@ 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.so.SOResponseWrapper; import org.onap.policy.guard.PolicyGuard; import org.onap.policy.guard.PolicyGuard.LockResult; import org.onap.policy.guard.TargetLock; @@ -583,7 +584,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 - SOActorServiceProvider.sendRequest(drools.getWorkingMemory(), request); + SOActorServiceProvider.sendRequest($event.requestID.toString(), drools.getWorkingMemory(), request); } break; case "VFC": @@ -975,9 +976,9 @@ 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) - $response : SOResponse( requestReferences.requestId.toString() == $event.requestID.toString() ) + $response : SOResponseWrapper(requestID.toString() == $event.requestID.toString() ) then - + Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage()); logger.info("{}: {}", $params.getClosedLoopControlName(), drools.getRule().getName()); logger.debug("{}: {}: event={} manager={} operation={} lock={} opTimer={} response={}", |