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>

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 43fceaf..0d220dc 100644 (file)
--- 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.\94SBC\94
+            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. \93Active\94, \93Standby\94
+            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. \93NAT Traversal\94
+            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 cb0d191..e63971c 100644 (file)
Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip differ

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 90f2019..0f9719f 100644 (file)
--- 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 %>