← Back to branch summary

~ubuntu-branches/ubuntu/utopic/cinder/utopic

« back to all changes in this revision

Viewing changes to cinder/tests/test_block_device.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Adam Gandelman, Chuck Short
  • Date: 2013-09-08 21:09:46 UTC
  • mfrom: (1.1.18)
  • Revision ID: package-import@ubuntu.com-20130908210946-3dbzq1jy5uji4wad
Tags: 1:2013.2~b3-0ubuntu1
https://launchpad.net/bugs/1190791
[ James Page ]
* d/control: Switch ceph-common -> python-ceph inline with upstream
  refactoring of Ceph RBD driver, move to Suggests of python-cinder.
  (LP: #1190791). 

[ Adam Gandelman ]
* debian/patches/avoid_paramiko_vers_depends.patch: Dropped, no longer
  required.
* Add minimum requirement python-greenlet (>= 0.3.2).
* Add minimum requirement python-eventlet (>= 0.12.0).
* Add minimum requirement python-paramiko (>= 1.8).

[ Chuck Short ]
* New upstream release.
* debian/patches/skip-sqlachemy-failures.patch: Skip testfailures
  with sqlalchemy 0.8 until they are fixed upstream.
* debian/control: Add python-babel to build-depends.
* debian/control: Add python-novaclient to build-depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cinder/tests/test_block_device.py
24
24
import cinder.test
25
25
from cinder.volume.driver import ISCSIDriver
26
26
from cinder.volume.drivers.block_device import BlockDeviceDriver
 
27
from cinder.volume import utils as volutils
27
28
 
28
29
 
29
30
class TestBlockDeviceDriver(cinder.test.TestCase):
100
101
            'provider_location': 'None:3260,None None '
101
102
                                 'None dev_path'})
102
103
 
103
 
    def test_update_volume_status(self):
 
104
    def test_update_volume_stats(self):
104
105
        self.mox.StubOutWithMock(self.drv, '_devices_sizes')
105
106
        self.drv._devices_sizes().AndReturn({'/dev/loop1': 1024,
106
107
                                             '/dev/loop2': 1024})
110
111
        self.configuration.safe_get('volume_backend_name'). \
111
112
            AndReturn('BlockDeviceDriver')
112
113
        self.mox.ReplayAll()
113
 
        self.drv._update_volume_status()
 
114
        self.drv._update_volume_stats()
114
115
        self.assertEquals(self.drv._stats,
115
116
                          {'total_capacity_gb': 2,
116
117
                           'free_capacity_gb': 2,
118
119
                           self.configuration.reserved_percentage,
119
120
                           'QoS_support': False,
120
121
                           'vendor_name': "Open Source",
121
 
                           'driver_version': '1.0',
 
122
                           'driver_version': self.drv.VERSION,
122
123
                           'storage_protocol': 'unknown',
123
124
                           'volume_backend_name': 'BlockDeviceDriver',
124
125
                           })
131
132
        self.mox.StubOutWithMock(self.drv, 'find_appropriate_size_device')
132
133
        dev = self.drv.find_appropriate_size_device(TEST_SRC['size']).\
133
134
            AndReturn('/dev/loop2')
134
 
        self.mox.StubOutWithMock(self.drv, '_copy_volume')
 
135
        self.mox.StubOutWithMock(volutils, 'copy_volume')
135
136
        self.mox.StubOutWithMock(self.drv, 'local_path')
136
137
        self.mox.StubOutWithMock(self.drv, '_get_device_size')
137
138
        self.drv.local_path(TEST_SRC).AndReturn('/dev/loop1')
138
139
        self.drv._get_device_size('/dev/loop2').AndReturn(1)
139
 
        self.drv._copy_volume('/dev/loop1', dev, 2048)
 
140
        volutils.copy_volume('/dev/loop1', dev, 2048,
 
141
                             execute=self.drv._execute)
140
142
        self.mox.ReplayAll()
141
143
        self.assertEquals(self.drv.create_cloned_volume(TEST_VOLUME, TEST_SRC),
142
144
                          {'provider_location': 'None:3260,'