Merge lp:~sdn-charmers/charms/trusty/odl-controller/odl-cmds into lp:~sdn-charmers/charms/trusty/odl-controller/trunk

[Liam Young]

[Liam Young (gnuoy)]

The post install commands that were being run no longer work on more recent versions of ODL because the features being requested have been renamed or removed.

This mp removes any default commands. Instead, a charm joined via the controller-api relation can request features so be installed or log settings to be set by setting odl-cmds to a string representation of json.

eg

{
    'feature:install': ['cosc-cvpn-ovs-rest', 'odl-netconf-connector-all'],
    'log:set': {
        'TRACE': ['cosc-cvpn-ovs-rest', 'odl-netconf-connector-all'],
    }
}

The above would request the installation of cosc-cvpn-ovs-rest and odl-netconf-connector-all and set logging to trace for cosc-cvpn-ovs-rest and odl-netconf-connector-all

[Liam Young (gnuoy)]

The filter_installed function was added on the assumption that installing features was an expensive operation, it might not be so this may be overkill

[Robert Ayres (robert-ayres)]

Are you using an auto-formatter? Seems to be some formatting changes that aren't related to functionality.

[Liam Young (gnuoy)]

I fixed some flake8 complaints while I was at it

[lp:~sdn-charmers/charms/trusty/odl-controller/odl-cmds]

6. By Liam Young on 2015-06-16

Switch to double quotes for consistency

[Jason Hobbs (jason-hobbs)]

When using this, port 8080 on the controller isn't listening.

https://ask.opendaylight.org/question/919/resource-error-using-port-8080/

This makes it look like we need: odl-nsf-all and odl-adsal-compatibility installed for port 8080 to come up.

Is there a corresponding branch for neutron-api to issue that that odl-cmds?

=== modified file 'hooks/odl_controller_hooks.py'
--- hooks/odl_controller_hooks.py	2015-03-16 19:56:22 +0000
+++ hooks/odl_controller_hooks.py	2015-06-16 16:35:08 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import json
 import os
 import re
 import shutil
@@ -12,35 +13,51 @@
     UnregisteredHookError,
     config,
     log,
-    relation_set
+    relation_get,
+    relation_ids,
+    relation_set,
+    related_units,
 )
 
 from charmhelpers.core.host import (
     adduser,
     mkdir,
     restart_on_change,
-    service_restart,
     service_start
 )
 
 from charmhelpers.fetch import apt_install, install_remote
 
-from odl_controller_utils import write_mvn_config
+from odl_controller_utils import write_mvn_config, process_odl_cmds
 
-PACKAGES = [ "default-jre-headless", "python-jinja2" ]
+PACKAGES = ["default-jre-headless", "python-jinja2"]
 
 hooks = Hooks()
 config = config()
 
+
 @hooks.hook("config-changed")
 @restart_on_change({"/home/opendaylight/.m2/settings.xml": ["odl-controller"]})
 def config_changed():
     write_mvn_config()
 
+
 @hooks.hook("controller-api-relation-joined")
 def controller_api_joined():
     relation_set(port=8080, username="admin", password="admin")
 
+
[e-mail]("controller-api-relation-changed")
+def controller_api_changed():
+    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")
+            if odl_cmds_json:
+                odl_cmds = json.loads(odl_cmds_json)
+                process_odl_cmds(odl_cmds)
+
+
 @hooks.hook()
 def install():
     # install dependencies
@@ -54,18 +71,16 @@
     os.symlink(name, "/opt/opendaylight-karaf")
     shutil.copy("files/odl-controller.conf", "/etc/init")
     adduser("opendaylight", system_user=True)
-    mkdir("/home/opendaylight", owner="opendaylight", group="opendaylight", perms=0755)
+    mkdir("/home/opendaylight", owner="opendaylight", group="opendaylight",
+          perms=0755)
     check_call(["chown", "-R", "opendaylight:opendaylight", "/opt/" + name])
-    mkdir("/var/log/opendaylight", owner="opendaylight", group="opendaylight", perms=0755)
+    mkdir("/var/log/opendaylight", owner="opendaylight", group="opendaylight",
+          perms=0755)
 
     # install features
     write_mvn_config()
     service_start("odl-controller")
-    check_call(["/opt/opendaylight-karaf/bin/client", "-r", "61",
-                "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"])
+
 
 def main():
     try:
@@ -73,10 +88,12 @@
     except UnregisteredHookError as e:
         log("Unknown hook {} - skipping.".format(e))
 
+
 @hooks.hook("ovsdb-manager-relation-joined")
 def ovsdb_manager_joined():
     relation_set(port=6640, protocol="tcp")
 
+
 @hooks.hook("upgrade-charm")
 def upgrade_charm():
     pass

=== modified file 'hooks/odl_controller_utils.py'
--- hooks/odl_controller_utils.py	2015-02-19 22:08:13 +0000
+++ hooks/odl_controller_utils.py	2015-06-16 16:35:08 +0000
@@ -1,14 +1,17 @@
+import subprocess
 from os import environ
 import urlparse
 
 from charmhelpers.core.templating import render
 
+
 def mvn_ctx():
     ctx = {}
     ctx.update(mvn_proxy_ctx("http"))
     ctx.update(mvn_proxy_ctx("https"))
     return ctx
 
+
 def mvn_proxy_ctx(protocol):
     ctx = {}
     key = protocol + "_proxy"
@@ -32,7 +35,45 @@
             ctx[protocol + "_noproxy"] = no_proxy
     return ctx
 
+
 def write_mvn_config():
     ctx = mvn_ctx()
     render("settings.xml", "/home/opendaylight/.m2/settings.xml", ctx,
            "opendaylight", "opendaylight", 0400)
+
+
+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)
+    output = subprocess.check_output(run_cmd)
+    return output
+
+
+def installed_features():
+    installed = []
+    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":
+                installed.append(columns[0].replace(" ", ""))
+    return installed
+
+
+def filter_installed(features):
+    installed = installed_features()
+    whitelist = [feature for feature in features if feature not in installed]
+    return whitelist
+
+
+def process_odl_cmds(odl_cmds):
+    features = filter_installed(odl_cmds.get("feature:install", []))
+    if features:
+        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])