Merge lp:~adam-collard/charms/precise/swift-storage/lib-in-python-package into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[Adam Collard]

With the addition of actions to the OpenStack charms, there's a need to share code between actions and hooks. This branch moves library code to a top-level ./lib/ and then symlinks that into ./hooks/lib, likewise for charm-helpers.

This should be a plain refactor with no change in behaviour, but laying the ground for an actions/lib symlink and an actions/charm-helpers symlink.

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

charm_lint_check #6353 swift-storage-next for adam-collard mp265105
    LINT OK: passed

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

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

charm_unit_test #5985 swift-storage-next for adam-collard mp265105
    UNIT OK: passed

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

[James Page (james-page)]

review: Approve

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

charm_amulet_test #5163 swift-storage-next for adam-collard mp265105
    AMULET OK: passed

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

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

charm_lint_check #7867 swift-storage-next for adam-collard mp265105
    LINT OK: passed

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

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

charm_unit_test #7288 swift-storage-next for adam-collard mp265105
    UNIT OK: passed

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

[Geoff Teale (tealeg)]

+1 Looks good to me.

review: Approve

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

charm_amulet_test #5757 swift-storage-next for adam-collard mp265105
    AMULET OK: passed

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

=== modified file '.coveragerc'
--- .coveragerc	2013-07-19 20:44:37 +0000
+++ .coveragerc	2015-08-11 08:10:53 +0000
@@ -4,4 +4,4 @@
     if __name__ == .__main__.:
 include=
     hooks/swift_storage_*
-
+    lib/swift_storage_*

=== modified file 'Makefile' (properties changed: -x to +x)
--- Makefile	2015-04-16 21:32:08 +0000
+++ Makefile	2015-08-11 08:10:53 +0000
@@ -2,8 +2,9 @@
 PYTHON := /usr/bin/env python
 
 lint:
-	@flake8 --exclude hooks/charmhelpers hooks
-	@flake8 --exclude hooks/charmhelpers unit_tests tests
+	@flake8 lib
+	@flake8 hooks
+	@flake8 unit_tests tests
 	@charm proof
 
 unit_test:

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-07-31 13:11:32 +0000
+++ charm-helpers-hooks.yaml	2015-08-11 08:10:53 +0000
@@ -1,5 +1,5 @@
 branch: lp:charm-helpers
-destination: hooks/charmhelpers
+destination: charmhelpers
 include:
     - core
     - cli

=== renamed directory 'hooks/charmhelpers' => 'charmhelpers'
=== added file 'hooks/__init__.py'
=== added symlink 'hooks/charmhelpers'
=== target is u'../charmhelpers/'
=== added symlink 'hooks/lib'
=== target is u'../lib'
=== modified file 'hooks/swift_storage_hooks.py'
--- hooks/swift_storage_hooks.py	2015-01-12 13:24:00 +0000
+++ hooks/swift_storage_hooks.py	2015-08-11 08:10:53 +0000
@@ -3,7 +3,7 @@
 import os
 import sys
 
-from swift_storage_utils import (
+from lib.swift_storage_utils import (
     PACKAGES,
     RESTART_MAP,
     SWIFT_SVCS,

=== added directory 'lib'
=== renamed file 'hooks/__init__.py' => 'lib/__init__.py'
=== renamed file 'hooks/misc_utils.py' => 'lib/misc_utils.py'
=== renamed file 'hooks/swift_storage_context.py' => 'lib/swift_storage_context.py'
=== renamed file 'hooks/swift_storage_utils.py' => 'lib/swift_storage_utils.py'
=== modified file 'setup.cfg'
--- setup.cfg	2013-07-19 20:44:37 +0000
+++ setup.cfg	2015-08-11 08:10:53 +0000
@@ -1,6 +1,6 @@
-[nosesetests]
+[nosetests]
 verbosity=2
 with-coverage=1
 cover-erase=1
-cover-package=hooks
+cover-package=lib,hooks.swift_storage_hooks
 

=== modified file 'unit_tests/__init__.py'
--- unit_tests/__init__.py	2013-07-19 20:44:37 +0000
+++ unit_tests/__init__.py	2015-08-11 08:10:53 +0000
@@ -1,2 +0,0 @@
-import sys
-sys.path.append('hooks')

=== modified file 'unit_tests/test_swift_storage_context.py'
--- unit_tests/test_swift_storage_context.py	2015-03-05 02:24:01 +0000
+++ unit_tests/test_swift_storage_context.py	2015-08-11 08:10:53 +0000
@@ -1,7 +1,7 @@
 from mock import MagicMock
 from test_utils import CharmTestCase, patch_open
 
-import swift_storage_context as swift_context
+import lib.swift_storage_context as swift_context
 
 
 TO_PATCH = [

=== modified file 'unit_tests/test_swift_storage_relations.py'
--- unit_tests/test_swift_storage_relations.py	2015-03-05 02:24:01 +0000
+++ unit_tests/test_swift_storage_relations.py	2015-08-11 08:10:53 +0000
@@ -2,16 +2,16 @@
 
 from test_utils import CharmTestCase, patch_open
 
-import swift_storage_utils as utils
+import lib.swift_storage_utils as utils
 
 _reg = utils.register_configs
 utils.register_configs = MagicMock()
 
-import swift_storage_hooks as hooks
+import hooks.swift_storage_hooks as hooks
 
 utils.register_configs = _reg
 
-from swift_storage_utils import PACKAGES
+from lib.swift_storage_utils import PACKAGES
 
 TO_PATCH = [
     'CONFIGS',

=== modified file 'unit_tests/test_swift_storage_utils.py'
--- unit_tests/test_swift_storage_utils.py	2015-04-02 18:56:27 +0000
+++ unit_tests/test_swift_storage_utils.py	2015-08-11 08:10:53 +0000
@@ -4,7 +4,7 @@
 from mock import call, patch, MagicMock
 from test_utils import CharmTestCase, patch_open
 
-import swift_storage_utils as swift_utils
+import lib.swift_storage_utils as swift_utils
 
 
 TO_PATCH = [