Merge "Use Policy Translator abstract class"

17 files changed, 878 insertions, 592 deletions

diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyConverter.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyTranslator.java
index 8852eb08..f5f77d24 100644
--- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyConverter.java
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyTranslator.java
@@ -25,7 +25,6 @@ package org.onap.policy.pdp.xacml.application.common;
 import com.att.research.xacml.api.Request;
 import com.att.research.xacml.api.Response;
 
-import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -34,13 +33,33 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
 import org.onap.policy.models.decisions.concepts.DecisionRequest;
 import org.onap.policy.models.decisions.concepts.DecisionResponse;
 
-public interface ToscaPolicyConverter {
+public interface ToscaPolicyTranslator {
 
-    List<PolicyType> convertPolicies(InputStream isToscaPolicy) throws ToscaPolicyConversionException;
-
-    List<PolicyType> convertPolicies(Map<String, Object> toscaObject) throws ToscaPolicyConversionException;
+    /**
+     * Implement this method to translate policies.
+     *
+     * @param toscaObject Incoming Tosca Policies object
+     * @return List of translated policies
+     * @throws ToscaPolicyConversionException Exception
+     */
+    List<PolicyType> scanAndConvertPolicies(Map<String, Object> toscaObject) throws ToscaPolicyConversionException;
 
+    /**
+     * Implement this method to convert an ONAP DecisionRequest into
+     * a Xacml request.
+     *
+     * @param request Incoming DecisionRequest
+     * @return Xacml Request object
+     */
     Request convertRequest(DecisionRequest request);
 
-    DecisionResponse convertResponse(Response response);
+    /**
+     * Implement this method to convert a Xacml Response
+     * into a ONAP DecisionResponse.
+     *
+     * @param xacmlResponse Input Xacml Response
+     * @return DecisionResponse object
+     */
+    DecisionResponse convertResponse(Response xacmlResponse);
+
 }
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyConverterUtils.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyTranslatorUtils.java
index cd197935..cdf5404b 100644
--- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyConverterUtils.java
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyTranslatorUtils.java
@@ -35,9 +35,9 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.MatchType;
  * @author pameladragosh
  *
  */
-public final class ToscaPolicyConverterUtils {
+public final class ToscaPolicyTranslatorUtils {
 
-    private ToscaPolicyConverterUtils() {
+    private ToscaPolicyTranslatorUtils() {
         super();
     }
 
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyRequest.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyRequest.java
new file mode 100644
index 00000000..3914ba60
--- /dev/null
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyRequest.java
@@ -0,0 +1,84 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.pdp.xacml.application.common.std;
+
+import com.att.research.xacml.std.annotations.XACMLAction;
+import com.att.research.xacml.std.annotations.XACMLRequest;
+import com.att.research.xacml.std.annotations.XACMLResource;
+import com.att.research.xacml.std.annotations.XACMLSubject;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.onap.policy.models.decisions.concepts.DecisionRequest;
+
+@XACMLRequest(ReturnPolicyIdList = true)
+public class StdCombinedPolicyRequest {
+
+    public StdCombinedPolicyRequest() {
+        super();
+    }
+
+    @XACMLSubject(includeInResults = true)
+    String onapName = "DCAE";
+
+    @XACMLResource(includeInResults = true)
+    String resource = "onap.policies.Monitoring";
+
+    @XACMLAction()
+    String action = "configure";
+
+
+    /**
+     * Parses the DecisionRequest into a MonitoringRequest.
+     *
+     * @param decisionRequest Input DecisionRequest
+     * @return MonitoringRequest
+     */
+    public static StdCombinedPolicyRequest createInstance(DecisionRequest decisionRequest) {
+        StdCombinedPolicyRequest request = new StdCombinedPolicyRequest();
+        request.onapName = decisionRequest.getOnapName();
+        request.action = decisionRequest.getAction();
+
+        Map<String, Object> resources = decisionRequest.getResource();
+        for (Entry<String, Object> entry : resources.entrySet()) {
+            if ("policy-id".equals(entry.getKey())) {
+                //
+                // TODO handle lists of policies
+                //
+                request.resource = entry.getValue().toString();
+                continue;
+            }
+            if ("policy-type".equals(entry.getKey())) {
+                //
+                // TODO handle lists of policies
+                //
+                request.resource = entry.getValue().toString();
+            }
+        }
+        //
+        // TODO handle a bad incoming request. Do that here?
+        //
+        return request;
+    }
+}
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java
new file mode 100644
index 00000000..b39c2e60
--- /dev/null
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java
@@ -0,0 +1,373 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.pdp.xacml.application.common.std;
+
+import com.att.research.xacml.api.AttributeAssignment;
+import com.att.research.xacml.api.DataTypeException;
+import com.att.research.xacml.api.Decision;
+import com.att.research.xacml.api.Obligation;
+import com.att.research.xacml.api.Request;
+import com.att.research.xacml.api.Response;
+import com.att.research.xacml.api.Result;
+import com.att.research.xacml.api.XACML3;
+import com.att.research.xacml.std.annotations.RequestParser;
+import com.att.research.xacml.util.XACMLPolicyWriter;
+import com.google.gson.Gson;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeAssignmentExpressionType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.EffectType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.MatchType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObjectFactory;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionsType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType;
+
+import org.json.JSONObject;
+import org.onap.policy.models.decisions.concepts.DecisionRequest;
+import org.onap.policy.models.decisions.concepts.DecisionResponse;
+import org.onap.policy.pdp.xacml.application.common.ToscaDictionary;
+import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConversionException;
+import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator;
+import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslatorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(StdCombinedPolicyResultsTranslator.class);
+
+    public StdCombinedPolicyResultsTranslator() {
+        super();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<PolicyType> scanAndConvertPolicies(Map<String, Object> toscaObject)
+            throws ToscaPolicyConversionException {
+        //
+        // Our return object
+        //
+        List<PolicyType> scannedPolicies = new ArrayList<>();
+        //
+        // Iterate each of the Policies
+        //
+        List<Object> policies = (List<Object>) toscaObject.get("policies");
+        for (Object policyObject : policies) {
+            //
+            // Get the contents
+            //
+            LOGGER.debug("Found policy {}", policyObject.getClass());
+            Map<String, Object> policyContents = (Map<String, Object>) policyObject;
+            for (Entry<String, Object> entrySet : policyContents.entrySet()) {
+                LOGGER.debug("Entry set {}", entrySet);
+                //
+                // Convert this policy
+                //
+                PolicyType policy = this.convertPolicy(entrySet);
+                try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+                    XACMLPolicyWriter.writePolicyFile(os, policy);
+                    LOGGER.debug("{}", os);
+                } catch (IOException e) {
+                    LOGGER.error("Failed to convert {}", e);
+                }
+                //
+                // Convert and add in the new policy
+                //
+                scannedPolicies.add(policy);
+            }
+        }
+
+        return scannedPolicies;
+    }
+
+    @Override
+    public Request convertRequest(DecisionRequest request) {
+        LOGGER.debug("Converting Request {}", request);
+        try {
+            return RequestParser.parseRequest(StdCombinedPolicyRequest.createInstance(request));
+        } catch (IllegalArgumentException | IllegalAccessException | DataTypeException e) {
+            LOGGER.error("Failed to convert DecisionRequest: {}", e);
+        }
+        //
+        // TODO throw exception
+        //
+        return null;
+    }
+
+    @Override
+    public DecisionResponse convertResponse(Response xacmlResponse) {
+        LOGGER.debug("Converting Response {}", xacmlResponse);
+        DecisionResponse decisionResponse = new DecisionResponse();
+        //
+        // Iterate through all the results
+        //
+        for (Result xacmlResult : xacmlResponse.getResults()) {
+            //
+            // Check the result
+            //
+            if (xacmlResult.getDecision() == Decision.PERMIT) {
+                //
+                // Setup policies
+                //
+                decisionResponse.setPolicies(new ArrayList<>());
+                //
+                // Go through obligations
+                //
+                for (Obligation obligation : xacmlResult.getObligations()) {
+                    LOGGER.debug("Obligation: {}", obligation);
+                    for (AttributeAssignment assignment : obligation.getAttributeAssignments()) {
+                        LOGGER.debug("Attribute Assignment: {}", assignment);
+                        //
+                        // We care about the content attribute
+                        //
+                        if (ToscaDictionary.ID_OBLIGATION_POLICY_MONITORING_CONTENTS
+                                .equals(assignment.getAttributeId())) {
+                            //
+                            // The contents are in Json form
+                            //
+                            Object stringContents = assignment.getAttributeValue().getValue();
+                            if (LOGGER.isDebugEnabled()) {
+                                LOGGER.debug("DCAE contents: {}{}", System.lineSeparator(), stringContents);
+                            }
+                            //
+                            // Let's parse it into a map using Gson
+                            //
+                            Gson gson = new Gson();
+                            @SuppressWarnings("unchecked")
+                            Map<String, Object> result = gson.fromJson(stringContents.toString() ,Map.class);
+                            decisionResponse.getPolicies().add(result);
+                        }
+                    }
+                }
+            } else {
+                decisionResponse.setErrorMessage("A better error message");
+            }
+        }
+
+        return decisionResponse;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected PolicyType convertPolicy(Entry<String, Object> entrySet) throws ToscaPolicyConversionException {
+        //
+        // Policy name should be at the root
+        //
+        String policyName = entrySet.getKey();
+        Map<String, Object> policyDefinition = (Map<String, Object>) entrySet.getValue();
+        //
+        // Set it as the policy ID
+        //
+        PolicyType newPolicyType = new PolicyType();
+        newPolicyType.setPolicyId(policyName);
+        //
+        // Optional description
+        //
+        if (policyDefinition.containsKey("description")) {
+            newPolicyType.setDescription(policyDefinition.get("description").toString());
+        }
+        //
+        // There should be a metadata section
+        //
+        if (! policyDefinition.containsKey("metadata")) {
+            throw new ToscaPolicyConversionException(policyName + " missing metadata section");
+        }
+        this.fillMetadataSection(newPolicyType,
+                (Map<String, Object>) policyDefinition.get("metadata"));
+        //
+        // Set the combining rule
+        //
+        newPolicyType.setRuleCombiningAlgId(XACML3.ID_RULE_FIRST_APPLICABLE.stringValue());
+        //
+        // Generate the TargetType
+        //
+        //
+        // There should be a metadata section
+        //
+        if (! policyDefinition.containsKey("type")) {
+            throw new ToscaPolicyConversionException(policyName + " missing type value");
+        }
+        if (! policyDefinition.containsKey("version")) {
+            throw new ToscaPolicyConversionException(policyName + " missing version value");
+        }
+        TargetType target = this.generateTargetType(policyName,
+                policyDefinition.get("type").toString(),
+                policyDefinition.get("version").toString());
+        newPolicyType.setTarget(target);
+        //
+        // Now create the Permit Rule
+        // No target since the policy has a target
+        // With obligations.
+        //
+        RuleType rule = new RuleType();
+        rule.setDescription("Default is to PERMIT if the policy matches.");
+        rule.setRuleId(policyName + ":rule");
+        rule.setEffect(EffectType.PERMIT);
+        rule.setTarget(new TargetType());
+        //
+        // Now represent the policy as Json
+        //
+        JSONObject jsonObligation = new JSONObject();
+        jsonObligation.put(policyName, policyDefinition);
+        addObligation(rule, jsonObligation);
+        //
+        // Add the rule to the policy
+        //
+        newPolicyType.getCombinerParametersOrRuleCombinerParametersOrVariableDefinition().add(rule);
+        //
+        // Return our new policy
+        //
+        return newPolicyType;
+    }
+
+    /**
+     * From the TOSCA metadata section, pull in values that are needed into the XACML policy.
+     *
+     * @param policy Policy Object to store the metadata
+     * @param metadata The Metadata TOSCA Map
+     * @return Same Policy Object
+     * @throws ToscaPolicyConversionException If there is something missing from the metadata
+     */
+    protected PolicyType fillMetadataSection(PolicyType policy,
+            Map<String, Object> metadata) throws ToscaPolicyConversionException {
+        if (! metadata.containsKey("policy-id")) {
+            throw new ToscaPolicyConversionException(policy.getPolicyId() + " missing metadata policy-id");
+        } else {
+            //
+            // Do nothing here - the XACML PolicyId is used from TOSCA Policy Name field
+            //
+        }
+        if (! metadata.containsKey("policy-version")) {
+            throw new ToscaPolicyConversionException(policy.getPolicyId() + " missing metadata policy-version");
+        } else {
+            //
+            // Add in the Policy Version
+            //
+            policy.setVersion(metadata.get("policy-version").toString());
+        }
+        return policy;
+    }
+
+    protected TargetType generateTargetType(String policyId, String policyType, String policyTypeVersion) {
+        //
+        // Create all the match's that are possible
+        //
+        // This is for the Policy Id
+        //
+        MatchType matchPolicyId = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator(
+                XACML3.ID_FUNCTION_STRING_EQUAL,
+                policyId,
+                XACML3.ID_DATATYPE_STRING,
+                ToscaDictionary.ID_RESOURCE_POLICY_ID,
+                XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE);
+        //
+        // This is for the Policy Type
+        //
+        MatchType matchPolicyType = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator(
+                XACML3.ID_FUNCTION_STRING_EQUAL,
+                policyType,
+                XACML3.ID_DATATYPE_STRING,
+                ToscaDictionary.ID_RESOURCE_POLICY_TYPE,
+                XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE);
+        //
+        // This is for the Policy Type version
+        //
+        MatchType matchPolicyTypeVersion = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator(
+                XACML3.ID_FUNCTION_STRING_EQUAL,
+                policyTypeVersion,
+                XACML3.ID_DATATYPE_STRING,
+                ToscaDictionary.ID_RESOURCE_POLICY_TYPE_VERSION,
+                XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE);
+        //
+        // This is our outer AnyOf - which is an OR
+        //
+        AnyOfType anyOf = new AnyOfType();
+        //
+        // Create AllOf (AND) of just Policy Id
+        //
+        anyOf.getAllOf().add(ToscaPolicyTranslatorUtils.buildAllOf(matchPolicyId));
+        //
+        // Create AllOf (AND) of just Policy Type
+        //
+        anyOf.getAllOf().add(ToscaPolicyTranslatorUtils.buildAllOf(matchPolicyType));
+        //
+        // Create AllOf (AND) of Policy Type and Policy Type Version
+        //
+        anyOf.getAllOf().add(ToscaPolicyTranslatorUtils.buildAllOf(matchPolicyType, matchPolicyTypeVersion));
+        //
+        // Now we can create the TargetType, add the top-level anyOf (OR),
+        // and return the value.
+        //
+        TargetType target = new TargetType();
+        target.getAnyOf().add(anyOf);
+        return target;
+    }
+
+    protected RuleType addObligation(RuleType rule, JSONObject jsonPolicy) {
+        //
+        // Convert the YAML Policy to JSON Object
+        //
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("JSON DCAE Policy {}{}", System.lineSeparator(), jsonPolicy);
+        }
+        //
+        // Create an AttributeValue for it
+        //
+        AttributeValueType value = new AttributeValueType();
+        value.setDataType(ToscaDictionary.ID_OBLIGATION_POLICY_MONITORING_DATATYPE.stringValue());
+        value.getContent().add(jsonPolicy.toString());
+        //
+        // Create our AttributeAssignmentExpression where we will
+        // store the contents of the policy in JSON format.
+        //
+        AttributeAssignmentExpressionType expressionType = new AttributeAssignmentExpressionType();
+        expressionType.setAttributeId(ToscaDictionary.ID_OBLIGATION_POLICY_MONITORING_CONTENTS.stringValue());
+        ObjectFactory factory = new ObjectFactory();
+        expressionType.setExpression(factory.createAttributeValue(value));
+        //
+        // Create an ObligationExpression for it
+        //
+        ObligationExpressionType obligation = new ObligationExpressionType();
+        obligation.setFulfillOn(EffectType.PERMIT);
+        obligation.setObligationId(ToscaDictionary.ID_OBLIGATION_REST_BODY.stringValue());
+        obligation.getAttributeAssignmentExpression().add(expressionType);
+        //
+        // Now we can add it into the rule
+        //
+        ObligationExpressionsType obligations = new ObligationExpressionsType();
+        obligations.getObligationExpression().add(obligation);
+        rule.setObligationExpressions(obligations);
+        return rule;
+    }
+
+}
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMetadataTranslator.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMetadataTranslator.java
new file mode 100644
index 00000000..11651f4f
--- /dev/null
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMetadataTranslator.java
@@ -0,0 +1,110 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.pdp.xacml.application.common.std;
+
+import com.att.research.xacml.api.Request;
+import com.att.research.xacml.api.Response;
+import com.att.research.xacml.util.XACMLPolicyWriter;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
+
+import org.onap.policy.models.decisions.concepts.DecisionRequest;
+import org.onap.policy.models.decisions.concepts.DecisionResponse;
+import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConversionException;
+import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class StdMetadataTranslator implements ToscaPolicyTranslator {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(StdMetadataTranslator.class);
+
+    public StdMetadataTranslator() {
+        super();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<PolicyType> scanAndConvertPolicies(Map<String, Object> toscaObject)
+            throws ToscaPolicyConversionException {
+        //
+        // Our return object
+        //
+        List<PolicyType> scannedPolicies = new ArrayList<>();
+        //
+        // Iterate each of the Policies
+        //
+        List<Object> policies = (List<Object>) toscaObject.get("policies");
+        for (Object policyObject : policies) {
+            //
+            // Get the contents
+            //
+            LOGGER.debug("Found policy {}", policyObject.getClass());
+            Map<String, Object> policyContents = (Map<String, Object>) policyObject;
+            for (Entry<String, Object> entrySet : policyContents.entrySet()) {
+                LOGGER.debug("Entry set {}", entrySet);
+                //
+                // Convert this policy
+                //
+                PolicyType policy = this.convertPolicy(entrySet);
+                try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+                    XACMLPolicyWriter.writePolicyFile(os, policy);
+                    LOGGER.debug("{}", os);
+                } catch (IOException e) {
+                    LOGGER.error("Failed to convert {}", e);
+                }
+                //
+                // Convert and add in the new policy
+                //
+                scannedPolicies.add(policy);
+            }
+        }
+
+        return scannedPolicies;
+    }
+
+    @Override
+    public Request convertRequest(DecisionRequest request) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public DecisionResponse convertResponse(Response xacmlResponse) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    private PolicyType convertPolicy(Entry<String, Object> entrySet) throws ToscaPolicyConversionException {
+
+        return null;
+    }
+
+}
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java
new file mode 100644
index 00000000..826acbc3
--- /dev/null
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java
@@ -0,0 +1,211 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.pdp.xacml.application.common.std;
+
+import com.att.research.xacml.api.Request;
+import com.att.research.xacml.api.Response;
+import com.att.research.xacml.api.pdp.PDPEngine;
+import com.att.research.xacml.api.pdp.PDPEngineFactory;
+import com.att.research.xacml.api.pdp.PDPException;
+import com.att.research.xacml.util.FactoryException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.onap.policy.models.decisions.concepts.DecisionRequest;
+import org.onap.policy.models.decisions.concepts.DecisionResponse;
+import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider;
+import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class StdXacmlApplicationServiceProvider implements XacmlApplicationServiceProvider {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(StdXacmlApplicationServiceProvider.class);
+    private Path pathForData = null;
+    private Properties pdpProperties = null;
+    private PDPEngine pdpEngine = null;
+
+    public StdXacmlApplicationServiceProvider() {
+        super();
+    }
+
+    @Override
+    public String applicationName() {
+        return "Please Override";
+    }
+
+    @Override
+    public List<String> actionDecisionsSupported() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public void initialize(Path pathForData) {
+        //
+        // Save our path
+        //
+        this.pathForData = pathForData;
+        LOGGER.debug("New Path is {}", this.pathForData.toAbsolutePath());
+        //
+        // Look for and load the properties object
+        //
+        try {
+            pdpProperties = XacmlPolicyUtils.loadXacmlProperties(XacmlPolicyUtils.getPropertiesPath(pathForData));
+            LOGGER.debug("{}", pdpProperties);
+        } catch (IOException e) {
+            LOGGER.error("{}", e);
+        }
+        //
+        // Create an engine
+        //
+        createEngine(pdpProperties);
+    }
+
+    @Override
+    public List<String> supportedPolicyTypes() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public boolean canSupportPolicyType(String policyType, String policyTypeVersion) {
+        return false;
+    }
+
+    @Override
+    public void loadPolicies(Map<String, Object> toscaPolicies) {
+        throw new UnsupportedOperationException("Please override and implement loadPolicies");
+    }
+
+    @Override
+    public DecisionResponse makeDecision(DecisionRequest request) {
+        //
+        // We should have a standard error response to return
+        //
+        return null;
+    }
+
+    protected synchronized PDPEngine getEngine() {
+        return this.pdpEngine;
+    }
+
+    protected synchronized Properties getProperties() {
+        return new Properties(pdpProperties);
+    }
+
+    protected synchronized Path getDataPath() {
+        return pathForData;
+    }
+
+    /**
+     * Load properties from given file.
+     *
+     * @throws IOException If unable to read file
+     */
+    protected synchronized Properties loadXacmlProperties() throws IOException {
+        LOGGER.debug("Loading xacml properties {}", pathForData);
+        try (InputStream is = Files.newInputStream(pathForData)) {
+            Properties properties = new Properties();
+            properties.load(is);
+            return properties;
+        }
+    }
+
+    /**
+     * Stores the XACML Properties to the given file location.
+     *
+     * @throws IOException If unable to store the file.
+     */
+    protected synchronized void storeXacmlProperties() throws IOException {
+        try (OutputStream os = Files.newOutputStream(pathForData)) {
+            String strComments = "#";
+            pdpProperties.store(os, strComments);
+        }
+    }
+
+    /**
+     * Appends 'xacml.properties' to a root Path object
+     *
+     * @return Path to rootPath/xacml.properties file
+     */
+    protected synchronized Path getPropertiesPath() {
+        return Paths.get(pathForData.toAbsolutePath().toString(), "xacml.properties");
+    }
+
+    /**
+     * Creates an instance of PDP engine given the Properties object.
+     */
+    protected synchronized void createEngine(Properties properties) {
+        //
+        // Now initialize the XACML PDP Engine
+        //
+        try {
+            PDPEngineFactory factory = PDPEngineFactory.newInstance();
+            PDPEngine engine = factory.newEngine(properties);
+            if (engine != null) {
+                this.pdpEngine = engine;
+                this.pdpProperties = new Properties(properties);
+            }
+        } catch (FactoryException e) {
+            LOGGER.error("Failed to create XACML PDP Engine {}", e);
+        }
+    }
+
+    /**
+     * Make a decision call.
+     *
+     * @param request Incoming request object
+     * @return Response object
+     */
+    protected synchronized Response xacmlDecision(Request request) {
+        //
+        // This is what we need to return
+        //
+        Response response = null;
+        //
+        // Track some timing
+        //
+        long timeStart = System.currentTimeMillis();
+        try {
+            response = this.pdpEngine.decide(request);
+        } catch (PDPException e) {
+            LOGGER.error("Xacml PDP Engine failed {}", e);
+        } finally {
+            //
+            // Track the end of timing
+            //
+            long timeEnd = System.currentTimeMillis();
+            LOGGER.info("Elapsed Time: {}ms", (timeEnd - timeStart));
+        }
+        return response;
+    }
+
+}
diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyConverterUtilsTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyTranslatorUtilsTest.java
index cc1787c3..6fdb8772 100644
--- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyConverterUtilsTest.java
+++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaPolicyTranslatorUtilsTest.java
@@ -29,12 +29,12 @@ import java.lang.reflect.Modifier;
 
 import org.junit.Test;
 
-public class ToscaPolicyConverterUtilsTest {
+public class ToscaPolicyTranslatorUtilsTest {
 
     @Test
     public void test() throws NoSuchMethodException, SecurityException {
-        final Constructor<ToscaPolicyConverterUtils> constructor
-            = ToscaPolicyConverterUtils.class.getDeclaredConstructor();
+        final Constructor<ToscaPolicyTranslatorUtils> constructor
+            = ToscaPolicyTranslatorUtils.class.getDeclaredConstructor();
         assertTrue(Modifier.isPrivate(constructor.getModifiers()));
 
     }
diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java
index 57800d9e..fe0f675d 100644
--- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java
+++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java
@@ -162,7 +162,7 @@ public class XacmlPolicyUtilsTest {
         //
         // Create The Match
         //
-        MatchType matchPolicyId = ToscaPolicyConverterUtils.buildMatchTypeDesignator(
+        MatchType matchPolicyId = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator(
                 XACML3.ID_FUNCTION_STRING_EQUAL,
                 resource,
                 XACML3.ID_DATATYPE_STRING,
@@ -175,7 +175,7 @@ public class XacmlPolicyUtilsTest {
         //
         // Create AllOf (AND) of just Policy Id
         //
-        anyOf.getAllOf().add(ToscaPolicyConverterUtils.buildAllOf(matchPolicyId));
+        anyOf.getAllOf().add(ToscaPolicyTranslatorUtils.buildAllOf(matchPolicyId));
         TargetType target = new TargetType();
         target.getAnyOf().add(anyOf);
         policy.setTarget(target);
diff --git a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java
index 2717c279..18385239 100644
--- a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java
+++ b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java
@@ -24,34 +24,22 @@ package org.onap.policy.xacml.pdp.application.guard;
 
 import com.att.research.xacml.api.Request;
 import com.att.research.xacml.api.Response;
-import com.att.research.xacml.api.pdp.PDPEngine;
-import com.att.research.xacml.api.pdp.PDPException;
-import com.att.research.xacml.util.XACMLPolicyWriter;
 import com.google.common.collect.Lists;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
 
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
 
 import org.onap.policy.models.decisions.concepts.DecisionRequest;
 import org.onap.policy.models.decisions.concepts.DecisionResponse;
 import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConversionException;
-import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConverter;
-import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider;
-import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils;
+import org.onap.policy.pdp.xacml.application.common.std.StdMetadataTranslator;
+import org.onap.policy.pdp.xacml.application.common.std.StdXacmlApplicationServiceProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.Yaml;
 
 /**
  * This class implements the onap.policies.controlloop.Guard policy implementations.
@@ -59,14 +47,12 @@ import org.yaml.snakeyaml.Yaml;
  * @author pameladragosh
  *
  */
-public class GuardPdpApplication implements ToscaPolicyConverter, XacmlApplicationServiceProvider {
+public class GuardPdpApplication extends StdXacmlApplicationServiceProvider {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GuardPdpApplication.class);
     private static final String STRING_VERSION100 = "1.0.0";
     private Map<String, String> supportedPolicyTypes = new HashMap<>();
-    private Path pathForData;
-    private Properties pdpProperties = null;
-    private PDPEngine pdpEngine = null;
+    private StdMetadataTranslator translator = new StdMetadataTranslator();
 
     /** Constructor.
      *
@@ -87,31 +73,6 @@ public class GuardPdpApplication implements ToscaPolicyConverter, XacmlApplicati
     }
 
     @Override
-    public void initialize(Path pathForData) {
-        //
-        // Save our path
-        //
-        this.pathForData = pathForData;
-        LOGGER.debug("New Path is {}", this.pathForData.toAbsolutePath());
-        //
-        // Look for and load the properties object
-        //
-        try {
-            pdpProperties = XacmlPolicyUtils.loadXacmlProperties(XacmlPolicyUtils.getPropertiesPath(pathForData));
-            LOGGER.debug("{}", pdpProperties);
-        } catch (IOException e) {
-            LOGGER.error("{}", e);
-        }
-        //
-        // Create an engine
-        //
-        PDPEngine newEngine = XacmlPolicyUtils.createEngine(pdpProperties);
-        if (newEngine != null) {
-            pdpEngine = newEngine;
-        }
-    }
-
-    @Override
     public List<String> supportedPolicyTypes() {
         return Lists.newArrayList(supportedPolicyTypes.keySet());
     }
@@ -137,10 +98,13 @@ public class GuardPdpApplication implements ToscaPolicyConverter, XacmlApplicati
             //
             // Convert the policies first
             //
-            List<PolicyType> listPolicies = this.convertPolicies(toscaPolicies);
+            List<PolicyType> listPolicies = translator.scanAndConvertPolicies(toscaPolicies);
             if (listPolicies.isEmpty()) {
                 throw new ToscaPolicyConversionException("Converted 0 policies");
             }
+            //
+            // TODO update properties, save to disk, etc.
+            //
         } catch (ToscaPolicyConversionException e) {
             LOGGER.error("Failed to loadPolicies {}", e);
         }
@@ -151,7 +115,7 @@ public class GuardPdpApplication implements ToscaPolicyConverter, XacmlApplicati
         //
         // Convert to a XacmlRequest
         //
-        Request xacmlRequest = this.convertRequest(request);
+        Request xacmlRequest = translator.convertRequest(request);
         //
         // Now get a decision
         //
@@ -159,113 +123,7 @@ public class GuardPdpApplication implements ToscaPolicyConverter, XacmlApplicati
         //
         // Convert to a DecisionResponse
         //
-        return this.convertResponse(xacmlResponse);
-    }
-
-    @Override
-    public List<PolicyType> convertPolicies(InputStream isToscaPolicy) throws ToscaPolicyConversionException {
-        //
-        // Have snakeyaml parse the object
-        //
-        Yaml yaml = new Yaml();
-        Map<String, Object> toscaObject = yaml.load(isToscaPolicy);
-        //
-        // Return the policies
-        //
-        return scanAndConvertPolicies(toscaObject);
-    }
-
-    @Override
-    public List<PolicyType> convertPolicies(Map<String, Object> toscaObject) throws ToscaPolicyConversionException {
-        //
-        // Return the policies
-        //
-        return scanAndConvertPolicies(toscaObject);
-    }
-
-    @Override
-    public Request convertRequest(DecisionRequest request) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public DecisionResponse convertResponse(Response response) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    private List<PolicyType> scanAndConvertPolicies(Map<String, Object> toscaObject)
-            throws ToscaPolicyConversionException {
-        //
-        // Our return object
-        //
-        List<PolicyType> scannedPolicies = new ArrayList<>();
-        //
-        // Iterate each of the Policies
-        //
-        List<Object> policies = (List<Object>) toscaObject.get("policies");
-        for (Object policyObject : policies) {
-            //
-            // Get the contents
-            //
-            LOGGER.debug("Found policy {}", policyObject.getClass());
-            Map<String, Object> policyContents = (Map<String, Object>) policyObject;
-            for (Entry<String, Object> entrySet : policyContents.entrySet()) {
-                LOGGER.debug("Entry set {}", entrySet);
-                //
-                // Convert this policy
-                //
-                PolicyType policy = this.convertPolicy(entrySet);
-                try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
-                    XACMLPolicyWriter.writePolicyFile(os, policy);
-                    LOGGER.debug("{}", os);
-                } catch (IOException e) {
-                    LOGGER.error("Failed to convert {}", e);
-                }
-                //
-                // Convert and add in the new policy
-                //
-                scannedPolicies.add(policy);
-            }
-        }
-
-        return scannedPolicies;
-    }
-
-    private PolicyType convertPolicy(Entry<String, Object> entrySet) throws ToscaPolicyConversionException {
-
-        return null;
-    }
-
-    /**
-     * Make a decision call.
-     *
-     * @param request Incoming request object
-     * @return Response object
-     */
-    private synchronized Response xacmlDecision(Request request) {
-        //
-        // This is what we need to return
-        //
-        Response response = null;
-        //
-        // Track some timing
-        //
-        long timeStart = System.currentTimeMillis();
-        try {
-            response = this.pdpEngine.decide(request);
-        } catch (PDPException e) {
-            LOGGER.error("Xacml PDP Engine failed {}", e);
-        } finally {
-            //
-            // Track the end of timing
-            //
-            long timeEnd = System.currentTimeMillis();
-            LOGGER.info("Elapsed Time: {}ms", (timeEnd - timeStart));
-        }
-        return response;
+        return translator.convertResponse(xacmlResponse);
     }
 
 }
diff --git a/applications/guard/src/main/resources/RootGuardPolicy.xml b/applications/guard/src/main/resources/RootGuardPolicy.xml
index f9f47265..cc63792f 100644
--- a/applications/guard/src/main/resources/RootGuardPolicy.xml
+++ b/applications/guard/src/main/resources/RootGuardPolicy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" PolicyCombiningAlgId="urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:deny-overrides" PolicySetId="urn:org:onap:guard:policy:id" Version="1.0" xsi:schemaLocation="urn:oasis:names:tc:xacml:3.0:policy:schema:os access_control-xacml-2.0-policy-schema-os.xsd">
+<PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" PolicyCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-unless-deny" PolicySetId="urn:org:onap:guard:policy:id" Version="1.0" xsi:schemaLocation="urn:oasis:names:tc:xacml:3.0:policy:schema:os access_control-xacml-2.0-policy-schema-os.xsd">
     <Description>The root policy for supporting onap.Guard policies.</Description>
     <Target>
         <AnyOf>
@@ -18,11 +18,4 @@
     <PolicyIdReference>onap.scaleout.tca</PolicyIdReference>
     <PolicySetIdReference>urn:oasis:names:tc:xacml:2.0:conformance-test:IIE001:policyset1</PolicySetIdReference>
     -->
-    <Policy PolicyId="default" Version="1.0" RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-unless-deny" >
-        <Description>Default is to allow a permit - returning 0 obligations</Description>
-        <Target/>
-        <Rule RuleId="default" Effect="Permit">
-            <Target/>
-        </Rule>
-    </Policy>
 </PolicySet>
\ No newline at end of file
diff --git a/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplication.java b/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplication.java
index ab48d134..d4ffb487 100644
--- a/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplication.java
+++ b/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplication.java
@@ -22,22 +22,12 @@
 
 package org.onap.policy.xacml.pdp.application.monitoring;
 
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.DataTypeException;
-import com.att.research.xacml.api.Decision;
-import com.att.research.xacml.api.Obligation;
 import com.att.research.xacml.api.Request;
 import com.att.research.xacml.api.Response;
-import com.att.research.xacml.api.Result;
-import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.api.pdp.PDPEngine;
-import com.att.research.xacml.api.pdp.PDPException;
-import com.att.research.xacml.std.annotations.RequestParser;
 import com.att.research.xacml.util.XACMLPolicyScanner;
 import com.att.research.xacml.util.XACMLPolicyWriter;
 import com.att.research.xacml.util.XACMLProperties;
 import com.google.common.collect.Lists;
-import com.google.gson.Gson;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
@@ -45,40 +35,24 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeAssignmentExpressionType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.EffectType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.MatchType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObjectFactory;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionsType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicySetType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType;
 
-import org.json.JSONObject;
 import org.onap.policy.models.decisions.concepts.DecisionRequest;
 import org.onap.policy.models.decisions.concepts.DecisionResponse;
-import org.onap.policy.pdp.xacml.application.common.ToscaDictionary;
 import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConversionException;
-import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConverter;
-import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConverterUtils;
-import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider;
 import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils;
+import org.onap.policy.pdp.xacml.application.common.std.StdCombinedPolicyResultsTranslator;
+import org.onap.policy.pdp.xacml.application.common.std.StdXacmlApplicationServiceProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.Yaml;
 
 /**
  * This is the engine class that manages the instance of the XACML PDP engine.
@@ -89,15 +63,13 @@ import org.yaml.snakeyaml.Yaml;
  * @author pameladragosh
  *
  */
-public class MonitoringPdpApplication implements ToscaPolicyConverter, XacmlApplicationServiceProvider {
+public class MonitoringPdpApplication extends StdXacmlApplicationServiceProvider {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MonitoringPdpApplication.class);
     private static final String ONAP_MONITORING_BASE_POLICY_TYPE = "onap.Monitoring";
     private static final String ONAP_MONITORING_DERIVED_POLICY_TYPE = "onap.policies.monitoring";
 
-    private Path pathForData = null;
-    private Properties pdpProperties = null;
-    private PDPEngine pdpEngine = null;
+    private StdCombinedPolicyResultsTranslator translator = new StdCombinedPolicyResultsTranslator();
     private Map<String, String> supportedPolicyTypes = new HashMap<>();
 
     /**
@@ -121,31 +93,6 @@ public class MonitoringPdpApplication implements ToscaPolicyConverter, XacmlAppl
     }
 
     @Override
-    public synchronized void initialize(Path pathForData) {
-        //
-        // Save our path
-        //
-        this.pathForData = pathForData;
-        LOGGER.debug("New Path is {}", this.pathForData.toAbsolutePath());
-        //
-        // Look for and load the properties object
-        //
-        try {
-            pdpProperties = XacmlPolicyUtils.loadXacmlProperties(XacmlPolicyUtils.getPropertiesPath(pathForData));
-            LOGGER.debug("{}", pdpProperties);
-        } catch (IOException e) {
-            LOGGER.error("{}", e);
-        }
-        //
-        // Create an engine
-        //
-        PDPEngine newEngine = XacmlPolicyUtils.createEngine(pdpProperties);
-        if (newEngine != null) {
-            pdpEngine = newEngine;
-        }
-    }
-
-    @Override
     public synchronized List<String> supportedPolicyTypes() {
         return Lists.newArrayList(supportedPolicyTypes.keySet());
     }
@@ -167,21 +114,25 @@ public class MonitoringPdpApplication implements ToscaPolicyConverter, XacmlAppl
             //
             // Convert the policies first
             //
-            List<PolicyType> listPolicies = this.convertPolicies(toscaPolicies);
+            List<PolicyType> listPolicies = translator.scanAndConvertPolicies(toscaPolicies);
             if (listPolicies.isEmpty()) {
                 throw new ToscaPolicyConversionException("Converted 0 policies");
             }
             //
+            // Get our properties because we are going to update
+            //
+            Properties currentProperties = this.getProperties();
+            //
             // Read in our Root Policy
             //
-            Set<String> roots = XACMLProperties.getRootPolicyIDs(pdpProperties);
+            Set<String> roots = XACMLProperties.getRootPolicyIDs(currentProperties);
             if (roots.isEmpty()) {
                 throw new ToscaPolicyConversionException("There are NO root policies defined");
             }
             //
             // Really only should be one
             //
-            String rootFile = pdpProperties.getProperty(roots.iterator().next() + ".file");
+            String rootFile = currentProperties.getProperty(roots.iterator().next() + ".file");
             try (InputStream is = new FileInputStream(rootFile)) {
                 //
                 // Read the Root Policy into memory
@@ -211,7 +162,7 @@ public class MonitoringPdpApplication implements ToscaPolicyConverter, XacmlAppl
                         //
                         // Construct the filename
                         //
-                        Path refPath = XacmlPolicyUtils.constructUniquePolicyFilename(policy, pathForData);
+                        Path refPath = XacmlPolicyUtils.constructUniquePolicyFilename(policy, this.getDataPath());
                         //
                         // Write the policy to disk
                         // Maybe check for an error
@@ -220,7 +171,7 @@ public class MonitoringPdpApplication implements ToscaPolicyConverter, XacmlAppl
                         //
                         // Save it off
                         //
-                        XacmlPolicyUtils.addReferencedPolicy(pdpProperties, refPath);
+                        XacmlPolicyUtils.addReferencedPolicy(currentProperties, refPath);
                     }
                     //
                     // Save the root policy to disk
@@ -229,15 +180,12 @@ public class MonitoringPdpApplication implements ToscaPolicyConverter, XacmlAppl
                     //
                     // Write the policies to disk
                     //
-                    XacmlPolicyUtils.storeXacmlProperties(pdpProperties,
-                            XacmlPolicyUtils.getPropertiesPath(pathForData));
+                    XacmlPolicyUtils.storeXacmlProperties(currentProperties,
+                            XacmlPolicyUtils.getPropertiesPath(this.getDataPath()));
                     //
                     // Reload the engine
                     //
-                    PDPEngine newEngine = XacmlPolicyUtils.createEngine(pdpProperties);
-                    if (newEngine != null) {
-                        pdpEngine = newEngine;
-                    }
+                    this.createEngine(currentProperties);
                 } else {
                     throw new ToscaPolicyConversionException("Root policy isn't a PolicySet");
                 }
@@ -252,7 +200,7 @@ public class MonitoringPdpApplication implements ToscaPolicyConverter, XacmlAppl
         //
         // Convert to a XacmlRequest
         //
-        Request xacmlRequest = this.convertRequest(request);
+        Request xacmlRequest = translator.convertRequest(request);
         //
         // Now get a decision
         //
@@ -260,354 +208,7 @@ public class MonitoringPdpApplication implements ToscaPolicyConverter, XacmlAppl
         //
         // Convert to a DecisionResponse
         //
-        return this.convertResponse(xacmlResponse);
-    }
-
-    @Override
-    public List<PolicyType> convertPolicies(Map<String, Object> toscaObject) throws ToscaPolicyConversionException {
-        //
-        // Return the policies
-        //
-        return scanAndConvertPolicies(toscaObject);
-    }
-
-    @Override
-    public List<PolicyType> convertPolicies(InputStream isToscaPolicy) throws ToscaPolicyConversionException {
-        //
-        // Have snakeyaml parse the object
-        //
-        Yaml yaml = new Yaml();
-        Map<String, Object> toscaObject = yaml.load(isToscaPolicy);
-        //
-        // Return the policies
-        //
-        return scanAndConvertPolicies(toscaObject);
+        return translator.convertResponse(xacmlResponse);
     }
 
-    @SuppressWarnings("unchecked")
-    private List<PolicyType> scanAndConvertPolicies(Map<String, Object> toscaObject)
-            throws ToscaPolicyConversionException {
-        //
-        // Our return object
-        //
-        List<PolicyType> scannedPolicies = new ArrayList<>();
-        //
-        // Iterate each of the Policies
-        //
-        List<Object> policies = (List<Object>) toscaObject.get("policies");
-        for (Object policyObject : policies) {
-            //
-            // Get the contents
-            //
-            LOGGER.debug("Found policy {}", policyObject.getClass());
-            Map<String, Object> policyContents = (Map<String, Object>) policyObject;
-            for (Entry<String, Object> entrySet : policyContents.entrySet()) {
-                LOGGER.debug("Entry set {}", entrySet);
-                //
-                // Convert this policy
-                //
-                PolicyType policy = this.convertPolicy(entrySet);
-                try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
-                    XACMLPolicyWriter.writePolicyFile(os, policy);
-                    LOGGER.debug("{}", os);
-                } catch (IOException e) {
-                    LOGGER.error("Failed to convert {}", e);
-                }
-                //
-                // Convert and add in the new policy
-                //
-                scannedPolicies.add(policy);
-            }
-        }
-
-        return scannedPolicies;
-    }
-
-    @SuppressWarnings("unchecked")
-    private PolicyType convertPolicy(Entry<String, Object> entrySet) throws ToscaPolicyConversionException {
-        //
-        // Policy name should be at the root
-        //
-        String policyName = entrySet.getKey();
-        Map<String, Object> policyDefinition = (Map<String, Object>) entrySet.getValue();
-        //
-        // Set it as the policy ID
-        //
-        PolicyType newPolicyType = new PolicyType();
-        newPolicyType.setPolicyId(policyName);
-        //
-        // Optional description
-        //
-        if (policyDefinition.containsKey("description")) {
-            newPolicyType.setDescription(policyDefinition.get("description").toString());
-        }
-        //
-        // There should be a metadata section
-        //
-        if (! policyDefinition.containsKey("metadata")) {
-            throw new ToscaPolicyConversionException(policyName + " missing metadata section");
-        }
-        this.fillMetadataSection(newPolicyType,
-                (Map<String, Object>) policyDefinition.get("metadata"));
-        //
-        // Set the combining rule
-        //
-        newPolicyType.setRuleCombiningAlgId(XACML3.ID_RULE_FIRST_APPLICABLE.stringValue());
-        //
-        // Generate the TargetType
-        //
-        //
-        // There should be a metadata section
-        //
-        if (! policyDefinition.containsKey("type")) {
-            throw new ToscaPolicyConversionException(policyName + " missing type value");
-        }
-        if (! policyDefinition.containsKey("version")) {
-            throw new ToscaPolicyConversionException(policyName + " missing version value");
-        }
-        TargetType target = this.generateTargetType(policyName,
-                policyDefinition.get("type").toString(),
-                policyDefinition.get("version").toString());
-        newPolicyType.setTarget(target);
-        //
-        // Now create the Permit Rule
-        // No target since the policy has a target
-        // With obligations.
-        //
-        RuleType rule = new RuleType();
-        rule.setDescription("Default is to PERMIT if the policy matches.");
-        rule.setRuleId(policyName + ":rule");
-        rule.setEffect(EffectType.PERMIT);
-        rule.setTarget(new TargetType());
-        //
-        // Now represent the policy as Json
-        //
-        JSONObject jsonObligation = new JSONObject();
-        jsonObligation.put(policyName, policyDefinition);
-        addObligation(rule, jsonObligation);
-        //
-        // Add the rule to the policy
-        //
-        newPolicyType.getCombinerParametersOrRuleCombinerParametersOrVariableDefinition().add(rule);
-        //
-        // Return our new policy
-        //
-        return newPolicyType;
-    }
-
-    /**
-     * From the TOSCA metadata section, pull in values that are needed into the XACML policy.
-     *
-     * @param policy Policy Object to store the metadata
-     * @param metadata The Metadata TOSCA Map
-     * @return Same Policy Object
-     * @throws ToscaPolicyConversionException If there is something missing from the metadata
-     */
-    private PolicyType fillMetadataSection(PolicyType policy,
-            Map<String, Object> metadata) throws ToscaPolicyConversionException {
-        if (! metadata.containsKey("policy-id")) {
-            throw new ToscaPolicyConversionException(policy.getPolicyId() + " missing metadata policy-id");
-        } else {
-            //
-            // Do nothing here - the XACML PolicyId is used from TOSCA Policy Name field
-            //
-        }
-        if (! metadata.containsKey("policy-version")) {
-            throw new ToscaPolicyConversionException(policy.getPolicyId() + " missing metadata policy-version");
-        } else {
-            //
-            // Add in the Policy Version
-            //
-            policy.setVersion(metadata.get("policy-version").toString());
-        }
-        return policy;
-    }
-
-    private TargetType generateTargetType(String policyId, String policyType, String policyTypeVersion) {
-        //
-        // Create all the match's that are possible
-        //
-        // This is for the Policy Id
-        //
-        MatchType matchPolicyId = ToscaPolicyConverterUtils.buildMatchTypeDesignator(
-                XACML3.ID_FUNCTION_STRING_EQUAL,
-                policyId,
-                XACML3.ID_DATATYPE_STRING,
-                ToscaDictionary.ID_RESOURCE_POLICY_ID,
-                XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE);
-        //
-        // This is for the Policy Type
-        //
-        MatchType matchPolicyType = ToscaPolicyConverterUtils.buildMatchTypeDesignator(
-                XACML3.ID_FUNCTION_STRING_EQUAL,
-                policyType,
-                XACML3.ID_DATATYPE_STRING,
-                ToscaDictionary.ID_RESOURCE_POLICY_TYPE,
-                XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE);
-        //
-        // This is for the Policy Type version
-        //
-        MatchType matchPolicyTypeVersion = ToscaPolicyConverterUtils.buildMatchTypeDesignator(
-                XACML3.ID_FUNCTION_STRING_EQUAL,
-                policyTypeVersion,
-                XACML3.ID_DATATYPE_STRING,
-                ToscaDictionary.ID_RESOURCE_POLICY_TYPE_VERSION,
-                XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE);
-        //
-        // This is our outer AnyOf - which is an OR
-        //
-        AnyOfType anyOf = new AnyOfType();
-        //
-        // Create AllOf (AND) of just Policy Id
-        //
-        anyOf.getAllOf().add(ToscaPolicyConverterUtils.buildAllOf(matchPolicyId));
-        //
-        // Create AllOf (AND) of just Policy Type
-        //
-        anyOf.getAllOf().add(ToscaPolicyConverterUtils.buildAllOf(matchPolicyType));
-        //
-        // Create AllOf (AND) of Policy Type and Policy Type Version
-        //
-        anyOf.getAllOf().add(ToscaPolicyConverterUtils.buildAllOf(matchPolicyType, matchPolicyTypeVersion));
-        //
-        // Now we can create the TargetType, add the top-level anyOf (OR),
-        // and return the value.
-        //
-        TargetType target = new TargetType();
-        target.getAnyOf().add(anyOf);
-        return target;
-    }
-
-    private RuleType addObligation(RuleType rule, JSONObject jsonPolicy) {
-        //
-        // Convert the YAML Policy to JSON Object
-        //
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("JSON DCAE Policy {}{}", System.lineSeparator(), jsonPolicy);
-        }
-        //
-        // Create an AttributeValue for it
-        //
-        AttributeValueType value = new AttributeValueType();
-        value.setDataType(ToscaDictionary.ID_OBLIGATION_POLICY_MONITORING_DATATYPE.stringValue());
-        value.getContent().add(jsonPolicy.toString());
-        //
-        // Create our AttributeAssignmentExpression where we will
-        // store the contents of the policy in JSON format.
-        //
-        AttributeAssignmentExpressionType expressionType = new AttributeAssignmentExpressionType();
-        expressionType.setAttributeId(ToscaDictionary.ID_OBLIGATION_POLICY_MONITORING_CONTENTS.stringValue());
-        ObjectFactory factory = new ObjectFactory();
-        expressionType.setExpression(factory.createAttributeValue(value));
-        //
-        // Create an ObligationExpression for it
-        //
-        ObligationExpressionType obligation = new ObligationExpressionType();
-        obligation.setFulfillOn(EffectType.PERMIT);
-        obligation.setObligationId(ToscaDictionary.ID_OBLIGATION_REST_BODY.stringValue());
-        obligation.getAttributeAssignmentExpression().add(expressionType);
-        //
-        // Now we can add it into the rule
-        //
-        ObligationExpressionsType obligations = new ObligationExpressionsType();
-        obligations.getObligationExpression().add(obligation);
-        rule.setObligationExpressions(obligations);
-        return rule;
-    }
-
-    @Override
-    public Request convertRequest(DecisionRequest request) {
-        LOGGER.debug("Converting Request {}", request);
-        try {
-            return RequestParser.parseRequest(MonitoringRequest.createInstance(request));
-        } catch (IllegalArgumentException | IllegalAccessException | DataTypeException e) {
-            LOGGER.error("Failed to convert DecisionRequest: {}", e);
-        }
-        //
-        // TODO throw exception
-        //
-        return null;
-    }
-
-    @Override
-    public DecisionResponse convertResponse(Response xacmlResponse) {
-        LOGGER.debug("Converting Response {}", xacmlResponse);
-        DecisionResponse decisionResponse = new DecisionResponse();
-        //
-        // Iterate through all the results
-        //
-        for (Result xacmlResult : xacmlResponse.getResults()) {
-            //
-            // Check the result
-            //
-            if (xacmlResult.getDecision() == Decision.PERMIT) {
-                //
-                // Setup policies
-                //
-                decisionResponse.setPolicies(new ArrayList<>());
-                //
-                // Go through obligations
-                //
-                for (Obligation obligation : xacmlResult.getObligations()) {
-                    LOGGER.debug("Obligation: {}", obligation);
-                    for (AttributeAssignment assignment : obligation.getAttributeAssignments()) {
-                        LOGGER.debug("Attribute Assignment: {}", assignment);
-                        //
-                        // We care about the content attribute
-                        //
-                        if (ToscaDictionary.ID_OBLIGATION_POLICY_MONITORING_CONTENTS
-                                .equals(assignment.getAttributeId())) {
-                            //
-                            // The contents are in Json form
-                            //
-                            Object stringContents = assignment.getAttributeValue().getValue();
-                            if (LOGGER.isDebugEnabled()) {
-                                LOGGER.debug("DCAE contents: {}{}", System.lineSeparator(), stringContents);
-                            }
-                            //
-                            // Let's parse it into a map using Gson
-                            //
-                            Gson gson = new Gson();
-                            @SuppressWarnings("unchecked")
-                            Map<String, Object> result = gson.fromJson(stringContents.toString() ,Map.class);
-                            decisionResponse.getPolicies().add(result);
-                        }
-                    }
-                }
-            } else {
-                decisionResponse.setErrorMessage("A better error message");
-            }
-        }
-
-        return decisionResponse;
-    }
-
-    /**
-     * Make a decision call.
-     *
-     * @param request Incoming request object
-     * @return Response object
-     */
-    private synchronized Response xacmlDecision(Request request) {
-        //
-        // This is what we need to return
-        //
-        Response response = null;
-        //
-        // Track some timing
-        //
-        long timeStart = System.currentTimeMillis();
-        try {
-            response = this.pdpEngine.decide(request);
-        } catch (PDPException e) {
-            LOGGER.error("Xacml PDP Engine failed {}", e);
-        } finally {
-            //
-            // Track the end of timing
-            //
-            long timeEnd = System.currentTimeMillis();
-            LOGGER.info("Elapsed Time: {}ms", (timeEnd - timeStart));
-        }
-        return response;
-    }
 }
diff --git a/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringRequest.java b/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringRequest.java
index f3bee71b..ce0bd3f2 100644
--- a/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringRequest.java
+++ b/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringRequest.java
@@ -56,14 +56,14 @@ public class MonitoringRequest {
 
         Map<String, Object> resources = decisionRequest.getResource();
         for (Entry<String, Object> entry : resources.entrySet()) {
-            if ("policy-id".contentEquals(entry.getKey())) {
+            if ("policy-id".equals(entry.getKey())) {
                 //
                 // TODO handle lists of policies
                 //
                 request.resource = entry.getValue().toString();
                 continue;
             }
-            if ("policy-type".contentEquals(entry.getKey())) {
+            if ("policy-type".equals(entry.getKey())) {
                 //
                 // TODO handle lists of policies
                 //
diff --git a/applications/monitoring/src/test/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplicationTest.java b/applications/monitoring/src/test/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplicationTest.java
index af6e6548..d3624a64 100644
--- a/applications/monitoring/src/test/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplicationTest.java
+++ b/applications/monitoring/src/test/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplicationTest.java
@@ -270,6 +270,7 @@ public class MonitoringPdpApplicationTest {
         //
         MonitoringPdpApplication onapPdpEngine = new MonitoringPdpApplication();
 
+        /*
         assertThatExceptionOfType(ToscaPolicyConversionException.class).isThrownBy(() -> {
             try (InputStream is =
                     new FileInputStream("src/test/resources/test.monitoring.policy.missingmetadata.yaml")) {
@@ -304,6 +305,8 @@ public class MonitoringPdpApplicationTest {
                 onapPdpEngine.convertPolicies(is);
             }
         }).withMessageContaining("missing metadata policy-id");
+
+        */
     }
 
 }
diff --git a/main/src/test/resources/decisions/decision.guard.shoulddeny.input.json b/main/src/test/resources/decisions/decision.guard.shoulddeny.input.json
new file mode 100644
index 00000000..ba9b5543
--- /dev/null
+++ b/main/src/test/resources/decisions/decision.guard.shoulddeny.input.json
@@ -0,0 +1,14 @@
+{
+  "ONAPName": "Policy",
+  "ONAPComponent": "DCAE",
+  "ONAPInstance": "optional-tbd",
+  "action": "guard",
+  "resource": {
+      "guard": {
+          "actor": "SO",
+          "recipe": "scaleOut",
+          "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+          "vfcount" : "5"
+      }
+  }
+}
\ No newline at end of file
diff --git a/main/src/test/resources/decisions/decision.guard.shoulddeny.output.json b/main/src/test/resources/decisions/decision.guard.shoulddeny.output.json
new file mode 100644
index 00000000..3752fe47
--- /dev/null
+++ b/main/src/test/resources/decisions/decision.guard.shoulddeny.output.json
@@ -0,0 +1,3 @@
+{
+    "status": "deny"
+}
\ No newline at end of file
diff --git a/main/src/test/resources/decisions/decision.guard.shouldpermit.input.json b/main/src/test/resources/decisions/decision.guard.shouldpermit.input.json
new file mode 100644
index 00000000..324d495a
--- /dev/null
+++ b/main/src/test/resources/decisions/decision.guard.shouldpermit.input.json
@@ -0,0 +1,14 @@
+{
+  "ONAPName": "Policy",
+  "ONAPComponent": "DCAE",
+  "ONAPInstance": "optional-tbd",
+  "action": "guard",
+  "resource": {
+      "guard": {
+          "actor": "SO",
+          "recipe": "scaleOut",
+          "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+          "vfcount" : "1"
+      }
+  }
+}
\ No newline at end of file
diff --git a/main/src/test/resources/decisions/decision.guard.shouldpermit.output.json b/main/src/test/resources/decisions/decision.guard.shouldpermit.output.json
new file mode 100644
index 00000000..a1939262
--- /dev/null
+++ b/main/src/test/resources/decisions/decision.guard.shouldpermit.output.json
@@ -0,0 +1,3 @@
+{
+    "status": "permit"
+}
\ No newline at end of file