From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Fri, 9 Jun 2017 03:19:04 +0300
Subject: [SDC-29] catalog 1707 rebase commit.

Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1
Signed-off-by: Michael Lando <ml636r@att.com>
---
 .../import/tosca/categories/categoryTypes.yml      |  33 +++++++++++++++++++--
 .../import/tosca/categories/categoryTypes.zip      | Bin 848 -> 1061 bytes
 2 files changed, 30 insertions(+), 3 deletions(-)

(limited to 'catalog-be/src/main/resources/import/tosca/categories')

diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
index 9ddce45e4e..8914207b0f 100644
--- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
@@ -28,8 +28,8 @@ resources:
           name: "LAN Connectors"
           icons: ['network','connector','port']
       Infrastructure:
-                name: "Infrastructure"
-                icons: ['ucpe']
+          name: "Infrastructure"
+          icons: ['ucpe']
   NetworkLayer4:
     name: "Network L4+"
     subcategories: 
@@ -113,4 +113,31 @@ resources:
           icons: ['dcae_database']
       Policy:
           name: "Policy"
-          icons: ['dcae_policy']
\ No newline at end of file
+          icons: ['dcae_policy']
+  Template:
+    name: "Template"
+    subcategories:
+      MonitoringTemplate:
+          name: "Monitoring Template"
+          icons: ['monitoring_template']
+  AllottedResource:
+    name: "Allotted Resource"
+    subcategories:
+      AllottedResource:
+          name: "Allotted Resource"
+          icons: ['allotted_resource']
+      TunnelXConnect:
+          name: "Tunnel XConnect"
+          icons: ['tunnel_x_connect'] 
+      IpMuxDemux:
+          name: "IP Mux Demux"
+          icons: ['ip_mux_demux'] 
+      ServiceAdmin:
+          name: "Service Admin"
+          icons: ['service_admin']  
+      ContrailRoute:
+          name: "Contrail Route"
+          icons: ['contrail_route']          
+      SecurityZone:
+          name: "Security Zone"
+          icons: ['security_zone']          
\ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip
index c04a2faefc..7a0e6bcad7 100644
Binary files a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip and b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip differ
-- 
cgit 1.2.3-korg