From 45a9093b9129320a10a4e61d0b4488bccdbb4e58 Mon Sep 17 00:00:00 2001
From: Lei Lei <Lei.Lei1@huawei.com>
Date: Fri, 3 Apr 2015 16:42:50 -0700
Subject: [PATCH] Modify config for ui metadata

Change-Id: Ib05acc1a57d96ecd6421b2b3dda01925a23919b8
---
 compass/db/api/metadata_holder.py |  2 +-
 conf/os_mapping/os_mapping.conf   | 16 ++++++++--------
 conf/os_metadata/general.conf     |  2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/compass/db/api/metadata_holder.py b/compass/db/api/metadata_holder.py
index 652772a9..b2195f25 100644
--- a/compass/db/api/metadata_holder.py
+++ b/compass/db/api/metadata_holder.py
@@ -199,7 +199,7 @@ def _get_data(metadata, config, result_data):
                     data_dict[key] = option_list
                 else:
                     if isinstance(metadata['_self'][item], bool):
-                        data_dict[item] = str(metadata['_self'][item])
+                        data_dict[item] = str(metadata['_self'][item]).lower()
                     else:
                         data_dict[item] = metadata['_self'][item]
         else:
diff --git a/conf/os_mapping/os_mapping.conf b/conf/os_mapping/os_mapping.conf
index d08cb387..0aa56ffe 100644
--- a/conf/os_mapping/os_mapping.conf
+++ b/conf/os_mapping/os_mapping.conf
@@ -4,7 +4,7 @@ OS_CONFIG_MAPPING = {
         "server_credentials":{
             "name": "sever_credentials",
             "title": "Server Credentials",
-            "order": 1,
+            "order": 2,
             "data": {
                 "username": {
                     "placeholder": "Username",
@@ -19,16 +19,16 @@ OS_CONFIG_MAPPING = {
                     "display_name": "Password",
                     "order": 2,
                     "mapped_key": [
-                        "name", "is_required", "display_type", "default_value"
+                        "name", "is_required", "display_type"
                     ]
                 },
                 "confirm_password": {
                     "placeholder": "Confirm Password",
                     "name": "confirmPassword",
-                    "placeholder": "Confirm Password",
+                    "display_name": "Confirm Password",
                     "display_type": "password",
-                    "is_required": "True",
-                    "default_value": "huawei",
+                    "is_required": "true",
+                    "datamatch": "password",
                     "order": 3
                 }
             }
@@ -37,7 +37,7 @@ OS_CONFIG_MAPPING = {
         "general": {
             "name": "general",
             "title": "",
-            "order": 2,
+            "order": 1,
             "data": {
                 "language": {
                     "display_name": "Language",
@@ -98,7 +98,7 @@ OS_CONFIG_MAPPING = {
                    "display_name": "NTP Server",
                    "order": 6,
                    "mapped_key": [
-                       "name", "is_required", "display_type", "default_value"
+                       "name", "is_required", "display_type"
                    ]
                 },
                 "dns_servers": {
@@ -106,7 +106,7 @@ OS_CONFIG_MAPPING = {
                     "display_name": "DNS Server",
                     "order": 7,
                     "mapped_key": [
-                        "name", "is_required", "display_type", "default_value"
+                        "name", "is_required", "display_type"
                     ]
                 },
                 "search_path": {
diff --git a/conf/os_metadata/general.conf b/conf/os_metadata/general.conf
index b6a6c481..6848f3fa 100644
--- a/conf/os_metadata/general.conf
+++ b/conf/os_metadata/general.conf
@@ -7,6 +7,7 @@ METADATA = {
         'language': {
             '_self': {
                 'field': 'general',
+                'is_required': True,
                 'default_value': 'EN',
                 'options': ['EN', 'CN'],
                 'mapping_to': 'language'
@@ -15,6 +16,7 @@ METADATA = {
         'timezone': {
             '_self': {
                 'field': 'general',
+                'is_required': True,
                 'default_value': 'UTC',
                 'options': [
                     'America/New_York', 'America/Chicago',