openstack
/
kolla-cli
Code Issues Proposed changes

Summary: drop use of str() on exception messages 

Description:
- Oracle-Bug: 21810245 - drop use of strings on exception messages.
When messages are in > 128 unicode, str() will throw an exception.
This commit is contained in:
Steve Noyes 2015-09-11 11:11:46 -04:00
parent 987b8fa2c5
commit 1079c0fa4c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kollacli/ansible/inventory.py
View File

@ -125,14 +125,14 @@ class Host(object):
except Exception as e:
raise exceptions.CommandError(
'ERROR: Host (%s) setup failed : %s'
% (self.name, str(e)))
% (self.name, e))
return True
def check(self):
kollacli_home = get_kollacli_home()
command_string = 'sudo -u kolla ansible '
inventory_string = '-i ' + os.path.join(kollacli_home,
'tools', 'json_generator.py')
'tools', 'json_generator.py')
ping_string = ' %s %s' % (self.name, '-m ping')
cmd = (command_string + inventory_string + ping_string)
@ -140,11 +140,12 @@ class Host(object):
if err_flag:
raise exceptions.CommandError(
'ERROR: Host (%s) check failed : %s'
% (self.name, str(output)))
% (self.name, output))
else:
self.log.info('Host (%s) check succeeded' % self.name)
return True
class HostGroup(object):
class_version = 1
@ -292,7 +293,7 @@ class Inventory(object):
shutil.copyfile(tmp_path, inventory_path)
os.remove(tmp_path)
except Exception as e:
raise Exception('ERROR: saving inventory : %s' % str(e))
raise Exception('ERROR: saving inventory : %s' % e)
finally:
try:
os.close(tmp_filehandle)

4
kollacli/sshutils.py
View File

@ -100,14 +100,14 @@ def _post_setup_checks(net_addr, log):
ssh_client = ssh_connect(net_addr, get_admin_user(), '')
except Exception as e:
raise CommandError("ERROR: remote login failed : %s" % str(e))
raise CommandError("ERROR: remote login failed : %s" % e)
try:
# a basic test
ssh_client.exec_command('ls')
except Exception as e:
raise CommandError("ERROR: remote command 'ls' failed : %s" % str(e))
raise CommandError("ERROR: remote command 'ls' failed : %s" % e)
finally:
_close_ssh_client(ssh_client)

3
kollacli/utils.py
View File

@ -13,9 +13,8 @@
# under the License.
import logging
import os
import yaml
import pexpect
import string
import yaml
def get_kolla_home():