3 files changed, 22 insertions, 7 deletions
diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml
index 5242652188..eb26c8a34f 100644
--- a/catalog-be/src/main/resources/config/configuration.yaml
+++ b/catalog-be/src/main/resources/config/configuration.yaml
@@ -133,6 +133,7 @@ artifactTypes:
    - SNMP_POLL
    - SNMP_TRAP
    - GUIDE
+   - PLAN
 
 licenseTypes:
    - User
@@ -322,6 +323,11 @@ serviceDeploymentArtifacts:
             - xml 
     OTHER:
         acceptedTypes:
+        
+#PLAN
+    PLAN:
+        acceptedTypes:
+            - xml
 
 resourceDeploymentArtifacts:
     HEAT:
@@ -439,6 +445,11 @@ resourceDeploymentArtifacts:
     SNMP_TRAP:
         acceptedTypes:
         validForResourceTypes: *allResourceTypes
+        
+#PLAN
+    PLAN:
+        acceptedTypes:
+            - xml
 
 resourceInstanceDeploymentArtifacts:
     HEAT_ENV:
@@ -476,6 +487,11 @@ resourceInstanceDeploymentArtifacts:
     SNMP_TRAP:
         acceptedTypes:
         validForResourceTypes: *allResourceTypes
+        
+#PLAN
+    PLAN:
+        acceptedTypes:
+            - xml
 
 resourceInformationalArtifacts:
     CHEF:
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml
index eb6dfae372..68b87fd3c2 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml
@@ -5,11 +5,11 @@ description: overlay L3 vpn type definitions
 # overlay tunnel type definitions
 # *****************************************************************************
 
-metadata:
-    id: : overlayTunnelDefinition
-    version: 0.1
-    vendor: ONAP
-    template_author: ONAP
+#metadata:
+#    id: : overlayTunnelDefinition
+#    version: 0.1
+#    vendor: ONAP
+#    template_author: ONAP
 
 # *****************************************************************************
 # node types
@@ -23,8 +23,7 @@ node_types:
 
     org.openecomp.resource.vl.overlaytunnel:
         derived_from: tosca.nodes.Root
-        description: >-
-            This entity represents abstract overlay tunnel end point.
+        description: This entity represents abstract overlay tunnel end point.
         properties:
             id:
                 type: string
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip
index 99ddf491eb..55a836ff4c 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip