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

[Antoni Segura Puimedon]

[Antoni Segura Puimedon (celebdor)]

Looks good. Thanks Lucas!

review: Approve

=== added file 'tests/010-basic-trusty-juno'
--- tests/010-basic-trusty-juno	1970-01-01 00:00:00 +0000
+++ tests/010-basic-trusty-juno	2015-10-19 03:45:13 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2015 Midokura SARL, All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from basic_deployment import MidonetBasicDeployment
+
+if __name__ == '__main__':
+    deployment = MidonetBasicDeployment(ubuntu_series='trusty',
+                                        openstack='cloud:trusty-juno',
+                                        midonet_release='juno/midonet-2015.06')
+    deployment.run_tests()

=== added file 'tests/011-basic-trusty-kilo'
--- tests/011-basic-trusty-kilo	1970-01-01 00:00:00 +0000
+++ tests/011-basic-trusty-kilo	2015-10-19 03:45:13 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2015 Midokura SARL, All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from basic_deployment import MidonetBasicDeployment
+
+if __name__ == '__main__':
+    deployment = MidonetBasicDeployment(ubuntu_series='trusty',
+                                        openstack='cloud:trusty-kilo',
+                                        midonet_release='kilo/midonet-2015.06')
+    deployment.run_tests()

=== removed file 'tests/10-basic_deployment_test.py'
--- tests/10-basic_deployment_test.py	2015-08-03 18:30:50 +0000
+++ tests/10-basic_deployment_test.py	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-#!/usr/bin/env python3
-# vim: tabstop=4 shiftwidth=4 softtabstop=4 filetype=python
-#
-# Copyright (c) 2015 Midokura Europe SARL, All Rights Reserved.
-# All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-import amulet
-
-SETUP_TIMEOUT = 9600
-
-
-deployment = amulet.Deployment(series='trusty')
-deployment.add('zookeeper', charm='cs:trusty/zookeeper', units=1,
-               series='trusty')
-deployment.add('keystone', charm='cs:trusty/keystone', units=1,
-               series='trusty')
-deployment.configure('keystone', {'openstack-origin': 'cloud:trusty-juno'})
-deployment.add('mysql', charm='cs:trusty/mysql', units=1, series='trusty')
-deployment.relate('mysql:shared-db', 'keystone:shared-db')
-
-deployment.add('midonet-api', charm='midonet-api', units=1,
-               branch='lp:~celebdor/charms/trusty/midonet-api/trunk',
-               series='trusty')
-
-deployment.relate('midonet-api:zookeeper', 'zookeeper:zookeeper')
-deployment.relate('midonet-api:keystone', 'keystone:identity-admin')
-
-mn_version = '2015.01'
-
-try:
-    deployment.setup(timeout=SETUP_TIMEOUT)
-    deployment.sentry.wait()
-except amulet.helpers.TimeoutError:
-    amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
-
-mn_api_sentry = deployment.sentry.unit['midonet-api/0']
-zookeeper_sentry = deployment.sentry.unit['zookeeper/0']
-keystone_sentry = deployment.sentry.unit['keystone/0']
-
-zookeeper_relation = zookeeper_sentry.relation('zookeeper',
-                                               'midonet-api:zookeeper')
-keystone_relation = keystone_sentry.relation('identity-admin',
-                                             'midonet-api:keystone')
-
-# Check the key has been correctly fetched
-apt_key_out, apt_key_exit = mn_api_sentry.run('apt-key list | grep Midokura')
-if 'Midokura' not in apt_key_out:
-    message = ("midonet-api error, the repository keys are not installed")
-    amulet.raise_status(amulet.FAIL, msg=message)
-
-# Check if midonet-api package has been installed
-dpkg_api_out, dpkg_exit = mn_api_sentry.run('dpkg -l | grep midonet-api')
-if 'midonet-api' not in dpkg_api_out:
-    message = ("midonet-api error, the package is not installed")
-    amulet.raise_status(amulet.FAIL, msg=message)
-
-# Check if midonetclient package has been installed
-dpkg_client_out, dpkg_exit = mn_api_sentry.run('dpkg -l | grep midonetclient')
-if 'python-midonetclient' not in dpkg_client_out:
-    message = ("python-midonetclient error, the package is not installed")
-    amulet.raise_status(amulet.FAIL, msg=message)
-
-# Check if tomcat7 is installed and running
-tomcat7_out, tomcat7_exit = mn_api_sentry.run('service tomcat7 status')
-if tomcat7_exit == 1:
-    message = ("midonet-api setup error, tomcat7 is not installed")
-    amulet.raise_status(amulet.FAIL, msg=message)
-if tomcat7_exit == 0:
-    if 'running' not in tomcat7_out:
-        message = ("midonet-api setup error, tomcat7 is not running")
-        amulet.raise_status(amulet.FAIL, msg=message)
-
-# Check midonetrc
-mn_rc_out, mn_rc_exit = mn_api_sentry.run(
-                 '[ -f /root/.midonetrc ] && echo \"True\" || echo \"False\"')
-if 'True' not in mn_rc_out:
-    message = ("error: .midonetrc not found")
-    amulet.raise_status(amulet.FAIL, msg=message)
-# Check cli
-cli_out, mn_exit = mn_api_sentry.run('midonet-cli -e create bridge name test')
-if mn_exit != 0:
-    message = ("midonet-cli error: %s" % cli_out)
-    amulet.raise_status(amulet.FAIL, msg=message)
-
-# Check if the bridge has been successfully created
-cli_out, mn_exit = mn_api_sentry.run('midonet-cli -e bridge list')
-if 'test' not in cli_out:
-    message = ("midonet-cli error: %s" % cli_out)
-    amulet.raise_status(amulet.FAIL, msg=message)
-
-print('midonet-api deploy and install tests completed successfully')

=== added file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	1970-01-01 00:00:00 +0000
+++ tests/basic_deployment.py	2015-10-19 03:45:13 +0000
@@ -0,0 +1,235 @@
+#!/usr/bin/env python3
+# vim: tabstop=4 shiftwidth=4 softtabstop=4 filetype=python
+#
+# Copyright (c) 2015 Midokura Europe SARL, All Rights Reserved.
+# All Rights Reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+import amulet
+
+from charmhelpers.contrib.openstack.amulet.utils import (
+    OpenStackAmuletUtils,
+    DEBUG,  # flake8: noqa
+    ERROR
+)
+
+# Use DEBUG to turn on debug logging
+u = OpenStackAmuletUtils(DEBUG)
+
+SETUP_TIMEOUT = 9600
+
+
+class MidonetBasicDeployment():
+    def __init__(self, ubuntu_series, openstack=None, midonet_release=None):
+        self.os_release = openstack
+        self.series = ubuntu_series
+        self.midonet_release = midonet_release
+        self.d = amulet.Deployment(series=self.series)
+        self._add_services()
+        self._add_relations()
+        self._configure_services()
+        self._deploy()
+        self._initialize_tests()
+
+    def _add_services(self):
+        self.d.add('mysql', charm='cs:trusty/mysql', units=1,
+                   series=self.series)
+        self.d.add('rabbitmq-server', charm='cs:trusty/rabbitmq-server',
+                   units=1, series=self.series)
+        self.d.add('cassandra', charm='cassandra', units=1,
+                   branch='lp:charms/cassandra', series=self.series)
+        self.d.add('keystone', charm='keystone', units=1, series=self.series,
+                    branch='lp:~celebdor/charms/trusty/keystone/trunk')
+        self.d.add('nova-compute', charm='nova-compute', units=1,
+                   branch='lp:~celebdor/charms/trusty/nova-compute/trunk',
+                   series=self.series)
+        self.d.add('neutron-api', charm='neutron-api', units=1,
+                   branch='lp:~celebdor/charms/trusty/neutron-api/trunk',
+                   series=self.series)
+        self.d.add('nova-cloud-controller', charm='nova-cloud-controller',
+               branch='lp:~celebdor/charms/trusty/nova-cloud-controller/trunk',
+               units=1, series=self.series)
+        self.d.add('zookeeper', charm='cs:trusty/zookeeper', units=1,
+                   series=self.series)
+        self.d.add('midonet-api', charm='midonet-api', units=1,
+                   branch='lp:~celebdor/charms/trusty/midonet-api/trunk',
+                   series=self.series)
+        self.d.add('midonet-agent', charm='midonet-agent', units=1,
+                   branch='lp:~celebdor/charms/trusty/midonet-agent/trunk',
+                   series=self.series)
+        self.d.add('neutron-agents-midonet', charm='neutron-agents-midonet',
+              branch='lp:~celebdor/charms/trusty/neutron-agents-midonet/trunk',
+              series='trusty')
+
+    def _add_relations(self):
+        self.d.relate('mysql:shared-db', 'keystone:shared-db')
+        self.d.relate('mysql:shared-db', 'nova-cloud-controller:shared-db')
+        self.d.relate('rabbitmq-server:amqp', 'nova-compute:amqp')
+        self.d.relate('rabbitmq-server:amqp', 'nova-cloud-controller:amqp')
+        self.d.relate('rabbitmq-server:amqp', 'neutron-api:amqp')
+        self.d.relate('nova-cloud-controller:identity-service',
+                      'keystone:identity-service')
+
+        self.d.relate('neutron-api:identity-service',
+                      'keystone:identity-service')
+        self.d.relate('nova-compute:cloud-compute',
+                      'nova-cloud-controller:cloud-compute')
+        self.d.relate('neutron-api:neutron-api',
+                      'nova-cloud-controller:neutron-api')
+
+        self.d.relate('keystone:identity-service', 'midonet-api:keystone')
+        self.d.relate('zookeeper:zookeeper', 'midonet-api:zookeeper')
+        self.d.relate('midonet-agent:host', 'midonet-api:host')
+        self.d.relate('neutron-api:midonet', 'midonet-api:midonet-api')
+
+        self.d.relate('neutron-agents-midonet:neutron_agents',
+                      'nova-cloud-controller:quantum-network-service')
+
+        self.d.relate('neutron-agents-midonet:neutron-plugin-api',
+                      'neutron-api:neutron-plugin-api')
+
+        self.d.relate('midonet-agent:neutron-plugin',
+                      'nova-compute:neutron-plugin')
+
+        self.d.relate('midonet-agent:host', 'neutron-api:midonet-host')
+        self.d.relate('midonet-agent:cassandra', 'cassandra:database')
+        self.d.relate('midonet-agent:zookeeper', 'zookeeper:zookeeper')
+
+    def _configure_services(self):
+        self.d.configure('keystone', {
+                         'enable-pki': 'false',
+                         'openstack-origin': self.os_release})
+
+        self.d.configure('cassandra', {
+            'allow-single-node': True,
+            'cluster-name': 'midonet',
+            'apt-repo-key': '7E41C00F85BFC1706C4FFFB3350200F2B999A372',
+            'apt-repo-spec':
+            'deb http://debian.datastax.com/community 2.0 main',
+            'extra_packages': 'openjdk-7-jre-headless dsc20'})
+
+        self.d.configure('mysql', {'max-connections': 2000})
+
+        self.d.configure('nova-compute', {
+                         'openstack-origin': self.os_release,
+                         'virt-type': 'qemu',
+                         'flat-interface': 'eth0',
+                         'manage-neutron-plugin-legacy-mode': 'false'})
+
+        self.d.configure('nova-cloud-controller', {
+                         'openstack-origin': self.os_release,
+                         'network-manager': 'Neutron',
+                         'shared_secret': 'secret'})
+
+        self.d.configure('neutron-api', {
+                         'neutron-plugin': 'midonet',
+                         'neutron-security-groups': 'True',
+                         'neutron-external-network': 'Public_Network',
+                         'l2-population': 'False',
+                         'openstack-origin': self.os_release,
+                         'midonet-release': self.midonet_release})
+
+        self.d.configure('midonet-api',
+                         {'midonet-release': self.midonet_release})
+
+        self.d.configure('neutron-agents-midonet',
+                         {'shared_secret': 'secret'})
+
+        self.d.configure('midonet-agent',
+                         {'midonet-release': self.midonet_release})
+
+    def _deploy(self):
+        try:
+            self.d.setup(timeout=SETUP_TIMEOUT)
+            self.d.sentry.wait(timeout=SETUP_TIMEOUT)
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(amulet.SKIP,
+                                msg="Environment wasn't stood up in time")
+
+    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.nova_compute_sentry = self.d.sentry.unit['nova-compute/0']
+        self.mn_api_sentry = self.d.sentry.unit['midonet-api/0']
+        self.mn_agent_sentry = self.d.sentry.unit['midonet-agent/0']
+        self.agents_mn_sentry = self.d.sentry.unit['neutron-agents-midonet/0']
+
+        self.keystone_api_relation = self.keystone_sentry.relation(
+             'identity-service', 'midonet-api:keystone')
+        self.zookeeper_api_relation = self.zookeeper_sentry.relation(
+             'zookeeper', 'midonet-api:zookeeper')
+        self.zk_host_relation = self.zookeeper_sentry.relation(
+                                'zookeeper', 'midonet-agent:zookeeper')
+        self.cs_host_relation = self.cassandra_sentry.relation(
+            'database', 'midonet-agent:cassandra')
+        self.api_host_relation = self.mn_api_sentry.relation(
+            'host', 'midonet-agent:host')
+
+    def run_tests(self):
+        for test in dir(self):
+            if test.startswith('test_'):
+                getattr(self, test)()
+
+    def test_mn_api(self):
+        u.log.debug('Checking if the repo key has been correctly fetched...')
+        apt_key_out, apt_key_exit = self.mn_agent_sentry.run(
+                                    'apt-key list | grep Midokura')
+        if 'Midokura' not in apt_key_out:
+            message = ("error, Midokura repository key is not installed")
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+        u.log.debug('Checking if midonet-api package has been installed...')
+        dpkg_api_out, dpkg_exit = self.mn_api_sentry.run(
+                                  'dpkg -l | grep midonet-api')
+        if 'midonet-api' not in dpkg_api_out:
+            message = ("error: midonet-api package is not installed")
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+        u.log.debug('Checking if midonetclient package has been installed...')
+        dpkg_client_out, dpkg_exit = self.mn_api_sentry.run(
+                                     'dpkg -l | grep midonetclient')
+        if 'python-midonetclient' not in dpkg_client_out:
+            message = ("error: python-midonetclient package is not installed")
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+        u.log.debug('Checking if tomcat7 is installed and running...')
+        tomcat7_out, tomcat7_exit = self.mn_api_sentry.run(
+                                    'service tomcat7 status')
+        if tomcat7_exit == 1:
+            message = ("midonet-api setup error, tomcat7 is not installed")
+            amulet.raise_status(amulet.FAIL, msg=message)
+        if tomcat7_exit == 0:
+            if 'running' not in tomcat7_out:
+                message = ("midonet-api setup error, tomcat7 is not running")
+                amulet.raise_status(amulet.FAIL, msg=message)
+
+        u.log.debug('Checking if midonetrc exists...')
+        mn_rc_out, mn_rc_exit = self.mn_api_sentry.run(
+                  '[ -f /root/.midonetrc ] && echo \"True\" || echo \"False\"')
+        if 'True' not in mn_rc_out:
+            message = ("error: .midonetrc not found")
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+        u.log.debug('Checking midonet-cli...')
+        cli_out, mn_exit = self.mn_api_sentry.run(
+                           'midonet-cli -e create bridge name test')
+        if mn_exit != 0:
+            message = ("midonet-cli error: %s" % cli_out)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+        u.log.debug('Checking if the bridge has been successfully created...')
+        cli_out, mn_exit = self.mn_api_sentry.run('midonet-cli -e bridge list')
+        if 'test' not in cli_out:
+            message = ("midonet-cli error: %s" % cli_out)
+            amulet.raise_status(amulet.FAIL, msg=message)