[Babel] Add type mapping JSON configuration

Remove the deprecated filter-types.properties

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

diff --git a/kubernetes/aai/charts/aai-babel/resources/config/filter-types.properties b/kubernetes/aai/charts/aai-babel/resources/config/filter-types.properties
deleted file mode 100644 (file)
index fcf139f..0000000
--- a/kubernetes/aai/charts/aai-babel/resources/config/filter-types.properties
+++ /dev/null
@@ -1 +0,0 @@
-AAI.instance-group-types=org.openecomp.groups.NetworkCollection,org.openecomp.groups.VfcInstanceGroup

diff --git a/kubernetes/aai/charts/aai-babel/resources/config/tosca-mappings.json b/kubernetes/aai/charts/aai-babel/resources/config/tosca-mappings.json
new file mode 100644 (file)
index 0000000..9c3d0b4
--- /dev/null
+++ b/kubernetes/aai/charts/aai-babel/resources/config/tosca-mappings.json
@@ -0,0 +1,21 @@
+{
+  "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"
+  }
+}

diff --git a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
index 5ac0792..4f0e9dd 100644 (file)
--- a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
@@ -84,9 +84,9 @@ spec:
           - mountPath: /opt/app/babel/config/artifact-generator.properties
             name: {{ include "common.fullname" . }}-config
             subPath: artifact-generator.properties
-          - mountPath: /opt/app/babel/config/filter-types.properties
+          - mountPath: /opt/app/babel/config/tosca-mappings.json
             name: {{ include "common.fullname" . }}-config
-            subPath: filter-types.properties
+            subPath: tosca-mappings.json
           - mountPath: /opt/app/babel/config/babel-auth.properties
             name: {{ include "common.fullname" . }}-config
             subPath: babel-auth.properties
@@ -204,8 +204,8 @@ spec:
             items:
             - key: artifact-generator.properties
               path: artifact-generator.properties
-            - key: filter-types.properties
-              path: filter-types.properties
+            - key: tosca-mappings.json
+              path: tosca-mappings.json
             - key: babel-auth.properties
               path: babel-auth.properties
             - key: logback.xml