Merge lp:~gnuoy/charm-helpers/more-openstack-tests into lp:charm-helpers

[Liam Young]

[lp:~gnuoy/charm-helpers/more-openstack-tests]

138. By Liam Young on 2014-04-07

Add network_manager test case for havana and minor tidy up

=== added file 'tests/contrib/openstack/test_neutron_utils.py'
--- tests/contrib/openstack/test_neutron_utils.py	1970-01-01 00:00:00 +0000
+++ tests/contrib/openstack/test_neutron_utils.py	2014-04-07 08:52:22 +0000
@@ -0,0 +1,160 @@
+import unittest
+from mock import patch
+from nose.tools import raises
+import charmhelpers.contrib.openstack.neutron as neutron
+
+TO_PATCH = [
+    'log',
+    'config',
+    'os_release',
+    'check_output',
+]
+
+
+class NeutronTests(unittest.TestCase):
+    def setUp(self):
+        for m in TO_PATCH:
+            setattr(self, m, self._patch(m))
+
+    def _patch(self, method):
+        _m = patch('charmhelpers.contrib.openstack.neutron.' + method)
+        mock = _m.start()
+        self.addCleanup(_m.stop)
+        return mock
+
+    def test_headers_package(self):
+        self.check_output.return_value = '3.13.0-19-generic'
+        kname = neutron.headers_package()
+        self.assertEquals(kname, 'linux-headers-3.13.0-19-generic')
+
+    def test_kernel_version(self):
+        self.check_output.return_value = '3.13.0-19-generic'
+        kver_maj, kver_min = neutron.kernel_version()
+        self.assertEquals((kver_maj, kver_min), (3, 13))
+
+    @patch.object(neutron, 'kernel_version')
+    def test_determine_dkms_package_old_kernel(self, _kernel_version):
+        _kernel_version.return_value = (3, 10)
+        dkms_package = neutron.determine_dkms_package()
+        self.assertEquals(dkms_package, ['openvswitch-datapath-dkms'])
+
+    @patch.object(neutron, 'kernel_version')
+    def test_determine_dkms_package_new_kernel(self, _kernel_version):
+        _kernel_version.return_value = (3, 13)
+        dkms_package = neutron.determine_dkms_package()
+        self.assertEquals(dkms_package, [])
+
+    def test_quantum_plugins(self):
+        self.config.return_value = 'foo'
+        plugins = neutron.quantum_plugins()
+        self.assertEquals(plugins['ovs']['services'], ['quantum-plugin-openvswitch-agent'])
+        self.assertEquals(plugins['nvp']['services'], [])
+
+    def test_neutron_plugins_preicehouse(self):
+        self.config.return_value = 'foo'
+        self.os_release .return_value = 'havana'
+        plugins = neutron.neutron_plugins()
+        self.assertEquals(plugins['ovs']['config'], '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini')
+        self.assertEquals(plugins['nvp']['services'], [])
+
+    def test_neutron_plugins(self):
+        self.config.return_value = 'foo'
+        self.os_release .return_value = 'icehouse'
+        plugins = neutron.neutron_plugins()
+        self.assertEquals(plugins['ovs']['config'], '/etc/neutron/plugins/ml2/ml2_conf.ini')
+        self.assertEquals(plugins['nvp']['services'], [])
+
+    @patch.object(neutron, 'network_manager')
+    def test_neutron_plugin_attribute_quantum(self, _network_manager):
+        self.config.return_value = 'foo'
+        _network_manager.return_value = 'quantum'
+        plugins = neutron.neutron_plugin_attribute('ovs', 'services')
+        self.assertEquals(plugins, ['quantum-plugin-openvswitch-agent'])
+
+    @patch.object(neutron, 'network_manager')
+    def test_neutron_plugin_attribute_neutron(self, _network_manager):
+        self.config.return_value = 'foo'
+        self.os_release .return_value = 'icehouse'
+        _network_manager.return_value = 'neutron'
+        plugins = neutron.neutron_plugin_attribute('ovs', 'services')
+        self.assertEquals(plugins, ['neutron-plugin-openvswitch-agent'])
+
+    @raises(Exception)
+    @patch.object(neutron, 'network_manager')
+    def test_neutron_plugin_attribute_foo(self, _network_manager):
+        _network_manager.return_value = 'foo'
+        self.assertRaises(Exception, neutron.neutron_plugin_attribute('ovs', 'services'))
+
+    @raises(Exception)
+    @patch.object(neutron, 'network_manager')
+    def test_neutron_plugin_attribute_plugin_keyerror(self, _network_manager):
+        self.config.return_value = 'foo'
+        _network_manager.return_value = 'quantum'
+        self.assertRaises(Exception, neutron.neutron_plugin_attribute('foo', 'foo'))
+
+    @patch.object(neutron, 'network_manager')
+    def test_neutron_plugin_attribute_attr_keyerror(self, _network_manager):
+        self.config.return_value = 'foo'
+        _network_manager.return_value = 'quantum'
+        plugins = neutron.neutron_plugin_attribute('ovs', 'foo')
+        self.assertEquals(plugins, None)
+
+    @raises(Exception)
+    def test_network_manager_essex(self):
+        essex_cases = {
+            'quantum': 'quantum',
+            'neutron': 'quantum',
+            'newhotness': 'newhotness',
+        }
+        self.os_release.return_value = 'essex'
+        for nwmanager in essex_cases:
+            self.config.return_value = nwmanager
+            self.assertRaises(Exception, neutron.network_manager())
+
+    def test_network_manager_folsom(self):
+        folsom_cases = {
+            'quantum': 'quantum',
+            'neutron': 'quantum',
+            'newhotness': 'newhotness',
+        }
+        self.os_release.return_value = 'folsom'
+        for nwmanager in folsom_cases:
+            self.config.return_value = nwmanager
+            renamed_manager = neutron.network_manager()
+            self.assertEquals(renamed_manager, folsom_cases[nwmanager])
+
+    def test_network_manager_grizzly(self):
+        grizzly_cases = {
+            'quantum': 'quantum',
+            'neutron': 'quantum',
+            'newhotness': 'newhotness',
+        }
+        self.os_release.return_value = 'grizzly'
+        for nwmanager in grizzly_cases:
+            self.config.return_value = nwmanager
+            renamed_manager = neutron.network_manager()
+            self.assertEquals(renamed_manager, grizzly_cases[nwmanager])
+
+    def test_network_manager_havana(self):
+        havana_cases = {
+            'quantum': 'neutron',
+            'neutron': 'neutron',
+            'newhotness': 'newhotness',
+        }
+        self.os_release.return_value = 'havana'
+        for nwmanager in havana_cases:
+            self.config.return_value = nwmanager
+            renamed_manager = neutron.network_manager()
+            self.assertEquals(renamed_manager, havana_cases[nwmanager])
+
+    def test_network_manager_icehouse(self):
+        icehouse_cases = {
+            'quantum': 'neutron',
+            'neutron': 'neutron',
+            'newhotness': 'newhotness',
+        }
+        self.os_release.return_value = 'icehouse'
+        for nwmanager in icehouse_cases:
+            self.config.return_value = nwmanager
+            renamed_manager = neutron.network_manager()
+            self.assertEquals(renamed_manager, icehouse_cases[nwmanager])

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2014-04-02 11:35:51 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2014-04-07 08:52:22 +0000
@@ -74,6 +74,14 @@
     'password': 'foo',
 }
 
