← Back to branch summary

~brad-marshall/charms/trusty/cinder/haproxy-add-timeout

« back to all changes in this revision

Viewing changes to unit_tests/test_cinder_utils.py

Tags: 15.10
[hopem, r=gnuoy] 

    Add support for cinder-backup subordinate

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_cinder_utils.py
151
151
 
152
152
    def test_services(self):
153
153
        self.assertEquals(cinder_utils.services(),
154
 
                          ['haproxy', 'apache2', 'cinder-api',
155
 
                           'cinder-volume', 'cinder-scheduler'])
 
154
                          ['haproxy', 'cinder-backup', 'cinder-api',
 
155
                           'cinder-volume', 'apache2', 'cinder-scheduler'])
156
156
 
157
157
    def test_creates_restart_map_all_enabled(self):
158
158
        'It creates correct restart map when all services enabled'
159
159
        ex_map = OrderedDict([
160
160
            ('/etc/cinder/cinder.conf', ['cinder-api', 'cinder-volume',
161
 
                                         'cinder-scheduler', 'haproxy']),
 
161
                                         'cinder-backup', 'cinder-scheduler',
 
162
                                         'haproxy']),
162
163
            ('/etc/cinder/api-paste.ini', ['cinder-api']),
163
 
            ('/var/lib/charm/cinder/ceph.conf', ['cinder-volume']),
 
164
            ('/var/lib/charm/cinder/ceph.conf', ['cinder-volume',
 
165
                                                 'cinder-backup']),
164
166
            ('/etc/haproxy/haproxy.cfg', ['haproxy']),
165
167
            ('/etc/apache2/sites-available/openstack_https_frontend',
166
168
             ['apache2']),
723
725
        ]
724
726
        self.assertEquals(render.call_args_list, expected)
725
727
        expected = [
726
 
            call('tgtd'), call('haproxy'), call('apache2'),
727
 
            call('cinder-api'), call('cinder-volume'),
 
728
            call('tgtd'), call('haproxy'), call('cinder-backup'),
 
729
            call('cinder-api'), call('cinder-volume'), call('apache2'),
728
730
            call('cinder-scheduler'),
729
731
        ]
730
732
        self.assertEquals(service_restart.call_args_list, expected)