Add SDNC naming application

Requires changes to StdMatchableTranslator to go deeper when
searching for matchable attributes.

NOTE: will re-visit the StdMatchableTranslator at a later date
in order to support more robust Policy Types. And document best
practices for defining matchables.

Issue-ID: POLICY-1740
Change-Id: I291cf1c2e6eba0a677a3312dd11f0e56178a805b
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

12 files changed, 600 insertions, 29 deletions

diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java
index addb0df3..ae09ec10 100644
--- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java
@@ -332,20 +332,60 @@ public class StdMatchableTranslator  extends StdBaseTranslator {
         //
         // Iterate the properties
         //
+        int totalWeight = findMatchableFromMap(properties, policyTypes, targetType);
+        LOGGER.info("Total weight is {}", totalWeight);
+        return Pair.of(targetType, totalWeight);
+    }
+
+    @SuppressWarnings("unchecked")
+    protected int findMatchableFromList(List<Object> listProperties, Collection<ToscaPolicyType> policyTypes,
+            TargetType targetType) {
+        LOGGER.info("findMatchableFromList {}", listProperties);
+        int totalWeight = 0;
+        for (Object property : listProperties) {
+            if (property instanceof List) {
+                totalWeight += findMatchableFromList((List<Object>) property, policyTypes, targetType);
+            } else if (property instanceof Map) {
+                totalWeight += findMatchableFromMap((Map<String, Object>) property, policyTypes, targetType);
+            }
+        }
+        return totalWeight;
+    }
+
+    protected int findMatchableFromMap(Map<String, Object> properties, Collection<ToscaPolicyType> policyTypes,
+            TargetType targetType) {
+        LOGGER.info("findMatchableFromMap {}", properties);
         int totalWeight = 0;
         for (Entry<String, Object> entrySet : properties.entrySet()) {
             //
-            // Find matchable properties
+            // Is this a matchable property?
             //
             if (isMatchable(entrySet.getKey(), policyTypes)) {
                 LOGGER.info("Found matchable property {}", entrySet.getKey());
                 int weight = generateMatchable(targetType, entrySet.getKey(), entrySet.getValue());
                 LOGGER.info("Weight is {}", weight);
                 totalWeight += weight;
+            } else {
+                //
+                // Check if we need to search deeper
+                //
+                totalWeight += checkDeeperForMatchable(entrySet.getValue(), policyTypes, targetType);
             }
         }
-        LOGGER.info("Total weight is {}", totalWeight);
-        return Pair.of(targetType, totalWeight);
+        return totalWeight;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected int checkDeeperForMatchable(Object property, Collection<ToscaPolicyType> policyTypes,
+            TargetType targetType) {
+        if (property instanceof List) {
+            return findMatchableFromList((List<Object>) property, policyTypes, targetType);
+        } else if (property instanceof Map) {
+            return findMatchableFromMap((Map<String, Object>) property, policyTypes,
+                    targetType);
+        }
+        LOGGER.info("checkDeeperForMatchable not necessary for {}", property);
+        return 0;
     }
 
     /**
@@ -362,11 +402,28 @@ public class StdMatchableTranslator  extends StdBaseTranslator {
                 if (checkIsMatchableProperty(propertyName, propertiesEntry)) {
                     return true;
                 }
+                //
+                // Check if its a list or map
+                //
+                if (isListOrMap(propertiesEntry.getValue().getType())
+                        && ! isYamlType(propertiesEntry.getValue().getEntrySchema().getType())) {
+                    LOGGER.info("need to search list or map");
+                }
             }
         }
+        LOGGER.info("isMatchable false for {}", propertyName);
         return false;
     }
 
+    private boolean isListOrMap(String type) {
+        return "list".equalsIgnoreCase(type) || "map".equalsIgnoreCase(type);
+    }
+
+    private boolean isYamlType(String type) {
+        return "string".equalsIgnoreCase(type) || "integer".equalsIgnoreCase(type) || "float".equalsIgnoreCase(type)
+                || "boolean".equalsIgnoreCase(type) || "timestamp".equalsIgnoreCase(type);
+    }
+
     /**
      * checkIsMatchableProperty - checks the policy contents for matchable field. If the metadata doesn't exist,
      * then definitely not. If the property doesn't exist, then definitely not. Otherwise need to have a metadata
@@ -665,6 +722,7 @@ public class StdMatchableTranslator  extends StdBaseTranslator {
             LOGGER.error("parameters: {} ", this.apiRestParameters);
             return null;
         }
+        LOGGER.info("Successfully pulled {}", policyTypeId);
         //
         // Store it locally
         //
diff --git a/applications/common/src/test/resources/matchable/onap.policies.Test-1.0.0.yaml b/applications/common/src/test/resources/matchable/onap.policies.Test-1.0.0.yaml
index 089aad66..f44a3061 100644
--- a/applications/common/src/test/resources/matchable/onap.policies.Test-1.0.0.yaml
+++ b/applications/common/src/test/resources/matchable/onap.policies.Test-1.0.0.yaml
@@ -18,10 +18,10 @@ policy_types:
                 type: integer
                 metadata:
                    matchable: true
-            nonmatachableDouble:
-                type: double
-            matchableDouble:
-                type: double
+            nonmatachableFloat:
+                type: float
+            matchableFloat:
+                type: float
                 metadata:
                    matchable: true
             nonmatachableBoolean:
@@ -35,4 +35,44 @@ policy_types:
                 metadata:
                    matchable: true
                 entry_schema:
-                   type: string
\ No newline at end of file
+                   type: string
+            propertyOneMap:
+                type: map
+                entry_schema:
+                    type: onap.datatype.level1
+data_types:
+    onap.datatype.one:
+        derived_from: tosca.datatypes.Root
+        properties:
+            oneString:
+                type: string
+            oneStringMatchable:
+                type: string
+                metadata:
+                    matachable: true
+            propertyTwoList:
+                type: list
+                entry_schema:
+                    type: onap.datatype.two
+    onap.datatype.two:
+        derived_from: tosca.datatypes.Root
+        properties:
+            twoString:
+                type: string
+            twoStringMatchable:
+                type: string
+                metadata:
+                    matachable: true
+            propertyThreeMap:
+                type: map
+                entry_schema:
+                    type: onap.datatype.three
+    onap.datatype.three:
+        derived_from: tosca.datatypes.Root
+        properties:
+            threeString:
+                type: string
+            threeStringMatchable:
+                type: string
+                metadata:
+                    matachable: true
\ No newline at end of file
diff --git a/applications/common/src/test/resources/matchable/test.policies.input.tosca.yaml b/applications/common/src/test/resources/matchable/test.policies.input.tosca.yaml
index 434f7a97..9a68d488 100644
--- a/applications/common/src/test/resources/matchable/test.policies.input.tosca.yaml
+++ b/applications/common/src/test/resources/matchable/test.policies.input.tosca.yaml
@@ -1,23 +1,31 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 topology_template:
-  policies:
-    -
-      Test.policy:
-         type: onap.policies.Test
-         type_version: 1.0.0
-         version: 1.0.0
-         metadata:
-             policy-id: Test.policy
-             policy-version: 1
-         properties:
-            nonmatachableString: "I am NON matchable"
-            matchableString: "I should be matched"
-            nonmatachableInteger: 0
-            matachableInteger: 1000
-            nonmatachableDouble: 0.0
-            matchableDouble: 1.1
-            nonmatachableBoolean: false
-            matachableBoolean: true
-            matchableListString:
-               - match A
-               - match B
\ No newline at end of file
+    policies:
+    -   Test.policy:
+            type: onap.policies.Test
+            type_version: 1.0.0
+            version: 1.0.0
+            metadata:
+                policy-id: Test.policy
+                policy-version: 1
+            properties:
+                nonmatachableString: I am NON matchable
+                matchableString: I should be matched
+                nonmatachableInteger: 0
+                matachableInteger: 1000
+                nonmatachableFloat: 0.0
+                matchableFloat: 1.1
+                nonmatachableBoolean: false
+                matachableBoolean: true
+                matchableListString:
+                - match A
+                - match B
+                propertyOneMap:
+                    oneString: One is NOT matchable
+                    oneStringMatchable: One should be matched
+                    propertyTwoList:
+                    -   twoString: Two is NOT matchable
+                        twoStringMatachable: Two should be matched
+                        propertyThreeMap:
+                            threeString: Three is NOT matchable
+                            threeStringMatchable: Three should be matched
\ No newline at end of file
diff --git a/applications/naming/pom.xml b/applications/naming/pom.xml
new file mode 100644
index 00000000..0bba663f
--- /dev/null
+++ b/applications/naming/pom.xml
@@ -0,0 +1,54 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP Policy Engine - XACML PDP
+  ================================================================================
+  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.
+  ============LICENSE_END=========================================================
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.policy.xacml-pdp.applications</groupId>
+        <artifactId>applications</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>naming</artifactId>
+
+    <name>${project.artifactId}</name>
+    <description>This modules contains the SDNC naming applications.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.xacml-pdp.applications</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.xacml-pdp</groupId>
+            <artifactId>xacml-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/applications/naming/src/main/java/org/onap/policy/xacml/pdp/application/naming/NamingPdpApplication.java b/applications/naming/src/main/java/org/onap/policy/xacml/pdp/application/naming/NamingPdpApplication.java
new file mode 100644
index 00000000..d04fca6a
--- /dev/null
+++ b/applications/naming/src/main/java/org/onap/policy/xacml/pdp/application/naming/NamingPdpApplication.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.xacml.pdp.application.naming;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import org.onap.policy.common.endpoints.parameters.RestServerParameters;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
+import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator;
+import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException;
+import org.onap.policy.pdp.xacml.application.common.std.StdMatchableTranslator;
+import org.onap.policy.pdp.xacml.application.common.std.StdXacmlApplicationServiceProvider;
+
+public class NamingPdpApplication extends StdXacmlApplicationServiceProvider {
+
+    private static final ToscaPolicyTypeIdentifier supportedPolicy = new ToscaPolicyTypeIdentifier(
+            "onap.policies.Naming", "1.0.0");
+
+    private StdMatchableTranslator translator = new StdMatchableTranslator();
+
+    @Override
+    public String applicationName() {
+        return "naming";
+    }
+
+    @Override
+    public List<String> actionDecisionsSupported() {
+        return Arrays.asList("naming");
+    }
+
+    @Override
+    public void initialize(Path pathForData, RestServerParameters policyApiParameters)
+            throws XacmlApplicationException {
+        //
+        // Store our API parameters and path for translator so it
+        // can go get Policy Types
+        //
+        this.translator.setPathForData(pathForData);
+        this.translator.setApiRestParameters(policyApiParameters);
+        //
+        // Let our super class do its thing
+        //
+        super.initialize(pathForData, policyApiParameters);
+    }
+
+    @Override
+    public synchronized List<ToscaPolicyTypeIdentifier> supportedPolicyTypes() {
+        return Arrays.asList(supportedPolicy);
+    }
+
+    @Override
+    public boolean canSupportPolicyType(ToscaPolicyTypeIdentifier policyTypeId) {
+        return supportedPolicy.equals(policyTypeId);
+    }
+
+    @Override
+    protected ToscaPolicyTranslator getTranslator(String type) {
+        //
+        // Return translator
+        //
+        return translator;
+    }
+}
diff --git a/applications/naming/src/main/resources/META-INF/services/org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider b/applications/naming/src/main/resources/META-INF/services/org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider
new file mode 100644
index 00000000..9eb394e2
--- /dev/null
+++ b/applications/naming/src/main/resources/META-INF/services/org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider
@@ -0,0 +1 @@
+org.onap.policy.xacml.pdp.application.naming.NamingPdpApplication
\ No newline at end of file
diff --git a/applications/naming/src/test/java/org/onap/policy/xacml/pdp/application/naming/NamingPdpApplicationTest.java b/applications/naming/src/test/java/org/onap/policy/xacml/pdp/application/naming/NamingPdpApplicationTest.java
new file mode 100644
index 00000000..02884b63
--- /dev/null
+++ b/applications/naming/src/test/java/org/onap/policy/xacml/pdp/application/naming/NamingPdpApplicationTest.java
@@ -0,0 +1,246 @@
+/*-
+ * ============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.xacml.pdp.application.naming;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.att.research.xacml.api.Response;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.ServiceLoader;
+import org.apache.commons.lang3.tuple.Pair;
+import org.assertj.core.api.Condition;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.onap.policy.common.endpoints.parameters.RestServerParameters;
+import org.onap.policy.common.utils.coder.CoderException;
+import org.onap.policy.common.utils.coder.StandardCoder;
+import org.onap.policy.common.utils.resources.ResourceUtils;
+import org.onap.policy.common.utils.resources.TextFileUtils;
+import org.onap.policy.models.decisions.concepts.DecisionRequest;
+import org.onap.policy.models.decisions.concepts.DecisionResponse;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
+import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException;
+import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider;
+import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils;
+import org.onap.policy.pdp.xacml.xacmltest.TestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NamingPdpApplicationTest {
+    private static final Logger LOGGER = LoggerFactory.getLogger(NamingPdpApplicationTest.class);
+    private static Properties properties = new Properties();
+    private static File propertiesFile;
+    private static XacmlApplicationServiceProvider service;
+    private static StandardCoder gson = new StandardCoder();
+    private static DecisionRequest baseRequest;
+    private static RestServerParameters clientParams;
+
+    @ClassRule
+    public static final TemporaryFolder policyFolder = new TemporaryFolder();
+
+    /**
+     * Copies the xacml.properties and policies files into
+     * temporary folder and loads the service provider saving
+     * instance of provider off for other tests to use.
+     */
+    @BeforeClass
+    public static void setUp() throws Exception {
+        clientParams = mock(RestServerParameters.class);
+        when(clientParams.getHost()).thenReturn("localhost");
+        when(clientParams.getPort()).thenReturn(6969);
+        //
+        // Load Single Decision Request
+        //
+        baseRequest = gson.decode(
+                TextFileUtils
+                    .getTextFileAsString(
+                            "src/test/resources/decision.naming.input.json"),
+                    DecisionRequest.class);
+        //
+        // Setup our temporary folder
+        //
+        // TODO use lambda policyFolder::newFile
+        XacmlPolicyUtils.FileCreator myCreator = (String filename) -> policyFolder.newFile(filename);
+        propertiesFile = XacmlPolicyUtils.copyXacmlPropertiesContents("src/test/resources/xacml.properties",
+                properties, myCreator);
+        //
+        // Copy the test policy types into data area
+        //
+        String policy = "onap.policies.Naming";
+        String policyType = ResourceUtils.getResourceAsString("policytypes/" + policy + ".yaml");
+        LOGGER.info("Copying {}", policyType);
+        // TODO investigate UTF-8
+        Files.write(Paths.get(policyFolder.getRoot().getAbsolutePath(), policy + "-1.0.0.yaml"),
+                policyType.getBytes());
+        //
+        // Load service
+        //
+        ServiceLoader<XacmlApplicationServiceProvider> applicationLoader =
+                ServiceLoader.load(XacmlApplicationServiceProvider.class);
+        //
+        // Iterate through Xacml application services and find
+        // the optimization service. Save it for use throughout
+        // all the Junit tests.
+        //
+        StringBuilder strDump = new StringBuilder("Loaded applications:" + XacmlPolicyUtils.LINE_SEPARATOR);
+        Iterator<XacmlApplicationServiceProvider> iterator = applicationLoader.iterator();
+        while (iterator.hasNext()) {
+            XacmlApplicationServiceProvider application = iterator.next();
+            //
+            // Is it our service?
+            //
+            if (application instanceof NamingPdpApplication) {
+                //
+                // Should be the first and only one
+                //
+                assertThat(service).isNull();
+                service = application;
+            }
+            strDump.append(application.applicationName());
+            strDump.append(" supports ");
+            strDump.append(application.supportedPolicyTypes());
+            strDump.append(XacmlPolicyUtils.LINE_SEPARATOR);
+        }
+        LOGGER.debug("{}", strDump);
+        assertThat(service).isNotNull();
+        //
+        // Tell it to initialize based on the properties file
+        // we just built for it.
+        //
+        service.initialize(propertiesFile.toPath().getParent(), clientParams);
+    }
+
+    @Test
+    public void test01Basics() {
+        //
+        // Make sure there's an application name
+        //
+        assertThat(service.applicationName()).isNotEmpty();
+        //
+        // Decisions
+        //
+        assertThat(service.actionDecisionsSupported().size()).isEqualTo(1);
+        assertThat(service.actionDecisionsSupported()).contains("naming");
+        //
+        // Ensure it has the supported policy types and
+        // can support the correct policy types.
+        //
+        assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier(
+                "onap.policies.Naming", "1.0.0"))).isTrue();
+        assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier(
+                "onap.foobar", "1.0.0"))).isFalse();
+    }
+
+    @Test
+    public void test02NoPolicies() throws CoderException {
+        //
+        // Ask for a decision when there are no policies loaded
+        //
+        LOGGER.info("Request {}", gson.encode(baseRequest));
+        Pair<DecisionResponse, Response> decision = service.makeDecision(baseRequest, null);
+        LOGGER.info("Decision {}", decision.getKey());
+
+        assertThat(decision.getKey()).isNotNull();
+        assertThat(decision.getKey().getPolicies().size()).isEqualTo(0);
+    }
+
+    @Test
+    public void test03Naming() throws CoderException, FileNotFoundException, IOException,
+        XacmlApplicationException {
+        //
+        // Now load all the optimization policies
+        //
+        TestUtils.loadPolicies("policies/sdnc.policy.naming.input.tosca.yaml", service);
+        //
+        // Ask for a decision for available default policies
+        //
+        DecisionResponse response = makeDecision();
+
+        assertThat(response).isNotNull();
+        assertThat(response.getPolicies().size()).isEqualTo(1);
+        //
+        // Validate it
+        //
+        validateDecision(response, baseRequest);
+    }
+
+    private DecisionResponse makeDecision() {
+        Pair<DecisionResponse, Response> decision = service.makeDecision(baseRequest, null);
+        LOGGER.info("Request Resources {}", baseRequest.getResource());
+        LOGGER.info("Decision {}", decision.getKey());
+        for (Entry<String, Object> entrySet : decision.getKey().getPolicies().entrySet()) {
+            LOGGER.info("Policy {}", entrySet.getKey());
+        }
+        return decision.getKey();
+    }
+
+    @SuppressWarnings("unchecked")
+    private void validateDecision(DecisionResponse decision, DecisionRequest request) {
+        for (Entry<String, Object> entrySet : decision.getPolicies().entrySet()) {
+            LOGGER.info("Decision Returned Policy {}", entrySet.getKey());
+            assertThat(entrySet.getValue()).isInstanceOf(Map.class);
+            Map<String, Object> policyContents = (Map<String, Object>) entrySet.getValue();
+            assertThat(policyContents.containsKey("properties")).isTrue();
+            assertThat(policyContents.get("properties")).isInstanceOf(Map.class);
+            Map<String, Object> policyProperties = (Map<String, Object>) policyContents.get("properties");
+
+            validateMatchable((Collection<String>) request.getResource().get("nfRole"),
+                    (Collection<String>) policyProperties.get("nfRole"));
+
+            validateMatchable((Collection<String>) request.getResource().get("naming-type"),
+                    (Collection<String>) policyProperties.get("naming-type"));
+
+            validateMatchable((Collection<String>) request.getResource().get("property-name"),
+                    (Collection<String>) policyProperties.get("property-name"));
+        }
+    }
+
+    private void validateMatchable(Collection<String> requestList, Collection<String> policyProperties) {
+        LOGGER.info("Validating matchable: {} with {}", policyProperties, requestList);
+        //
+        // Null or empty implies '*' - that is any value is acceptable
+        // for this policy.
+        //
+        if (policyProperties == null || policyProperties.isEmpty()) {
+            return;
+        }
+        Condition<String> condition = new Condition<>(
+                requestList::contains,
+                "Request list is contained");
+        assertThat(policyProperties).haveAtLeast(1, condition);
+
+    }
+}
diff --git a/applications/naming/src/test/resources/decision.naming.input.json b/applications/naming/src/test/resources/decision.naming.input.json
new file mode 100644
index 00000000..508daba0
--- /dev/null
+++ b/applications/naming/src/test/resources/decision.naming.input.json
@@ -0,0 +1,12 @@
+{
+  "ONAPName": "SDNC",
+  "ONAPComponent": "SNDC-component",
+  "ONAPInstance": "SDNC-component-instance",
+  "requestId": "unique-request-sdnc-1",
+  "action": "naming",
+  "resource": {
+      "nfRole": [],
+      "naming-type": [],
+      "property-name": []
+  }
+}
\ No newline at end of file
diff --git a/applications/naming/src/test/resources/xacml.properties b/applications/naming/src/test/resources/xacml.properties
new file mode 100644
index 00000000..5ea247cf
--- /dev/null
+++ b/applications/naming/src/test/resources/xacml.properties
@@ -0,0 +1,31 @@
+#
+# Properties that the embedded PDP engine uses to configure and load
+#
+# Standard API Factories
+#
+xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
+xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
+xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
+xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory
+xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFactory
+#
+# AT&T PDP Implementation Factories
+#
+xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
+xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
+xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory
+#
+# ONAP PDP Implementation Factories
+#
+xacml.att.policyFinderFactory=org.onap.policy.pdp.xacml.application.common.OnapPolicyFinderFactory
+
+#
+# Use a root combining algorithm
+#
+xacml.att.policyFinderFactory.combineRootPolicies=urn:com:att:xacml:3.0:policy-combining-algorithm:combined-permit-overrides
+
+#
+# Policies to load
+#
+xacml.rootPolicies=
+xacml.referencedPolicies=
\ No newline at end of file
diff --git a/applications/pom.xml b/applications/pom.xml
index 731c52de..a12875bd 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -36,6 +36,7 @@
     <module>monitoring</module>
     <module>guard</module>
     <module>optimization</module>
