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>

2 files changed, 74 insertions, 26 deletions

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