x
/
compass-core
Code Issues Proposed changes

Merge "Modify config for ui metadata" into dev/experimental

This commit is contained in:
Jenkins 2015-04-06 17:46:36 +00:00 committed by Gerrit Code Review
parent 31c4395e19 45a9093b91
commit 3e9c75ff81
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compass/db/api/metadata_holder.py
View File

@ -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:

16
conf/os_mapping/os_mapping.conf
View File

@ -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": {

2
conf/os_metadata/general.conf
View File

@ -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',