3 files changed, 53 insertions, 21 deletions
diff --git a/kubernetes/aai/charts/aai-babel/Chart.yaml b/kubernetes/aai/charts/aai-babel/Chart.yaml
index d0311c189b..fe1a4ce241 100644
--- a/kubernetes/aai/charts/aai-babel/Chart.yaml
+++ b/kubernetes/aai/charts/aai-babel/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Babel microservice
 name: aai-babel
-version: 3.0.0
+version: 4.0.0
diff --git a/kubernetes/aai/charts/aai-babel/requirements.yaml b/kubernetes/aai/charts/aai-babel/requirements.yaml
index 6566196ceb..78e822edf8 100644
--- a/kubernetes/aai/charts/aai-babel/requirements.yaml
+++ b/kubernetes/aai/charts/aai-babel/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~3.0.0
+    version: ~4.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
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 9c3d0b4b27..0d306ea923 100644
--- a/kubernetes/aai/charts/aai-babel/resources/config/tosca-mappings.json
+++ b/kubernetes/aai/charts/aai-babel/resources/config/tosca-mappings.json
@@ -1,21 +1,53 @@
 {
-  "instanceGroupTypes": [
-    "org.openecomp.groups.NetworkCollection",
-    "org.openecomp.groups.VfcInstanceGroup",
-    "org.openecomp.groups.ResourceInstanceGroup"
-  ],
-  "toscaToWidgetMappings": {
-    "org.openecomp.resource.vf.allottedResource": "AllotedResource",
-    "org.openecomp.resource.vfc.AllottedResource": "ProvidingService",
-    "org.openecomp.resource.vfc": "VServerWidget",
-    "org.openecomp.resource.cp": "LIntfWidget",
-    "org.openecomp.cp": "LIntfWidget",
-    "org.openecomp.resource.vl": "L3Network",
-    "org.openecomp.resource.vf": "VirtualFunction",
-    "org.openecomp.groups.vfmodule": "VfModule",
-    "org.openecomp.groups.VfModule": "VfModule",
-    "org.openecomp.resource.vfc.nodes.heat.cinder": "VolumeWidget",
-    "org.openecomp.nodes.PortMirroringConfiguration": "Configuration",
-    "org.openecomp.resource.cr.Kk1806Cr1": "CR"
-  }
+	"instanceGroupTypes": [
+		"org.openecomp.groups.NetworkCollection",
+		"org.openecomp.groups.VfcInstanceGroup",
+		"org.openecomp.groups.ResourceInstanceGroup"
+	],
+	"widgetMappings": [
+		{
+			"prefix": "org.openecomp.resource.vfc",
+			"type": "widget",
+			"widget": "VSERVER",
+			"deleteFlag": true
+		},
+		{
+			"prefix": "org.openecomp.resource.cp",
+			"type": "widget",
+			"widget": "LINT",
+			"deleteFlag": true
+		},
+		{
+			"prefix": "org.openecomp.cp",
+			"type": "widget",
+			"widget": "LINT",
+			"deleteFlag": true
+		},
+		{
+			"prefix": "org.openecomp.resource.vl",
+			"widget": "L3_NET",
+			"deleteFlag": false
+		},
+		{
+			"prefix": "org.openecomp.resource.vf",
+			"widget": "VF",
+			"deleteFlag": true
+		},
+		{
+			"prefix": "org.openecomp.groups.vfmodule",
+			"widget": "VFMODULE",
+			"deleteFlag": true
+		},
+		{
+			"prefix": "org.openecomp.groups.VfModule",
+			"widget": "VFMODULE",
+			"deleteFlag": true
+		},
+		{
+			"prefix": "org.openecomp.resource.vfc.nodes.heat.cinder",
+			"type": "widget",
+			"widget": "VOLUME",
+			"deleteFlag": true
+		}
+	]
 }