From f6357019dc5514f64c4830a3ae39964d224f587b Mon Sep 17 00:00:00 2001
From: Adrian Moreno <adrian@morenomartinez.com>
Date: Wed, 2 Dec 2015 16:18:21 +0100
Subject: [PATCH] Fixed bug 1522056. Password field is now type password. All
 other fields enforce some input. Updated authors information.

Change-Id: I682af423a288a0c5e22588d6fe21c4927b2771a0
---
 environment_config.yaml | 51 +++++++++++++++++++++++++++++------------
 metadata.yaml           |  6 ++---
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/environment_config.yaml b/environment_config.yaml
index 2d8618d..a4634e2 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -1,43 +1,64 @@
 attributes:
   scaleio_Admin:
     value: ''
-    label: 'UserName'
-    description: 'ScaleIO Admin User Name'
+    label: 'Admin username'
+    description: 'Type ScaleIO Admin username'
     weight: 5
     type: "text"
+    regex:
+      source: '^[\S]{4,}$'
+      error: "You must provide a username with at least 4 characters"
   scaleio_Password:
     value: ''
-    label: 'Password'
-    description: 'ScaleIO Admin Password'
+    label: 'Admin Password'
+    description: 'Type ScaleIO Admin password'
     weight: 10
-    type: "text"
+    type: "password"
+    regex:
+      source: '^[\S]{4,}$'
+      error: "You must provide a password with at least 4 characters"
   scaleio_GW:
     value: ''
-    label: 'ScaleIO GW IP'
-    description: 'ScaleIO Gateway IP'
+    label: 'Gateway IP'
+    description: 'Type the ScaleIO Gateway IP or hostname'
     weight: 15
     type: "text"
+    regex:
+      source: '\S'
+      error: "Gateway IP cannot be empty"
   scaleio_mdm1:
     value: ''
-    label: 'ScaleIO Primary IP'
-    description: 'ScaleIO Primary MDM IP'
+    label: 'Primary MDM IP'
+    description: 'Type the primary MDM IP or hostname'
     weight: 16
     type: "text"
+    regex:
+      source: '\S'
+      error: "Primary MDM IP cannot be empty"
   scaleio_mdm2:
     value: ''
-    label: 'ScaleIO Secondary IP'
-    description: 'ScaleIO Secondary MDM IP'
+    label: 'Secondary MDM IP'
+    description: 'Type the secondary MDM IP or hostname'
     weight: 17
     type: "text"
+    regex:
+      source: '\S'
+      error: "Secondary MDM IP cannot be empty"
   protection_domain:
     value: ''
-    label: 'ScaleIO protection domain'
-    description: 'Protection domain for ScaleIO'
+    label: 'Protection Domain'
+    description: 'Type the Protection Domain you want to use for OpenStack'
     weight: 35
     type: "text"
+    regex:
+      source: '\S'
+      error: "Protection Domain cannot be empty"
   storage_pool_1:
     value: ''
-    label: 'ScaleIO storage pool 1'
-    description: 'First storage pool for ScaleIO'
+    label: 'Storage Pool'
+    description: 'Type the Storage Pool you want to use for OpenStack'
     weight: 45
     type: "text"
+    regex:
+      source: '\S'
+      error: "Storage Pool cannot be empty"
diff --git a/metadata.yaml b/metadata.yaml
index 116ae9c..768feb4 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,17 +1,17 @@
 # Plugin name
 name: scaleio-cinder
 # Human-readable name for your plugin
-title: Fuel plugin for ScaleIO
+title: ScaleIO Cinder plugin
 # Plugin version
 version: '1.0.0'
 # Description
-description: Enable ScaleIO as a storage backend
+description: Enable EMC ScaleIO as the block storage backend
 # Required fuel version
 fuel_version: ['6.1']
 # Specify license of your plugin
 licenses: ['Apache License Version 2.0']
 # Specify author or company name
-authors: ['EMC Code']
+authors: ['Magdy Salem, EMC', 'Adrian Moreno Martinez, EMC']
 # A link to the plugin's page
 homepage: 'https://github.com/stackforge/fuel-scaleio-cinder'
 # Specify a group which your plugin implements, possible options: