Merge lp:~james-page/charms/trusty/midonet-agent/trunk into lp:~celebdor/charms/trusty/midonet-agent/trunk

[James Page]

Misc fixes for tests from final review.

=== modified file 'hooks/install'
--- hooks/install	2015-08-11 22:57:10 +0000
+++ hooks/install	2016-02-15 13:22:03 +0000
@@ -16,6 +16,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import subprocess
+import os
 
 from charmhelpers import fetch  # noqa
 from midonet_helpers import puppet
@@ -27,12 +28,15 @@
 puppet.module_install('midonet-midonet')
 puppet.set_juju_hierarchy(extra_data_dirs=['midonet_agent'])
 
-# Reload the ovs module
-try:
-    subprocess.check_call(['rmmod', 'openvswitch'])
-except subprocess.CalledProcessError:
-    pass  # This will fail when openvswitch was not loaded, which is fine
-subprocess.check_call(['modprobe', 'openvswitch'])
+# NOTE(jamespage): This works for trusty, but will need a better
+#                  check for xenial (systemd provides a helper)
+if not os.path.exists('/run/container_type'):
+    # Reload the ovs module
+    try:
+        subprocess.check_call(['rmmod', 'openvswitch'])
+    except subprocess.CalledProcessError:
+        pass  # This will fail when openvswitch was not loaded, which is fine
+    subprocess.check_call(['modprobe', 'openvswitch'])
 
-# Make sure gre is loaded
-subprocess.check_call(['modprobe', 'gre'])
+    # Make sure gre is loaded
+    subprocess.check_call(['modprobe', 'gre'])
 
=== modified file 'tests/006-minimal-trusty-kilo-mem.py'
--- tests/006-minimal-trusty-kilo-mem.py	2016-02-11 23:08:32 +0000
+++ tests/006-minimal-trusty-kilo-mem.py	2016-02-15 13:22:03 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright (c) 2015 Midokura SARL, All Rights Reserved.
 #
 
=== modified file 'tests/010-basic-trusty-juno'
--- tests/010-basic-trusty-juno	2016-02-11 23:08:32 +0000
+++ tests/010-basic-trusty-juno	2016-02-15 13:22:03 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright (c) 2015 Midokura SARL, All Rights Reserved.
 #
 
=== modified file 'tests/011-basic-trusty-kilo'
--- tests/011-basic-trusty-kilo	2016-02-11 23:08:32 +0000
+++ tests/011-basic-trusty-kilo	2016-02-15 13:22:03 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright (c) 2015 Midokura SARL, All Rights Reserved.
 #
 
=== modified file 'tests/012-basic-trusty-liberty'
--- tests/012-basic-trusty-liberty	2016-02-11 23:08:32 +0000
+++ tests/012-basic-trusty-liberty	2016-02-15 13:22:03 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright (c) 2015 Midokura SARL, All Rights Reserved.
 #
 
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2016-02-11 23:08:32 +0000
+++ tests/basic_deployment.py	2016-02-15 13:22:03 +0000
@@ -36,8 +36,6 @@
                  midonet_origin=None):
         self.os_release = openstack_origin
         self.series = ubuntu_series
-        self.midonet_release = (openstack_origin.split('-')[-1] + '/' +
-            midonet_origin)
         self.midonet_origin = midonet_origin
         self.mem = self.midonet_origin[:3] == 'mem'
         self.mem_credentials = {'mem-username': os.getenv('MEM_USERNAME'),
@@ -65,16 +63,15 @@
         self._initialize_tests()
 
     def _add_services(self):
-        self.d.add('mysql', charm='cs:trusty/mysql', units=1,
+        self.d.add('mysql', charm='mysql', units=1,
                    series=self.series)
-        self.d.add('keystone', charm='keystone', units=1, series=self.series,
-                    branch='cs:trusty/keystone')
-        self.d.add('cassandra', charm='cs:trusty/cassandra',
+        self.d.add('keystone', charm='keystone', units=1,
+                    series=self.series)
+        self.d.add('cassandra', charm='cassandra',
                    units=1, series=self.series)
-        self.d.add('zookeeper', charm='cs:trusty/zookeeper', units=1,
+        self.d.add('zookeeper', charm='zookeeper', units=1,
                    series=self.series)
         self.d.add('compute', charm='nova-compute', units=1,
-                   branch='lp:~celebdor/charms/trusty/nova-compute/trunk',
                    series=self.series, constraints={'mem': "4G"})
         self.d.add('midonet-api', charm='midonet-api', units=1,
                    branch='lp:~celebdor/charms/trusty/midonet-api/trunk',
@@ -117,16 +114,12 @@
                          'flat-interface': 'eth0',
                          'manage-neutron-plugin-legacy-mode': 'false'})
 
-        api_config = {'midonet-release': self.midonet_release}
-        if self.mem:
-            api_config.update(self.mem_credentials)
-        self.d.configure('midonet-api', api_config)
-
-        agent_config = {'midonet-origin': self.midonet_origin,
-                        'openstack-origin': self.os_release}
-        if self.mem:
-            agent_config.update(self.mem_credentials)
-        self.d.configure('midonet-agent', agent_config)
+        midonet_config = {'midonet-origin': self.midonet_origin,
+                          'openstack-origin': self.os_release}
+        if self.mem:
+            midonet_config.update(self.mem_credentials)
+        self.d.configure('midonet-api', midonet_config)
+        self.d.configure('midonet-agent', midonet_config)
 
     def _deploy(self):
         try:
 
=== modified file 'unit_tests/test_context.py'
--- unit_tests/test_context.py	2016-02-11 11:14:48 +0000
+++ unit_tests/test_context.py	2016-02-15 13:22:03 +0000
@@ -43,29 +43,15 @@
         test.CharmTestCase.setUp(self, services.base.hookenv, HOOKENV_PATCHES)
 
         def lsb_release():
-            ubuntu_trusty = {
+            return {
                 'DISTRIB_ID': 'Ubuntu',
                 'DISTRIB_RELEASE': '14.04',
                 'DISTRIB_CODENAME': 'trusty',
                 'DISTRIB_DESCRIPTION': "Ubuntu 14.04.3 LTS",
             }
 
-            try:
-                data = services.host.lsb_release()
-            except Exception:
-                return ubuntu_trusty
-            if data.get('DISTRIB_ID') != 'Ubuntu':
-                return ubuntu_trusty
-            return data
-
         def get_os_codename_package(pkg, fatal=True):
-            version = 'liberty'
-            try:
-                ret_vers = services.helpers_utils.get_os_codename_package(
-                    pkg, fatal)
-            except Exception:
-                return version
-            return ret_vers
+            return 'liberty'
 
         self.patch_all(services.utils,
                        ('get_os_codename_package',