diff --git a/hooks/odl_controller_hooks.py b/hooks/odl_controller_hooks.py index a3ee1ad..2d788a3 100755 --- a/hooks/odl_controller_hooks.py +++ b/hooks/odl_controller_hooks.py @@ -37,8 +37,8 @@ config = config() @hooks.hook("config-changed") @restart_on_change({"/home/opendaylight/.m2/settings.xml": ["odl-controller"]}) def config_changed(): - process_odl_cmds(PROFILES[config['profile']]) - for r_id in relation_ids('controller-api'): + process_odl_cmds(PROFILES[config["profile"]]) + for r_id in relation_ids("controller-api"): controller_api_joined(r_id) write_mvn_config() @@ -46,7 +46,7 @@ def config_changed(): @hooks.hook("controller-api-relation-joined") def controller_api_joined(r_id=None): relation_set(relation_id=r_id, - port=PROFILES[config['profile']]['port'], + port=PROFILES[config["profile"]]["port"], username="admin", password="admin") diff --git a/hooks/odl_controller_utils.py b/hooks/odl_controller_utils.py index 8a98f49..b62ba2d 100644 --- a/hooks/odl_controller_utils.py +++ b/hooks/odl_controller_utils.py @@ -7,27 +7,27 @@ from charmhelpers.core.hookenv import config PROFILES = { - 'cisco-vpp': { - 'feature:install': ['cosc-cvpn-ovs-rest', - 'odl-netconf-connector-all'], - 'log:set': { - 'TRACE': ['cosc-cvpn-ovs-rest', - 'odl-netconf-connector-all'], + "cisco-vpp": { + "feature:install": ["cosc-cvpn-ovs-rest", + "odl-netconf-connector-all"], + "log:set": { + "TRACE": ["cosc-cvpn-ovs-rest", + "odl-netconf-connector-all"], }, - 'port': 8181 + "port": 8181 }, - 'openvswitch-odl': { - 'feature:install': ["odl-base-all", "odl-aaa-authn", + "openvswitch-odl": { + "feature:install": ["odl-base-all", "odl-aaa-authn", "odl-restconf", "odl-nsf-all", "odl-adsal-northbound", "odl-mdsal-apidocs", "odl-ovsdb-openstack", "odl-ovsdb-northbound", "odl-dlux-core"], - 'port': 8080 + "port": 8080 } } -PROFILES['default'] = PROFILES['openvswitch-odl'] +PROFILES["default"] = PROFILES["openvswitch-odl"] def mvn_ctx(): @@ -39,7 +39,7 @@ def mvn_ctx(): def mvn_proxy_ctx(protocol): ctx = {} - proxy = config('%s-proxy' % protocol) + proxy = config("{}-proxy".format(protocol)) key = protocol + "_proxy" if proxy: url = urlparse.urlparse(proxy)