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

[James Page]

=== modified file 'tests/00-setup' (properties changed: +x to -x)
=== modified file 'tests/006-minimal-trusty-kilo-mem'
--- tests/006-minimal-trusty-kilo-mem	2016-02-12 00:39:19 +0000
+++ tests/006-minimal-trusty-kilo-mem	2016-02-16 14:29:04 +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-12 00:39:19 +0000
+++ tests/010-basic-trusty-juno	2016-02-16 14:29:04 +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-12 00:39:19 +0000
+++ tests/011-basic-trusty-kilo	2016-02-16 14:29:04 +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-12 00:39:19 +0000
+++ tests/012-basic-trusty-liberty	2016-02-16 14:29:04 +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-12 00:39:19 +0000
+++ tests/basic_deployment.py	2016-02-16 14:29:04 +0000
@@ -31,7 +31,7 @@
 SETUP_TIMEOUT = 9600
 
 
-class ApiMinimumDeployment():
+class AgentMinimumDeployment():
     def __init__(self, ubuntu_series, openstack_origin=None,
                  midonet_origin=None):
         self.os_release = openstack_origin
@@ -60,29 +60,28 @@
         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,
-                   series=self.series)
-        self.d.add('rabbitmq', charm='cs:trusty/rabbitmq-server', units=1,
-                   series=self.series)
-        self.d.add('nova', charm='cs:trusty/nova-cloud-controller', units=1,
-                   series=self.series)
-        self.d.add(
-            'neutron', charm='neutron-api', units=1,
-            branch='lp:~openstack-charmers/charms/trusty/neutron-api/next',
-            series=self.series)
+        self.d.add('zookeeper', charm='zookeeper', units=1,
+                   series=self.series)
+        self.d.add('rabbitmq', charm='rabbitmq-server', units=1,
+                   series=self.series)
+        self.d.add('nova', charm='nova-cloud-controller', units=1,
+                   series=self.series)
+        self.d.add('neutron',
+                   charm='cs:~openstack-charmers-next/trusty/neutron-api',
+                   units=1,
+                   series=self.series)
         self.d.add('midonet-api', charm='midonet-api',
                    branch='lp:~celebdor/charms/trusty/midonet-api/trunk',
                    series=self.series)
         self.d.add('midonet-agent', charm='midonet-agent',
                    branch='lp:~celebdor/charms/trusty/midonet-agent/trunk',
                    series=self.series)
-        self.d.add('neutron-agents-midonet')
+        self.d.add('neutron-agents-midonet', constraints={'mem': "4G"})
 
     def _add_relations(self):
         # Keystone
 
=== modified file 'unit_tests/test_context.py'
--- unit_tests/test_context.py	2016-02-11 13:12:41 +0000
+++ unit_tests/test_context.py	2016-02-16 14:29:04 +0000
@@ -60,28 +60,15 @@
         test.CharmTestCase.setUp(self, services.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.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',