Merge lp:~narindergupta/charms/trusty/odl-controller/lithium into lp:~openstack-charmers-archive/charms/trusty/odl-controller/next

[Narinder Gupta]

Added support for Lithium version of ODL where username is Mandatory to enable the feature and odl command

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #13929 odl-controller-next for narindergupta mp277767
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/13929/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #12985 odl-controller-next for narindergupta mp277767
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/13319811/
Build: http://10.245.162.77:8080/job/charm_unit_test/12985/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7912 odl-controller-next for narindergupta mp277767
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7912/

[Liam Young (gnuoy)]

Thanks for the mp! Looks goot to me and the unit test issue appears to have been fixed by a subsequent commit. Approved

review: Approve

=== modified file 'hooks/odl_controller_utils.py'
--- hooks/odl_controller_utils.py	2015-08-12 09:34:55 +0000
+++ hooks/odl_controller_utils.py	2015-11-17 23:16:15 +0000
@@ -76,9 +76,9 @@
 
 
 @retry_on_exception(5, base_delay=10, exc_type=subprocess.CalledProcessError)
-def run_odl(cmds, host="localhost", port=8101, retries=20):
+def run_odl(cmds, host="localhost", port=8101, retries=20, user="karaf"):
     run_cmd = ["/opt/opendaylight-karaf/bin/client", "-r", str(retries),
-               "-h", host, "-a", str(port)]
+               "-h", host, "-a", str(port), "-u", str(user)]
     run_cmd.extend(cmds)
     output = subprocess.check_output(run_cmd)
     return output

=== modified file 'unit_tests/test_odl_controller_utils.py'
--- unit_tests/test_odl_controller_utils.py	2015-11-11 14:57:38 +0000
+++ unit_tests/test_odl_controller_utils.py	2015-11-17 23:16:15 +0000
@@ -55,7 +55,7 @@
         utils.run_odl(["feature:list"])
         self.subprocess.check_output.assert_called_with(
             ["/opt/opendaylight-karaf/bin/client", "-r", '20', "-h",
-             'localhost', "-a", '8101', 'feature:list']
+             'localhost', "-a", '8101', "-u", "karaf", 'feature:list']
         )
 
     def test_installed_features(self):