Fix op policy so that when UI sends empty string the targetResourceId is
set to null
Issue-ID: CLAMP-153
Change-Id: I0b6680106548111d59f2170f8f7c42414e0644c8
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
* "targetResourceId","value":["Eace933104d443b496b8.nodes.heat.vpg"]}]]}]
*/
public class PolicyItem implements Cloneable {
* "targetResourceId","value":["Eace933104d443b496b8.nodes.heat.vpg"]}]]}]
*/
public class PolicyItem implements Cloneable {
- protected static final EELFLogger logger = EELFManager.getInstance().getLogger(PolicyItem.class);
- protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
- private String id;
- private String recipe;
- private int maxRetries;
- private int retryTimeLimit;
- private String parentPolicy;
- private List<String> parentPolicyConditions;
- private String actor;
- private String targetResourceId;
+ protected static final EELFLogger logger = EELFManager.getInstance().getLogger(PolicyItem.class);
+ protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
+ private String id;
+ private String recipe;
+ private int maxRetries;
+ private int retryTimeLimit;
+ private String parentPolicy;
+ private List<String> parentPolicyConditions;
+ private String actor;
+ private String targetResourceId;
/**
* Parse Policy given json node.
/**
* Parse Policy given json node.
parentPolicy = AbstractModelElement.getValueByName(node, "parentPolicy");
parentPolicyConditions = AbstractModelElement.getValuesByName(node, "parentPolicyConditions");
targetResourceId = AbstractModelElement.getValueByName(node, "targetResourceId");
parentPolicy = AbstractModelElement.getValueByName(node, "parentPolicy");
parentPolicyConditions = AbstractModelElement.getValuesByName(node, "parentPolicyConditions");
targetResourceId = AbstractModelElement.getValueByName(node, "targetResourceId");
+ if (targetResourceId != null && targetResourceId.isEmpty()) {
+ this.setTargetResourceId(null);
+ }
"name": "targetResourceId",
"value":
[
"name": "targetResourceId",
"value":
[
+ ""
+ ]
+ },
+ {
+ "name": "targetResourceIdOther",
+ "value":
+ [
+ ""
+ },
+ {
+ "name": "targetResourceIdOther",
+ "value":
+ [
+ "resource-idOther"
+ ]
- },
- {
- "name": "targetResourceId",
- "value":
- [
- "resource-id"
- ]
+ },
+ {
+ "name": "targetResourceIdOther",
+ "value":
+ [
+ "resource-idOther"
+ ]
retry: 3
success: <generatedId>
target:
retry: 3
success: <generatedId>
target:
- resourceID: resource-id
type: VM
timeout: 180
- actor: APPC
type: VM
timeout: 180
- actor: APPC
retry: 3
success: <generatedId>
target:
retry: 3
success: <generatedId>
target:
- resourceID: resource-id
type: VM
timeout: 180
- actor: APPC
type: VM
timeout: 180
- actor: APPC