+SHARED_DB_RELATION_SSL = {
+    'db_host': 'dbserver.local',
+    'password': 'foo',
+    'ssl_ca': 'Zm9vCg==',
+    'ssl_cert': 'YmFyCg==',
+    'ssl_key': 'Zm9vYmFyCg==',
+}
+
 SHARED_DB_CONFIG = {
     'database-user': 'adam',
     'database': 'foodb',
@@ -140,6 +148,15 @@
     'vip': '10.0.0.1',
 }
 
+AMQP_RELATION_WITH_SSL = {
+    'private-address': 'rabbithost',
+    'password': 'foobar',
+    'vip': '10.0.0.1',
+    'ssl_port': 5671,
+    'ssl_ca': 'cert',
+    'ha_queues': 'queues',
+}
+
 AMQP_AA_RELATION = {
     'amqp:0': {
         'rabbitmq/0': {
@@ -227,6 +244,7 @@
     'determine_apache_port',
     'config',
     'is_clustered',
+    'time',
 ]
 
 
@@ -274,6 +292,36 @@
         }
         self.assertEquals(result, expected)
 
+    @patch('os.path.exists')
+    @patch('__builtin__.open')
+    def test_db_ssl(self, _open, osexists):
+        osexists.return_value = False
+        ssl_dir = '/etc/dbssl'
+        db_ssl_ctxt = context.db_ssl(SHARED_DB_RELATION_SSL, {}, ssl_dir)
+        expected = {
+            'database_ssl_ca': ssl_dir + '/db-client.ca',
+            'database_ssl_cert': ssl_dir + '/db-client.cert',
+            'database_ssl_key': ssl_dir + '/db-client.key',
+        }
+        files = [
+            call(expected['database_ssl_ca'], 'w'),
+            call(expected['database_ssl_cert'], 'w'),
+            call(expected['database_ssl_key'], 'w')
+        ]
+        for f in files:
+            self.assertIn(f, _open.call_args_list)
+        self.assertEquals(db_ssl_ctxt, expected)
+        decode = [
+            call(SHARED_DB_RELATION_SSL['ssl_ca']),
+            call(SHARED_DB_RELATION_SSL['ssl_cert']),
+            call(SHARED_DB_RELATION_SSL['ssl_key'])
+        ]
+        self.assertEquals(decode, self.b64decode.call_args_list)
+
+    def test_db_ssl_nossldir(self):
+        db_ssl_ctxt = context.db_ssl(SHARED_DB_RELATION_SSL, {}, None)
+        self.assertEquals(db_ssl_ctxt, {})
+
     def test_shared_db_context_with_missing_relation(self):
         '''Test shared-db context missing relation data'''
         incomplete_relation = copy(SHARED_DB_RELATION)
@@ -442,6 +490,46 @@
         }
         self.assertEquals(result, expected)
 
