From 8a7d9a0d7782b9339810b02208620bdd2f0a12b2 Mon Sep 17 00:00:00 2001
From: "mark.j.leonard" <mark.j.leonard@gmail.com>
Date: Tue, 26 Mar 2019 10:51:07 +0000
Subject: Allow UUID definitions in the mappings JSON

Add support for reading the Widget invariant and version UUIDs from the
TOSCA mappings JSON. In this commit the artifact-generator.properties is
also read and used to provide default values. This step prevents any
existing deployments (e.g. automated test integration) from failing.
The redundant properties file will be deprecated in a future commit,
only when the JSON configuration has been updated.

Also remove two unused Java files to help with coverage stats.

Change-Id: Idc82e28092a2b028214225c7974db411c9f8a173
Issue-ID: AAI-2284
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
---
 src/test/resources/tosca-mappings.json | 72 +++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 18 deletions(-)

(limited to 'src/test/resources/tosca-mappings.json')

diff --git a/src/test/resources/tosca-mappings.json b/src/test/resources/tosca-mappings.json
index c67b3e2..4d630e2 100644
--- a/src/test/resources/tosca-mappings.json
+++ b/src/test/resources/tosca-mappings.json
@@ -8,92 +8,128 @@
 		{
 			"type": "SERVICE",
 			"name": "service-instance",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "service-instance-invariant-id",
+            "modelVersionId": "service-instance-version-id"
 		},
 		{
 			"type": "VF",
 			"name": "generic-vnf",
-			"deleteFlag": false
+			"deleteFlag": false,
+            "modelInvariantId": "generic-vnf-invariant-id",
+            "modelVersionId": "generic-vnf-version-id"
 		},
 		{
 			"type": "VFC",
 			"name": "vnfc",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "vnfc-invariant-id",
+            "modelVersionId": "vnfc-version-id"
 		},
 		{
 			"type": "VSERVER",
 			"name": "vserver",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "vserver-invariant-id",
+            "modelVersionId": "vserver-version-id"
 		},
 		{
 			"type": "VOLUME",
 			"name": "volume",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "volume-invariant-id",
+            "modelVersionId": "volume-version-id"
 		},
 		{
 			"type": "FLAVOR",
 			"name": "flavor",
-			"deleteFlag": false
+			"deleteFlag": false,
+            "modelInvariantId": "flavor-invariant-id",
+            "modelVersionId": "flavor-version-id"
 		},
 		{
 			"type": "TENANT",
 			"name": "tenant",
-			"deleteFlag": false
+			"deleteFlag": false,
+            "modelInvariantId": "tenant-invariant-id",
+            "modelVersionId": "tenant-version-id"
 		},
 		{
 			"type": "VOLUME_GROUP",
 			"name": "volume-group",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "volume-group-invariant-id",
+            "modelVersionId": "volume-group-version-id"
 		},
 		{
 			"type": "LINT",
 			"name": "l-interface",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "l-interface-invariant-id",
+            "modelVersionId": "l-interface-version-id"
 		},
 		{
 			"type": "L3_NET",
 			"name": "l3-network",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "l3-network-invariant-id",
+            "modelVersionId": "l3-network-version-id"
 		},
 		{
 			"type": "VFMODULE",
 			"name": "vf-module",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "vf-module-invariant-id",
+            "modelVersionId": "vf-module-version-id"
 		},
 		{
 			"type": "IMAGE",
 			"name": "image",
-			"deleteFlag": false
+			"deleteFlag": false,
+            "modelInvariantId": "image-invariant-id",
+            "modelVersionId": "image-version-id"
 		},
 		{
 			"type": "OAM_NETWORK",
 			"name": "oam-network",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "oam-network-invariant-id",
+            "modelVersionId": "oam-network-version-id"
 		},
 		{
 			"type": "ALLOTTED_RESOURCE",
 			"name": "allotted-resource",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "allotted-resource-invariant-id",
+			"modelVersionId": "allotted-resource-version-id"
 		},
 		{
 			"type": "TUNNEL_XCONNECT",
 			"name": "tunnel-xconnect",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "tunnel-xconnect-invariant-id",
+            "modelVersionId": "tunnel-xconnect-version-id"
 		},
 		{
 			"type": "CONFIGURATION",
 			"name": "configuration",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "configuration-invariant-id",
+            "modelVersionId": "configuration-version-id"
 		},
 		{
 			"type": "CR",
 			"name": "cr",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "collection-resource-invariant-id",
+            "modelVersionId": "collection-resource-version-id"
 		},
 		{
 			"type": "INSTANCE_GROUP",
 			"name": "instance-group",
-			"deleteFlag": true
+			"deleteFlag": true,
+            "modelInvariantId": "instance-group-invariant-id",
+            "modelVersionId": "instance-group-version-id"
 		}
 	],
 	"widgetMappings": [
-- 
cgit 1.2.3-korg