Merge lp:~james-page/charms/trusty/ceilometer/status-fixes-actions into lp:~openstack-charmers-archive/charms/trusty/ceilometer/next

[James Page]

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

charm_lint_check #12020 ceilometer-next for james-page mp274699
    LINT OK: passed

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

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

charm_unit_test #11171 ceilometer-next for james-page mp274699
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11171/

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

charm_amulet_test #7382 ceilometer-next for james-page mp274699
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12798238/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7382/

[lp:~james-page/charms/trusty/ceilometer/status-fixes-actions]

104. By James Page on 2015-10-16

Tidy py files in root to lib folder, sort out import of hooks in actions

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

charm_lint_check #12021 ceilometer-next for james-page mp274699
    LINT OK: passed

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

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

charm_unit_test #11172 ceilometer-next for james-page mp274699
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11172/

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

charm_amulet_test #7383 ceilometer-next for james-page mp274699
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12798448/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7383/

[lp:~james-page/charms/trusty/ceilometer/status-fixes-actions]

105. By James Page on 2015-10-16

update->flush

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

charm_lint_check #12022 ceilometer-next for james-page mp274699
    LINT OK: passed

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

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

charm_unit_test #11173 ceilometer-next for james-page mp274699
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11173/

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

charm_amulet_test #7384 ceilometer-next for james-page mp274699
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12798676/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7384/

[Ryan Beisner (1chb1n)]

^ details from amulet test fail:
http://paste.ubuntu.com/12798703/

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

charm_lint_check #12023 ceilometer-next for james-page mp274699
    LINT OK: passed

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

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

charm_unit_test #11174 ceilometer-next for james-page mp274699
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11174/

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

charm_amulet_test #7385 ceilometer-next for james-page mp274699
    AMULET OK: passed

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

[Liam Young (gnuoy)]

Approved

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-10-06 14:35:01 +0000
+++ Makefile	2015-10-16 13:01:49 +0000
@@ -3,7 +3,7 @@
 
 lint:
 	@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
-        hooks unit_tests tests
+        hooks unit_tests tests actions
 	@charm proof
 
 test:

=== modified file 'actions/actions.py'
--- actions/actions.py	2015-09-16 08:26:05 +0000
+++ actions/actions.py	2015-10-16 13:01:49 +0000
@@ -5,7 +5,9 @@
 
 from charmhelpers.core.host import service_pause, service_resume
 from charmhelpers.core.hookenv import action_fail, status_set
-from ceilometer_utils import CEILOMETER_SERVICES
+from charmhelpers.core.unitdata import kv
+from ceilometer_utils import CEILOMETER_SERVICES, assess_status
+from ceilometer_hooks import CONFIGS
 
 
 def pause(args):
@@ -16,8 +18,15 @@
     for service in CEILOMETER_SERVICES:
         if not service_pause(service):
             raise Exception("Failed to %s." % service)
