Merge lp:~james-page/charms/trusty/neutron-gateway/liberty into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

[James Page]

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

charm_lint_check #10121 neutron-gateway-next for james-page mp271245
    LINT OK: passed

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

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

charm_unit_test #9284 neutron-gateway-next for james-page mp271245
    UNIT OK: passed

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

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

charm_amulet_test #6459 neutron-gateway-next for james-page mp271245
    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/12425404/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6459/

[Liam Young (gnuoy)]

Approve, amulet fail looks unrelated

review: Approve

=== modified file '.project'
--- .project	2012-12-06 10:22:24 +0000
+++ .project	2015-09-16 08:26:02 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>quantum-gateway</name>
+	<name>neutron-gateway</name>
 	<comment></comment>
 	<projects>
 	</projects>
 
=== modified file '.pydevproject'
--- .pydevproject	2013-07-19 09:46:25 +0000
+++ .pydevproject	2015-09-16 08:26:02 +0000
@@ -3,7 +3,7 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/quantum-gateway/hooks</path>
-<path>/quantum-gateway/unit_tests</path>
+<path>/neutron-gateway/hooks</path>
+<path>/neutron-gateway/unit_tests</path>
 </pydev_pathproperty>
 </pydev_project>
 
=== modified file 'hooks/neutron_utils.py'
--- hooks/neutron_utils.py	2015-07-09 11:02:45 +0000
+++ hooks/neutron_utils.py	2015-09-16 08:26:02 +0000
@@ -250,6 +250,13 @@
             packages.append('openswan')
         if source >= 'kilo':
             packages.append('python-neutron-fwaas')
+        if source >= 'liberty':
+            # Switch out mysql driver
+            packages.remove('python-mysqldb')
+            packages.append('python-pymysql')
+            # Switch out to actual metering agent package
+            packages.remove('neutron-plugin-metering-agent')
+            packages.append('neutron-metering-agent')
     packages.extend(determine_l3ha_packages())
 
     if git_install_requested():
 
=== modified file 'unit_tests/test_neutron_hooks.py'
--- unit_tests/test_neutron_hooks.py	2015-07-09 11:02:45 +0000
+++ unit_tests/test_neutron_hooks.py	2015-09-16 08:26:02 +0000
@@ -162,7 +162,7 @@
         self.assertTrue(_amqp_joined.called)
         self.assertTrue(_amqp_nova_joined.called)
         self.assertTrue(_zmq_joined.called)
-        self.create_sysctl.assert_called()
+        self.assertTrue(self.create_sysctl.called)
 
     @patch.object(hooks, 'git_install_requested')
     def test_config_changed_upgrade(self, git_requested):
@@ -235,7 +235,7 @@
         self.assertTrue(_amqp_joined.called)
         self.assertTrue(_amqp_nova_joined.called)
         self.assertTrue(_zmq_joined.called)
-        self.create_sysctl.assert_called()
+        self.assertTrue(self.create_sysctl.called)
 
     def test_upgrade_charm(self):
         _install = self.patch('install')
 
=== modified file 'unit_tests/test_neutron_utils.py'
--- unit_tests/test_neutron_utils.py	2015-07-09 11:02:45 +0000
+++ unit_tests/test_neutron_utils.py	2015-09-16 08:26:02 +0000
@@ -159,6 +159,17 @@
         self.assertTrue('python-neutron-fwaas' in neutron_utils.get_packages())
 
     @patch.object(neutron_utils, 'git_install_requested')
+    def test_get_packages_ovs_liberty(self, git_requested):
+        git_requested.return_value = False
+        self.config.return_value = 'ovs'
+        self.get_os_codename_install_source.return_value = 'liberty'
+        packages = neutron_utils.get_packages()
+        self.assertTrue('neutron-metering-agent' in packages)
+        self.assertFalse('neutron-plugin-metering-agent' in packages)
+        self.assertFalse('python-mysqldb' in packages)
+        self.assertTrue('python-pymysql' in packages)
+
+    @patch.object(neutron_utils, 'git_install_requested')
     def test_get_packages_l3ha(self, git_requested):
         git_requested.return_value = False
         self.config.return_value = 'ovs'