← Back to branch summary

~jose/charms/precise/glance/add-blank-defaults

« back to all changes in this revision

Viewing changes to unit_tests/test_glance_contexts.py

  • Committer: James Page
  • Date: 2014-02-19 10:50:25 UTC
  • mfrom: (43.2.4 tls-ha)
  • Revision ID: james.page@canonical.com-20140219105025-x97yfrpji0js8chh
[ivoks,r=james-page] Re-order port pipeline to ensure end-to-end SSL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_glance_contexts.py
9
9
    'relation_ids',
10
10
    'is_relation_made',
11
11
    'service_name',
12
 
    'determine_haproxy_port',
 
12
    'determine_apache_port',
13
13
    'determine_api_port',
14
14
]
15
15
 
41
41
            {'rbd_pool': service,
42
42
             'rbd_user': service})
43
43
 
44
 
    def test_haproxy_configuration(self):
45
 
        self.determine_haproxy_port.return_value = 9292
46
 
        self.determine_api_port.return_value = 9282
47
 
        self.assertEquals(
48
 
            contexts.HAProxyContext()(),
49
 
            {'service_ports': {'glance_api': [9292, 9282]},
50
 
             'bind_port': 9282})
51
 
 
 
44
    @patch('charmhelpers.contrib.openstack.context.determine_apache_port')
 
45
    @patch('charmhelpers.contrib.openstack.context.determine_api_port')
 
46
    @patch('charmhelpers.contrib.openstack.context.unit_get')
52
47
    @patch('charmhelpers.contrib.openstack.context.https')
53
 
    def test_apache_ssl_context_service_enabled(self,
54
 
                                                https):
55
 
        https.return_value = False
56
 
        self.assertEquals(contexts.ApacheSSLContext()(), {})
 
48
    def test_apache_ssl_context_service_enabled(self, mock_https,
 
49
                                                mock_unit_get,
 
50
                                                mock_determine_api_port,
 
51
                                                mock_determine_apache_port):
 
52
        mock_https.return_value = True
 
53
        mock_unit_get.return_value = '1.2.3.4'
 
54
        mock_determine_api_port.return_value = '12'
 
55
        mock_determine_apache_port.return_value = '34'
 
56
 
 
57
        ctxt = contexts.ApacheSSLContext()
 
58
        with patch.object(ctxt, 'enable_modules') as mock_enable_modules:
 
59
            with patch.object(ctxt, 'configure_cert') as mock_configure_cert:
 
60
                self.assertEquals(ctxt(), {'endpoints': [(34, 12)],
 
61
                                           'private_address': '1.2.3.4',
 
62
                                           'namespace': 'glance'})
 
63
                self.assertTrue(mock_https.called)
 
64
                mock_unit_get.assert_called_with('private-address')