Merge lp:~bbaqar/charms/trusty/plumgrid-director/conflicts into lp:~plumgrid-team/charms/trusty/plumgrid-director/trunk

[Bilal Baqar]

WIP

[Hassaan Pasha (hassaanp)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-08-24 16:18:48 +0000
+++ Makefile	2016-03-03 21:06:17 +0000
@@ -7,7 +7,7 @@
         netaddr jinja2
 
 lint: virtualenv
-	.venv/bin/flake8 --exclude hooks/charmhelpers hooks unit_tests tests
+	.venv/bin/flake8 --exclude hooks/charmhelpers hooks unit_tests tests --ignore E402
 	@charm proof
 
 unit_test: virtualenv

=== modified file 'hooks/pg_dir_utils.py'
--- hooks/pg_dir_utils.py	2015-11-21 22:07:15 +0000
+++ hooks/pg_dir_utils.py	2016-03-03 21:06:17 +0000
@@ -327,8 +327,7 @@
         'plumgrid:plumgrid',
         LICENSE_POST_PATH,
         '-d',
-        json.dumps(license)
-        ]
+        json.dumps(license)]
     licence_get_cmd = [PG_CURL, '-u', 'plumgrid:plumgrid', LICENSE_GET_PATH]
     try:
         old_license = subprocess.check_output(licence_get_cmd)

=== modified file 'unit_tests/test_pg_dir_hooks.py'
--- unit_tests/test_pg_dir_hooks.py	2016-01-14 12:39:52 +0000
+++ unit_tests/test_pg_dir_hooks.py	2016-03-03 21:06:17 +0000
@@ -1,5 +1,7 @@
 from mock import MagicMock, patch, call
+
 from test_utils import CharmTestCase
+
 with patch('charmhelpers.core.hookenv.config') as config:
     config.return_value = 'neutron'
     import pg_dir_utils as utils
@@ -9,6 +11,7 @@
 
 utils.register_configs = MagicMock()
 utils.restart_map = MagicMock()
+
 import pg_dir_hooks as hooks
 
 utils.register_configs = _reg