diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-03-23 15:49:28 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-03-23 17:48:52 -0400 |
| commit | 6084c6dcf5bf061f33204e01116573160bf39fa6 (patch) | |
| tree | 80f8e286ab3e26dbca322aa9f640001c95cc2ec2 /controlloop/common/guard/src/main | |
| parent | dc24e69b789603dd7c8df72a945eaa82e05dd21c (diff) | |
Enable guards in junit tests
Flipped the flag(s) to enable guard checks in the various junit
tests for the Usecases and Frankfurt controllers. Note: the guard
checks use the guard simulator.
Modified new actor code to not include operation history on first
"guard denied" report (i.e., make it work like usecases does).
Issue-ID: POLICY-2434
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I2897da4a0c8fb76fa00cb0f6cf8562c0703005d3
Diffstat (limited to 'controlloop/common/guard/src/main')
| -rw-r--r-- | controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java index ed6cd6c5f..5a5218c40 100644 --- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java +++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java @@ -1,8 +1,8 @@ /*- * ============LICENSE_START======================================================= - * guard + * ONAP * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -72,7 +72,7 @@ public class PolicyGuardXacmlHelper { decisionRequest.setAction("guard"); Map<String, String> guard = new HashMap<>(); guard.put("actor", xacmlReq.getActorId()); - guard.put("recipe", xacmlReq.getOperationId()); + guard.put("operation", xacmlReq.getOperationId()); guard.put("target", xacmlReq.getTargetId()); if (xacmlReq.getClnameId() != null) { guard.put("clname", xacmlReq.getClnameId()); |