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

[James Page]

[James Page (james-page)]

Just running this through final testing - please don't merge yet!

=== modified file 'tests/00-setup' (properties changed: +x to -x)
=== modified file 'tests/006-minimal-trusty-kilo-mem.py'
--- tests/006-minimal-trusty-kilo-mem.py	2016-02-11 16:56:30 +0000
+++ tests/006-minimal-trusty-kilo-mem.py	2016-02-16 09:45:21 +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 16:56:30 +0000
+++ tests/010-basic-trusty-juno	2016-02-16 09:45:21 +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 16:56:30 +0000
+++ tests/011-basic-trusty-kilo	2016-02-16 09:45:21 +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 17:29:46 +0000
+++ tests/012-basic-trusty-liberty	2016-02-16 09:45:21 +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 21:19:09 +0000
+++ tests/basic_deployment.py	2016-02-16 09:45:21 +0000
@@ -62,14 +62,16 @@
         self._initialize_tests()
 
     def _add_services(self):
-        self.d.add('mysql', charm='cs:trusty/mysql', units=1,
-                   series=self.series)
-        self.d.add('keystone', charm='keystone', units=1, series=self.series,
-                    branch='cs:trusty/keystone')
-        self.d.add('zookeeper', charm='cs:trusty/zookeeper', units=1,
-                   series=self.series)
-        self.d.add('compute', charm='cs:trusty/nova-compute', units=1,
-                   series=self.series)
+        self.d.add('mysql', charm='mysql', units=1,
+                   series=self.series)
+        self.d.add('keystone', charm='keystone', units=1,
+                   series=self.series)
+        self.d.add('zookeeper', charm='zookeeper', units=1,
+                   series=self.series)
+        self.d.add('cassandra', charm='cassandra',
+                   units=1, series=self.series)
+        self.d.add('compute', charm='nova-compute', units=1,
+                   series=self.series, constraints={'mem': "4G"})
         self.d.add('midonet-agent', charm='midonet-agent',
                    branch='lp:~celebdor/charms/trusty/midonet-agent/trunk',
                    series=self.series)
@@ -80,8 +82,8 @@
         self.d.relate('keystone:identity-service', 'midonet-api:keystone')
         self.d.relate('zookeeper:zookeeper', 'midonet-api:zookeeper')
 
-        self.d.relate('keystone:identity-service', 'midonet-api:keystone')
-        self.d.relate('zookeeper:zookeeper', 'midonet-api:zookeeper')
+        self.d.relate('midonet-agent:cassandra', 'cassandra:database')
+        self.d.relate('midonet-agent:zookeeper', 'zookeeper:zookeeper')
 
         self.d.relate('midonet-agent:neutron-plugin', 'compute:neutron-plugin')
         self.d.relate('midonet-agent:host', 'midonet-api:host')
@@ -94,6 +96,14 @@
                          'enable-pki': 'false',
                          'openstack-origin': self.os_release})
 
+        self.d.configure('cassandra', {
+            'authenticator': 'AllowAllAuthenticator',
+            'cluster_name': 'midonet',
+            'install_keys': '7E41C00F85BFC1706C4FFFB3350200F2B999A372',
+            'install_sources':
+            'deb http://debian.datastax.com/community 2.0 main',
+            'extra_packages': 'dsc20'})
+
         self.d.configure('mysql', {'max-connections': 500})
 
         api_config = {'midonet-origin': self.midonet_origin,
@@ -115,6 +125,7 @@
     def _initialize_tests(self):
         self.zookeeper_sentry = self.d.sentry.unit['zookeeper/0']
         self.keystone_sentry = self.d.sentry.unit['keystone/0']
+        self.cassandra_sentry = self.d.sentry.unit['cassandra/0']
         self.mn_api_sentry = self.d.sentry.unit['midonet-api/0']
 
         self.keystone_api_relation = self.keystone_sentry.relation(
@@ -185,6 +196,7 @@
         cli_out, mn_exit = self.mn_api_sentry.run(
             'midonet-cli -e tunnel-zone list')
         if cli_out:
+            tz_uuid = None
             try:
                 tz_uuid = uuid.UUID(cli_out.split(' ')[1], version=4)
             except Exception as ex:
@@ -192,8 +204,13 @@
                     amulet.FAIL,
                     msg='Failed to verify tunnel zone creation and membership.'
                         ' %s' % ex)
-        cli_out, mn_exit = self.mn_api_sentry.run(
-            'midonet-cli -e tunnel-zone %s member list' % tz_uuid)
-        if 'host' not in cli_out:
-            message = ("Failed to see host in the tunnel zone: %s" % cli_out)
+
+            cli_out, mn_exit = self.mn_api_sentry.run(
+                'midonet-cli -e tunnel-zone %s member list' % tz_uuid)
+            if 'host' not in cli_out:
+                message = ("Failed to see host in the tunnel zone: %s" % cli_out)
+                amulet.raise_status(amulet.FAIL, msg=message)
+        else:
+            message = ("Failed to detect tunnel-zone uuid")
             amulet.raise_status(amulet.FAIL, msg=message)
+