From 7ae629ce867ff4ca5bf038560c7563baa2c6d501 Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Tue, 31 Jul 2018 16:57:03 +0300
Subject: [PATCH] fix yaml alignment issue.

and remove invalide char from normative configuration type

Change-Id: I18ce6b49d310fb46ecde85d47d9eb3bd704bbb5b
Issue-ID: SDC-1577
Signed-off-by: Michael Lando <ml636r@att.com>
---
 .../tosca/heat-types/configuration/configuration.yml   |   6 +++---
 .../tosca/heat-types/configuration/configuration.zip   | Bin 384 -> 405 bytes
 .../default/FE-plugins-configuration.yaml.erb          |  17 ++++++++---------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml
index 43fceaf535..0d220dc1eb 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml
@@ -5,14 +5,14 @@ node_types:
         properties:
           type:
             type: string
-            description: The type of the node, the configuration will be defined for it. Ex.”SBC”
+            description: The type of the node, the configuration will be defined for it. Ex. SBC
             required: false
           role:
             type: string
-            description: The role of the node, the configuration will be defined for it. Ex. “Active”, “Standby”
+            description: The role of the node, the configuration will be defined for it. Ex. Active, Standby
             required: false
           function:
             type: string
-            description: The function of the node, the configuration will be defined for it. Ex. “NAT Traversal”
+            description: The function of the node, the configuration will be defined for it. Ex. NAT Traversal
             required: false
 
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip
index cb0d1912212b1a195b2ef395cac357c722c5cfcb..e63971c0ed68048d7c678d97f20a56809ab5ca3d 100644
GIT binary patch
literal 405
zcmWIWW@Zs#U|`^2c-{8jCn1ef@hy<IiHU(h5J)HI=cQ$)mlh?KWaj7TRp#a_4chB>
z*g)XkXOZs=8d}-ggEksncrz_~{$bC)^K<4p+>^6zxuD0f)qL*Xzo&|xrEJ;sLL)$p
z&(l|9rB3yaHX+`Ni)Vd(aCPymm9fG%7M&_SvL$~3kN5qeBMoisH^NM|y7Tq@3M~1m
zv!zsr%Qs`Hu-vtV&=05Pm`6={q&{<6OK#SavVVIUr?fiNvx>MYi%c(gajzhe$@)a<
z`bPfKX?oFz*em(dTb>$TXi8>0rE62at)R*(j+J9yze>jU2V4Aa#3;PU&x_nrzSU-i
zPjKMeO?=;M{%_tW-MsSJ_HF+z-oO0k=><piUH@#~{(p0~hB3gKk;$F`SLmn!!v_Qu
zz$BKi;(|&sGDt8ONYuz*)40OO`F+a8Zz@+9(~HEoJ_6|gZ&o&tenucn2GTN&ARYky
CD4#k2

literal 384
zcmWIWW@h1HU|`^2Flhen6JMEf@DGr8nu&oy5J)HI=cQ$)mlh?KWaj7TRp#a_4Lay|
z*nnqm_$&J#%*(Q3s-=a)`PO{b@SY>2+1ovt@0aXr_Q_M2w8b61p8T}=es!6UriP}8
z)a%?WPnvfqv`@JrkgjoKUAczaP0K>{Z%OfD^Gv!dzDc~=)F5&s*VVQv<jU93Hs?~6
z{2c2IXV!Sf^Y!NFuV_ttCDxnzs8gfv``0-VmbdgL_Mh0a`cP1lz|CJ}y((cxx6PMz
z_}o*hJ)v>NC!JlhjZ3pd<JJ}zxXs9KlHxJE5pnQvwCUV;{g<PfKBjKy*~O+Ddmwtk
z$=nUImYYYkzIHrX@*<P{dhnFE`N#KLn>UBs&wD%noxP-4?uUwu1&K55mz3<^soz~5
l;LXS+!hk!lfZ+uM3JPEfGw1@mS=m5Rj6i4)q_r7AJOJIym4yHR

diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
index 90f20192af..0f9719f4ad 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
@@ -8,15 +8,14 @@ pluginsList:
             displayName: "Monitoring"
             displayContext: ["SERVICE"]
             displayRoles: ["DESIGNER"]
-    - pluginId: DCAE-DS
-      pluginDiscoveryUrl: <%= @dcae_dt_discovery_url %>
-      pluginSourceUrl: <%= @dcae_dt_source_url %>
-      pluginStateUrl: "dcae-ds"
-      pluginDisplayOptions:
-        tab:
-            displayName: "DCAE-DS"
-            displayRoles: ["DESIGNER"]
-
+   - pluginId: DCAE-DS
+     pluginDiscoveryUrl: <%= @dcae_dt_discovery_url %>
+     pluginSourceUrl: <%= @dcae_dt_source_url %>
+     pluginStateUrl: "dcae-ds"
+     pluginDisplayOptions:
+       tab:
+           displayName: "DCAE-DS"
+           displayRoles: ["DESIGNER"]
    - pluginId: WORKFLOW
      pluginDiscoveryUrl: <%= @workflow_discovery_url %>
      pluginSourceUrl: <%= @workflow_source_url %>
-- 
2.16.6