+    @patch('__builtin__.open')
+    def test_amqp_context_with_data_ssl(self, _open):
+        '''Test amqp context with all required data and ssl'''
+        relation = FakeRelation(relation_data=AMQP_RELATION_WITH_SSL)
+        self.relation_get.side_effect = relation.get
+        self.config.return_value = AMQP_CONFIG
+        ssl_dir = '/etc/sslamqp'
+        amqp = context.AMQPContext(ssl_dir=ssl_dir)
+        result = amqp()
+        expected = {
+            'rabbitmq_host': 'rabbithost',
+            'rabbitmq_password': 'foobar',
+            'rabbitmq_user': 'adam',
+            'rabbit_ssl_port': 5671,
+            'rabbitmq_virtual_host': 'foo',
+            'rabbit_ssl_ca': ssl_dir + '/rabbit-client-ca.pem',
+            'rabbitmq_ha_queues': True,
+        }
+        _open.assert_called_once_with(ssl_dir + '/rabbit-client-ca.pem', 'w')
+        self.assertEquals(result, expected)
+        self.assertEquals([call(AMQP_RELATION_WITH_SSL['ssl_ca'])], self.b64decode.call_args_list)
+
+    def test_amqp_context_with_data_ssl_noca(self):
+        '''Test amqp context with all required data with ssl but missing ca'''
+        relation = FakeRelation(relation_data=AMQP_RELATION_WITH_SSL)
+        self.relation_get.side_effect = relation.get
+        self.config.return_value = AMQP_CONFIG
+        amqp = context.AMQPContext()
+        result = amqp()
+        expected = {
+            'rabbitmq_host': 'rabbithost',
+            'rabbitmq_password': 'foobar',
+            'rabbitmq_user': 'adam',
+            'rabbit_ssl_port': 5671,
+            'rabbitmq_virtual_host': 'foo',
+            'rabbit_ssl_ca': 'cert',
+            'rabbitmq_ha_queues': True,
+        }
+        self.assertEquals(result, expected)
+
     def test_amqp_context_with_data_clustered(self):
         '''Test amqp context with all required data with clustered rabbit'''
         relation_data = copy(AMQP_RELATION)
@@ -500,6 +588,14 @@
         amqp = context.AMQPContext()
         self.assertRaises(context.OSContextError, amqp)
 
+    def test_ceph_no_relids(self):
+        '''Test empty ceph realtion'''
+        relation = FakeRelation(relation_data={})
+        self.relation_ids.side_effect = relation.get
+        ceph = context.CephContext()
+        result = ceph()
+        self.assertEquals(result, {})
+
     @patch.object(context, 'config')
     @patch('os.path.isdir')
     @patch('os.mkdir')
@@ -753,6 +849,21 @@
             'neutron_security_groups': True,
             'local_ip': '10.0.0.1'}, neutron.ovs_ctxt())
 
+    @patch.object(context.NeutronContext, 'neutron_security_groups')
+    @patch.object(context, 'unit_private_ip')
+    @patch.object(context, 'neutron_plugin_attribute')
+    def test_neutron_nvp_plugin_context(self, attr, ip, sec_groups):
+        ip.return_value = '10.0.0.1'
+        sec_groups.__get__ = MagicMock(return_value=True)
+        attr.return_value = 'some.quantum.driver.class'
+        neutron = context.NeutronContext()
+        self.assertEquals({
+            'config': 'some.quantum.driver.class',
+            'core_plugin': 'some.quantum.driver.class',
+            'neutron_plugin': 'nvp',
+            'neutron_security_groups': True,
+            'local_ip': '10.0.0.1'}, neutron.nvp_ctxt())
+
     @patch('charmhelpers.contrib.openstack.context.unit_get')
     @patch.object(context.NeutronContext, 'network_manager')
     def test_neutron_neutron_ctxt(self, mock_network_manager,