diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2020-08-26 13:50:57 -0400 |
---|---|---|
committer | Pamela Dragosh <pdragosh@research.att.com> | 2020-09-02 15:07:12 -0400 |
commit | 971a95aab8f15a140f407d3a3b47fd783fd51ad1 (patch) | |
tree | 9edd22e390428a002b7dfaa98dd3c4e81b657b4f /controlloop/common/controller-usecases/src/main | |
parent | a588736799d94747f70ed648d3d821210993c5c4 (diff) |
Add guard filter properties to controller
Adding new properties to guard Decision call.
Issue-ID: POLICY-2590
Change-Id: Ie4a37990e062c76ac4d6dd1b904ad354736fd27a
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Signed-off-by: Jim Hahn <jrh3@att.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'controlloop/common/controller-usecases/src/main')
2 files changed, 88 insertions, 0 deletions
diff --git a/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2.java b/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2.java index b7247ce69..abc2bcb46 100644 --- a/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2.java +++ b/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2.java @@ -24,11 +24,18 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import org.onap.aai.domain.yang.GenericVnf; +import org.onap.aai.domain.yang.RelatedToProperty; +import org.onap.aai.domain.yang.Relationship; +import org.onap.aai.domain.yang.RelationshipData; +import org.onap.policy.aai.AaiCqResponse; import org.onap.policy.controlloop.actor.guard.DecisionOperation; import org.onap.policy.controlloop.actor.guard.GuardActor; import org.onap.policy.controlloop.actor.so.VfModuleCreate; import org.onap.policy.controlloop.actorserviceprovider.Operation; import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; +import org.onap.policy.controlloop.actorserviceprovider.TargetType; +import org.onap.policy.drools.apps.controller.usecases.UsecasesConstants; /** * Wrapper for a Guard operation. Note: this makes a clone of the operation parameters, @@ -41,6 +48,12 @@ import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; public class GuardStep2 extends Step2 { public static final String PAYLOAD_KEY_TARGET_ENTITY = "target"; public static final String PAYLOAD_KEY_VF_COUNT = "vfCount"; + public static final String PAYLOAD_KEY_VNF_NAME = "generic-vnf.vnf-name"; + public static final String PAYLOAD_KEY_VNF_ID = "generic-vnf.vnf-id"; + public static final String PAYLOAD_KEY_VNF_TYPE = "generic-vnf.vnf-type"; + public static final String PAYLOAD_KEY_NF_NAMING_CODE = "generic-vnf.nf-naming-code"; + public static final String PAYLOAD_KEY_VSERVER_ID = "vserver.vserver-id"; + public static final String PAYLOAD_KEY_CLOUD_REGION_ID = "cloud-region.cloud-region-id"; private final Operation policyOper; @@ -85,6 +98,12 @@ public class GuardStep2 extends Step2 { names.add(OperationProperties.DATA_VF_COUNT); } + // Only get filter properties if the vserver-name exists, which is needed to call cq + if (event.getAai().get("vserver.vserver-name") != null) { + names.add(UsecasesConstants.AAI_DEFAULT_GENERIC_VNF); + names.add(OperationProperties.AAI_DEFAULT_CLOUD_REGION); + } + return names; } @@ -112,4 +131,67 @@ public class GuardStep2 extends Step2 { params.getPayload().put(PAYLOAD_KEY_VF_COUNT, count); } + + @Override + protected void loadCloudRegion(String propName) { + // PNF does not support guard filters + if (TargetType.PNF.equals(params.getTargetType())) { + return; + } + + params.getPayload().put(PAYLOAD_KEY_CLOUD_REGION_ID, getCloudRegion().getCloudRegionId()); + } + + @Override + protected void loadDefaultGenericVnf(String propName) { + // PNF does not support guard filters + if (TargetType.PNF.equals(params.getTargetType())) { + return; + } + + // add in properties needed for filters + String targetEntity = getTargetEntity(); + params.getPayload().put(PAYLOAD_KEY_VNF_ID, targetEntity); + + AaiCqResponse cq = this.getCustomQueryData(); + GenericVnf vnf = cq.getGenericVnfByVnfId(targetEntity); + if (vnf == null) { + return; + } + params.getPayload().put(PAYLOAD_KEY_VNF_NAME, vnf.getVnfName()); + params.getPayload().put(PAYLOAD_KEY_VNF_TYPE, vnf.getVnfType()); + params.getPayload().put(PAYLOAD_KEY_NF_NAMING_CODE, vnf.getNfNamingCode()); + + String vserverName = getEnrichment(OperationProperties.ENRICHMENT_VSERVER_NAME); + + params.getPayload().put(PAYLOAD_KEY_VSERVER_ID, findServerId(vnf, vserverName)); + } + + private String findServerId(GenericVnf vnf, String vserverName) { + for (Relationship relationship : vnf.getRelationshipList().getRelationship()) { + if (!"vserver".equals(relationship.getRelatedTo())) { + continue; + } + String vserverId = findServerId(relationship, vserverName); + if (vserverId != null) { + return vserverId; + } + } + return null; + } + + private String findServerId(Relationship relationship, String vserverName) { + for (RelatedToProperty to : relationship.getRelatedToProperty()) { + if ("vserver.vserver-name".equals(to.getPropertyKey()) && vserverName.equals(to.getPropertyValue())) { + // Found the right relationship server-name, now find the server-id + for (RelationshipData data : relationship.getRelationshipData()) { + if (PAYLOAD_KEY_VSERVER_ID.equals(data.getRelationshipKey())) { + return data.getRelationshipValue(); + } + } + } + } + return null; + } + } diff --git a/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/Step2.java b/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/Step2.java index 5d80ea5f4..ca7b63f69 100644 --- a/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/Step2.java +++ b/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/Step2.java @@ -36,6 +36,7 @@ import org.onap.aai.domain.yang.GenericVnf; import org.onap.aai.domain.yang.ModelVer; import org.onap.aai.domain.yang.ServiceInstance; import org.onap.aai.domain.yang.Tenant; +import org.onap.aai.domain.yang.Vserver; import org.onap.policy.aai.AaiCqResponse; import org.onap.policy.common.utils.coder.StandardCoderObject; import org.onap.policy.controlloop.VirtualControlLoopEvent; @@ -318,6 +319,11 @@ public class Step2 extends Step { return aaicq.getModelVerByVersionId(service.getModelVersionId()); } + protected Vserver getVServer() { + AaiCqResponse aaicq = getCustomQueryData(); + return aaicq.getVserver(); + } + /** * The default method assumes there is only one target entity and that it's stored * within the step's context. |