+    <module>naming</module>
   </modules>
 
 
diff --git a/main/pom.xml b/main/pom.xml
index f8508335..98c12e8a 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -83,6 +83,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.onap.policy.xacml-pdp.applications</groupId>
+            <artifactId>naming</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.onap.policy.models</groupId>
             <artifactId>policy-models-pdp</artifactId>
             <version>${policy.models.version}</version>
diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/apps/naming/xacml.properties b/packages/policy-xacmlpdp-tarball/src/main/resources/apps/naming/xacml.properties
new file mode 100644
index 00000000..5ea247cf
--- /dev/null
+++ b/packages/policy-xacmlpdp-tarball/src/main/resources/apps/naming/xacml.properties
@@ -0,0 +1,31 @@
+#
+# Properties that the embedded PDP engine uses to configure and load
+#
+# Standard API Factories
+#
+xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
+xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
+xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
+xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory
+xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFactory
+#
+# AT&T PDP Implementation Factories
+#
+xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
+xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
+xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory
+#
+# ONAP PDP Implementation Factories
+#
+xacml.att.policyFinderFactory=org.onap.policy.pdp.xacml.application.common.OnapPolicyFinderFactory
+
+#
+# Use a root combining algorithm
+#
+xacml.att.policyFinderFactory.combineRootPolicies=urn:com:att:xacml:3.0:policy-combining-algorithm:combined-permit-overrides
+
+#
+# Policies to load
+#
+xacml.rootPolicies=
+xacml.referencedPolicies=
\ No newline at end of file