openstack
/
charm-odl-controller
Code Issues Proposed changes

Switch to double quotes for consistency

This commit is contained in:
Liam Young 2015-06-16 16:34:29 +00:00
parent 66c6a24f2e
commit a542f9e380
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/odl_controller_hooks.py
View File

@ -49,10 +49,10 @@ def controller_api_joined():
@hooks.hook("controller-api-relation-changed")
def controller_api_changed():
for rid in relation_ids('controller-api'):
for rid in relation_ids("controller-api"):
for unit in related_units(rid):
odl_cmds_json = relation_get(rid=rid, unit=unit,
attribute='odl-cmds')
attribute="odl-cmds")
if odl_cmds_json:
odl_cmds = json.loads(odl_cmds_json)
process_odl_cmds(odl_cmds)

18
hooks/odl_controller_utils.py
View File

@ -42,7 +42,7 @@ def write_mvn_config():
"opendaylight", "opendaylight", 0400)
def run_odl(cmds, host='localhost', port=8101, retries=20):
def run_odl(cmds, host="localhost", port=8101, retries=20):
run_cmd = ["/opt/opendaylight-karaf/bin/client", "-r", str(retries),
"-h", host, "-a", str(port)]
run_cmd.extend(cmds)
@ -52,12 +52,12 @@ def run_odl(cmds, host='localhost', port=8101, retries=20):
def installed_features():
installed = []
out = run_odl(['feature:list'])
for line in out.split('\n'):
columns = line.split('|')
out = run_odl(["feature:list"])
for line in out.split("\n"):
columns = line.split("|")
if len(columns) > 2:
install_flag = columns[2].replace(" ", "")
if install_flag == 'x':
if install_flag == "x":
installed.append(columns[0].replace(" ", ""))
return installed
@ -69,11 +69,11 @@ def filter_installed(features):
def process_odl_cmds(odl_cmds):
features = filter_installed(odl_cmds.get('feature:install', []))
features = filter_installed(odl_cmds.get("feature:install", []))
if features:
run_odl(['feature:install'] + features)
logging = odl_cmds.get('log:set')
run_odl(["feature:install"] + features)
logging = odl_cmds.get("log:set")
if logging:
for log_level in logging.keys():
for target in logging[log_level]:
run_odl(['log:set', log_level, target])
run_odl(["log:set", log_level, target])