x/kloudbuster
Code Issues Proposed changes

Fix issues while parsing credential files from CLI

Browse Source 
Change-Id: I7a53a2cc87e015afbba11eb8d23bf2afbd1c0d7f
This commit is contained in:
Yichen Wang 2015-07-14 21:31:17 -07:00
parent d2891a0209
commit 522e6c1167
3 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scale/cfg.topo.yaml
View File

@ -1,5 +1,8 @@
# Compute host topology file for running KloudBuster
# The compute host name must be exactly the same as shown from NOVA:
# i.e. "nova hypervisor-list"
servers_rack:
hh23-5

5
scale/credentials.py
View File

@ -48,11 +48,11 @@ class Credentials(object):
def _init_with_openrc_(self, openrc_contents):
export_re = re.compile('export OS_([A-Z_]*)="?(.*)')
for line in openrc_contents:
for line in openrc_contents.splitlines():
line = line.strip()
mstr = export_re.match(line)
if mstr:
# get rif of posible trailing double quote
# get rid of posible trailing double quote
# the first one was removed by the re
name = mstr.group(1)
value = mstr.group(2)
@ -85,7 +85,6 @@ class Credentials(object):
if openrc_file:
if os.path.exists(openrc_file):
self.openrc_contents = open(openrc_file).read()
self._init_with_openrc_(self.openrc_contents)
else:
LOG.error("rc file does not exist %s" % openrc_file)
success = False

78
scale/kb_server/kb_server/controllers/config.py
View File

@ -42,49 +42,49 @@ class ConfigController(object):
@running_config.when(method='POST')
def running_config_POST(self, args):
try:
# Expectation:
# {
# 'credentials': {'tested_rc': '<STRING>', 'passwd_tested': '<STRING>',
# 'testing_rc': '<STRING>', 'passwd_testing': '<STRING>'},
# 'kb_cfg': {<USER_OVERRIDED_CONFIGS>},
# 'topo_cfg': {<TOPOLOGY_CONFIGS>}
# }
user_config = eval(args)
except Exception:
# Parsing credentials from application input
cred_config = user_config['credentials']
cred_tested = Credentials(openrc_contents=cred_config['tested_rc'],
pwd=cred_config['passwd_tested'])
if ('testing_rc' in cred_config and
cred_config['testing_rc'] != cred_config['tested_rc']):
cred_testing = Credentials(openrc_contents=cred_config['testing_rc'],
pwd=cred_config['passwd_testing'])
else:
# Use the same openrc file for both cases
cred_testing = cred_tested
# Parsing server and client configs from application input
# Save the public key into a temporary file
if 'public_key' in user_config['kb_cfg']:
pubkey_filename = '/tmp/kb_public_key.pub'
f = open(pubkey_filename, 'w')
f.write(user_config['kb_cfg']['public_key_file'])
f.close()
self.kb_config.config_scale['public_key_file'] = pubkey_filename
alt_config = Configuration.from_string(user_config['kb_cfg']).configure()
self.kb_config.config_scale = self.kb_config.config_scale.merge(alt_config)
# Parsing topology configs from application input
if 'topo_cfg' in user_config:
topo_cfg = Configuration.from_string(user_config['topo_cfg']).configure()
else:
topo_cfg = None
except Exception as e:
response.status = 403
response.text = "Error while parsing configurations!"
response.text = "Error while parsing configurations: %s" % e.message
return response.text
# Expectation:
# {
# 'credentials': {'tested_rc': '<STRING>', 'passwd_tested': '<STRING>',
# 'testing_rc': '<STRING>', 'passwd_testing': '<STRING>'},
# 'kb_cfg': {<USER_OVERRIDED_CONFIGS>},
# 'topo_cfg': {<TOPOLOGY_CONFIGS>}
# }
# Parsing credentials from application input
cred_config = user_config['credentials']
cred_tested = Credentials(openrc_contents=cred_config['tested_rc'],
pwd=cred_config['passwd_tested'])
if ('testing_rc' in cred_config and cred_config['testing_rc'] != cred_config['tested_rc']):
cred_testing = Credentials(openrc_contents=cred_config['testing_rc'],
pwd=cred_config['passwd_testing'])
else:
# Use the same openrc file for both cases
cred_testing = cred_tested
# Parsing server and client configs from application input
# Save the public key into a temporary file
if 'public_key' in user_config['kb_cfg']:
pubkey_filename = '/tmp/kb_public_key.pub'
f = open(pubkey_filename, 'w')
f.write(user_config['kb_cfg']['public_key_file'])
f.close()
self.kb_config.config_scale['public_key_file'] = pubkey_filename
alt_config = Configuration.from_string(user_config['kb_cfg']).configure()
self.kb_config.config_scale = self.kb_config.config_scale.merge(alt_config)
# Parsing topology configs from application input
if 'topo_cfg' in user_config:
topo_cfg = Configuration.from_string(user_config['topo_cfg']).configure()
else:
topo_cfg = None
self.kb_config.init_with_rest_api(cred_tested=cred_tested,
cred_testing=cred_testing,
topo_cfg=topo_cfg)