From: mark.j.leonard <mark.j.leonard@gmail.com>
Date: Tue, 26 Mar 2019 12:40:32 +0000 (+0000)
Subject: Add Widget UUIDs to the TOSCA mappings JSON
X-Git-Tag: 4.0.0-ONAP~263^2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=9608688a0400dfe403c9a86d8e5cef917aa618bf

Add Widget UUIDs to the TOSCA mappings JSON

The artifact-generator.properties file will be removed once this update
has been deployed and tested. There is a dependency on the Babel Java
code so this approach avoids any timing issues with the commits.

Change-Id: Icd9c5e57b673252409d73cfb45e8e563d40a721a
Issue-ID: AAI-2284
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
---

diff --git a/kubernetes/aai/charts/aai-babel/resources/config/tosca-mappings.json b/kubernetes/aai/charts/aai-babel/resources/config/tosca-mappings.json
index c67b3e2f97..5be609730d 100644
--- a/kubernetes/aai/charts/aai-babel/resources/config/tosca-mappings.json
+++ b/kubernetes/aai/charts/aai-babel/resources/config/tosca-mappings.json
@@ -8,92 +8,128 @@
 		{
 			"type": "SERVICE",
 			"name": "service-instance",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "46b92144-923a-4d20-b85a-3cbd847668a9",
+			"modelInvariantId": "82194af1-3c2c-485a-8f44-420e22a9eaa4"
 		},
 		{
 			"type": "VF",
 			"name": "generic-vnf",
-			"deleteFlag": false
+			"deleteFlag": false,
+			"modelVersionId": "93a6166f-b3d5-4f06-b4ba-aed48d009ad9",
+			"modelInvariantId": "acc6edd8-a8d4-4b93-afaa-0994068be14c"
 		},
 		{
 			"type": "VFC",
 			"name": "vnfc",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "5761e0a7-c6df-4d8a-9ebd-b8f445054dec",
+			"modelInvariantId": "96129eb9-f0de-4e05-8af2-73146473f766"
 		},
 		{
 			"type": "VSERVER",
 			"name": "vserver",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "8ecb2c5d-7176-4317-a255-26274edfdd53",
+			"modelInvariantId": "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
 		},
 		{
 			"type": "VOLUME",
 			"name": "volume",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "0fbe2e8f-4d91-4415-a772-88387049b38d",
+			"modelInvariantId": "ddd739b4-2b25-46c4-affc-41a32af5cc42"
 		},
 		{
 			"type": "FLAVOR",
 			"name": "flavor",
-			"deleteFlag": false
+			"deleteFlag": false,
+			"modelVersionId": "36200fb5-f251-4f5d-a520-7c5ad5c2cd4b",
+			"modelInvariantId": "bace8d1c-a261-4041-9e37-823117415d0f"
 		},
 		{
 			"type": "TENANT",
 			"name": "tenant",
-			"deleteFlag": false
+			"deleteFlag": false,
+			"modelVersionId": "abcc54bc-bb74-49dc-9043-7f7171707545",
+			"modelInvariantId": "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
 		},
 		{
 			"type": "VOLUME_GROUP",
 			"name": "volume-group",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "99d44c90-1f61-4418-b9a6-56586bf38c79",
+			"modelInvariantId": "fcec1b02-b2d0-4834-aef8-d71be04717dd"
 		},
 		{
 			"type": "LINT",
 			"name": "l-interface",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "a32613fd-18b9-459e-aab8-fffb3912966a",
+			"modelInvariantId": "cea0a982-8d55-4093-921e-418fbccf7060"
 		},
 		{
 			"type": "L3_NET",
 			"name": "l3-network",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "9111f20f-e680-4001-b83f-19a2fc23bfc1",
+			"modelInvariantId": "3d560d81-57d0-438b-a2a1-5334dba0651a"
 		},
 		{
 			"type": "VFMODULE",
 			"name": "vf-module",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "c00563ae-812b-4e62-8330-7c4d0f47088a",
+			"modelInvariantId": "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
 		},
 		{
 			"type": "IMAGE",
 			"name": "image",
-			"deleteFlag": false
+			"deleteFlag": false,
+			"modelVersionId": "f6a038c2-820c-42ba-8c2b-375e24e8f932",
+			"modelInvariantId": "3f4c7204-739b-4bbb-87a7-8a6856439c90"
 		},
 		{
 			"type": "OAM_NETWORK",
 			"name": "oam-network",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "f4fb34f3-fd6e-4a8f-a3fb-4ab61a343b79",
+			"modelInvariantId": "2851cf01-9c40-4064-87d4-6184a6fcff35"
 		},
 		{
 			"type": "ALLOTTED_RESOURCE",
 			"name": "allotted-resource",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "7ad0915f-25c0-4a70-b9bc-185a75f87564",
+			"modelInvariantId": "f6d6a23d-a1a9-48ff-8419-b6530da2d381"
 		},
 		{
 			"type": "TUNNEL_XCONNECT",
 			"name": "tunnel-xconnect",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "e7cb4ca8-e1a5-4487-a716-4ae0bcd8aef5",
+			"modelInvariantId": "50b9e2fa-005c-4bbe-b651-3251dece4cd8"
 		},
 		{
 			"type": "CONFIGURATION",
 			"name": "configuration",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "5a175add-57e4-4a5d-8b02-c36f1d69c52b",
+			"modelInvariantId": "166c050d-f69d-4305-943e-0bc58c3a26cf"
 		},
 		{
 			"type": "CR",
 			"name": "cr",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "3f908abc-3a15-40d0-b674-2a639e52884d",
+			"modelInvariantId": "8bac3599-9a1c-4b7f-80e5-c1838f744c23"
 		},
 		{
 			"type": "INSTANCE_GROUP",
 			"name": "instance-group",
-			"deleteFlag": true
+			"deleteFlag": true,
+			"modelVersionId": "8e6ee9dc-9017-444a-83b3-219edb018128",
+			"modelInvariantId": "3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd"
 		}
 	],
 	"widgetMappings": [