+
+    db = kv()
+    db.set('unit-paused', True)
+    db.flush()
+
     status_set(
-        "maintenance", "Paused. Use 'resume' action to resume normal service.")
+        "maintenance",
+        "Unit paused - use 'resume' action to resume normal service")
+
 
 def resume(args):
     """Resume the Ceilometer services.
@@ -26,7 +35,12 @@
     for service in CEILOMETER_SERVICES:
         if not service_resume(service):
             raise Exception("Failed to resume %s." % service)
-    status_set("active", "")
+
+    db = kv()
+    db.set('unit-paused', False)
+    db.flush()
+
+    assess_status(CONFIGS)
 
 
 # A dictionary of all the defined actions to callables (which take
@@ -49,4 +63,3 @@
 
 if __name__ == "__main__":
     sys.exit(main(sys.argv))
-

=== modified symlink 'actions/ceilometer_contexts.py'
=== target changed u'../ceilometer_contexts.py' => u'../lib/ceilometer_contexts.py'
=== added symlink 'actions/ceilometer_hooks.py'
=== target is u'../hooks/ceilometer_hooks.py'
=== modified symlink 'actions/ceilometer_utils.py'
=== target changed u'../ceilometer_utils.py' => u'../lib/ceilometer_utils.py'
=== modified file 'actions/openstack_upgrade.py'
--- actions/openstack_upgrade.py	2015-09-22 21:01:13 +0000
+++ actions/openstack_upgrade.py	2015-10-16 13:01:49 +0000
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 import sys
-import uuid
 
 sys.path.append('hooks/')
 

=== modified symlink 'hooks/ceilometer_contexts.py'
=== target changed u'../ceilometer_contexts.py' => u'../lib/ceilometer_contexts.py'
=== modified file 'hooks/ceilometer_hooks.py'
--- hooks/ceilometer_hooks.py	2015-10-10 22:55:54 +0000
+++ hooks/ceilometer_hooks.py	2015-10-16 13:01:49 +0000
@@ -28,7 +28,6 @@
 from charmhelpers.contrib.openstack.utils import (
     configure_installation_source,
     openstack_upgrade_available,
-    set_os_workload_status,
 )
 from ceilometer_utils import (
     get_packages,
@@ -42,7 +41,7 @@
     get_shared_secret,
     do_openstack_upgrade,
     set_shared_secret,
-    REQUIRED_INTERFACES,
+    assess_status,
 )
 from ceilometer_contexts import CEILOMETER_PORT
 from charmhelpers.contrib.openstack.ip import (
@@ -339,4 +338,4 @@
         hooks.execute(sys.argv)
     except UnregisteredHookError as e:
         log('Unknown hook {} - skipping.'.format(e))
-    set_os_workload_status(CONFIGS, REQUIRED_INTERFACES)
\ No newline at end of file
+    assess_status(CONFIGS)

=== modified symlink 'hooks/ceilometer_utils.py'
=== target changed u'../ceilometer_utils.py' => u'../lib/ceilometer_utils.py'
=== added directory 'lib'
=== renamed file 'ceilometer_contexts.py' => 'lib/ceilometer_contexts.py'
=== renamed file 'ceilometer_utils.py' => 'lib/ceilometer_utils.py'
--- ceilometer_utils.py	2015-10-10 22:42:31 +0000
+++ lib/ceilometer_utils.py	2015-10-16 13:01:49 +0000
@@ -17,9 +17,11 @@
 from charmhelpers.contrib.openstack.utils import (
     get_os_codename_package,
     get_os_codename_install_source,
-    configure_installation_source
+    configure_installation_source,
+    set_os_workload_status,
 )
-from charmhelpers.core.hookenv import config, log
+from charmhelpers.core.hookenv import config, log, status_set
+from charmhelpers.core.unitdata import kv
 from charmhelpers.fetch import apt_update, apt_install, apt_upgrade
 from copy import deepcopy
 
@@ -229,3 +231,22 @@
     """
     with open(SHARED_SECRET, 'w') as secret_file:
         secret_file.write(secret)
+
+
+def is_paused():
+    '''Determine if current unit is in a paused state'''
+    db = kv()
+    if db.get('unit-paused'):
+        return True
+    else:
+        return False
+
+
+def assess_status(configs):
+    if is_paused():
+        status_set("maintenance",
+                   "Unit paused - use 'resume' action "
+                   "to resume normal service")
+        return
+
+    set_os_workload_status(configs, REQUIRED_INTERFACES)

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-09-10 20:54:44 +0000
+++ tests/basic_deployment.py	2015-10-16 13:01:49 +0000
@@ -604,7 +604,7 @@
         unit_name = "ceilometer/0"
         unit = self.d.sentry.unit[unit_name]
 
-        assert u.status_get(unit)[0] == "unknown"
+        assert u.status_get(unit)[0] == "active"
 
         action_id = self._run_action(unit_name, "pause")
         assert self._wait_on_action(action_id), "Pause action failed."

=== modified file 'unit_tests/test_actions_openstack_upgrade.py'
--- unit_tests/test_actions_openstack_upgrade.py	2015-09-22 21:01:13 +0000
+++ unit_tests/test_actions_openstack_upgrade.py	2015-10-16 13:01:49 +0000
@@ -13,7 +13,6 @@
 TO_PATCH = [
     'config_changed',
     'do_openstack_upgrade',
-    'uuid'
 ]