rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-06 09:14:31 +00:00
Code Issues Releases Wiki Activity

Fix ros config set for list values

Browse Source
This commit is contained in:
Darren Shepherd
2016-02-10 14:40:51 -07:00
parent da7abd871e
commit 6f98e06d97
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/data_funcs.go
View File

@@ -123,7 +123,7 @@ func getOrSetVal(args string, data map[interface{}]interface{}, value interface{
func DummyMarshall(value string) interface{} { func DummyMarshall(value string) interface{} {
if strings.HasPrefix(value, "[") && strings.HasSuffix(value, "]") { if strings.HasPrefix(value, "[") && strings.HasSuffix(value, "]") {
result := []string{} result := []interface{}{}
for _, i := range strings.Split(value[1:len(value)-1], ",") { for _, i := range strings.Split(value[1:len(value)-1], ",") {
result = append(result, strings.TrimSpace(i)) result = append(result, strings.TrimSpace(i))
} }

15
tests/integration/rostest/test_09_network.py
View File

@@ -34,3 +34,18 @@ ip link show dev eth7 | grep 'master bond0'
SCRIPT SCRIPT
sudo bash test-merge sudo bash test-merge
'''.strip()) '''.strip())
def test_network_dns_ros_set(qemu):
SSH(qemu).check_call('bash', '-c', '''
set -x -e
sudo ros config set rancher.network.dns.search '[a,b]'
if [ "$(sudo ros config get rancher.network.dns.search)" == "- a
- b
" ]; then
sudo ros config get rancher.network.dns.search
exit 1
fi
'''.strip())