61a63dc77d
Commit 10d5421687 added the
ability to query volume_attachments by host and instance_uuid.
Minor bug however is that the original implementation also used
a "first()" filter, so regardless of how many attachments might
exist, only one was being returned.
The volume_attachments object code assumes we receive a list, as
do a number of other places. So, this patch changes the names of
those get methods to "get_all_by_xxx" to eliminate any confusion
and updates things to use the list appropriately.
Change-Id: I63e4faf8a7ee3528a4dfbd7bf4e61b607ad86841
Closes-Bug: #1585690
100 lines
4.5 KiB
Python
100 lines
4.5 KiB
Python
# Copyright 2015 SimpliVity Corp.
|
|
#
|
|
# 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 mock
|
|
import six
|
|
|
|
from cinder import objects
|
|
from cinder.tests.unit import fake_constants as fake
|
|
from cinder.tests.unit import fake_volume
|
|
from cinder.tests.unit import objects as test_objects
|
|
|
|
|
|
class TestVolumeAttachment(test_objects.BaseObjectsTestCase):
|
|
|
|
@mock.patch('cinder.db.sqlalchemy.api.volume_attachment_get')
|
|
def test_get_by_id(self, volume_attachment_get):
|
|
db_attachment = fake_volume.fake_db_volume_attachment()
|
|
volume_attachment_get.return_value = db_attachment
|
|
attachment = objects.VolumeAttachment.get_by_id(self.context,
|
|
fake.ATTACHMENT_ID)
|
|
self._compare(self, db_attachment, attachment)
|
|
|
|
@mock.patch('cinder.db.volume_attachment_update')
|
|
def test_save(self, volume_attachment_update):
|
|
attachment = fake_volume.fake_volume_attachment_obj(self.context)
|
|
attachment.attach_status = 'attaching'
|
|
attachment.save()
|
|
volume_attachment_update.assert_called_once_with(
|
|
self.context, attachment.id, {'attach_status': 'attaching'})
|
|
|
|
@mock.patch('cinder.db.sqlalchemy.api.volume_attachment_get')
|
|
def test_refresh(self, attachment_get):
|
|
db_attachment1 = fake_volume.fake_db_volume_attachment()
|
|
db_attachment2 = db_attachment1.copy()
|
|
db_attachment2['mountpoint'] = '/dev/sdc'
|
|
|
|
# On the second volume_attachment_get, return the volume attachment
|
|
# with an updated mountpoint
|
|
attachment_get.side_effect = [db_attachment1, db_attachment2]
|
|
attachment = objects.VolumeAttachment.get_by_id(self.context,
|
|
fake.ATTACHMENT_ID)
|
|
self._compare(self, db_attachment1, attachment)
|
|
|
|
# mountpoint was updated, so a volume attachment refresh should have a
|
|
# new value for that field
|
|
attachment.refresh()
|
|
self._compare(self, db_attachment2, attachment)
|
|
if six.PY3:
|
|
call_bool = mock.call.__bool__()
|
|
else:
|
|
call_bool = mock.call.__nonzero__()
|
|
attachment_get.assert_has_calls([mock.call(self.context,
|
|
fake.ATTACHMENT_ID),
|
|
call_bool,
|
|
mock.call(self.context,
|
|
fake.ATTACHMENT_ID)])
|
|
|
|
|
|
class TestVolumeAttachmentList(test_objects.BaseObjectsTestCase):
|
|
@mock.patch('cinder.db.volume_attachment_get_all_by_volume_id')
|
|
def test_get_all_by_volume_id(self, get_used_by_volume_id):
|
|
db_attachment = fake_volume.fake_db_volume_attachment()
|
|
get_used_by_volume_id.return_value = [db_attachment]
|
|
|
|
attachments = objects.VolumeAttachmentList.get_all_by_volume_id(
|
|
self.context, mock.sentinel.volume_id)
|
|
self.assertEqual(1, len(attachments))
|
|
TestVolumeAttachment._compare(self, db_attachment, attachments[0])
|
|
|
|
@mock.patch('cinder.db.volume_attachment_get_all_by_host')
|
|
def test_get_all_by_host(self, get_by_host):
|
|
db_attachment = fake_volume.fake_db_volume_attachment()
|
|
get_by_host.return_value = [db_attachment]
|
|
|
|
attachments = objects.VolumeAttachmentList.get_all_by_host(
|
|
self.context, mock.sentinel.volume_id, mock.sentinel.host)
|
|
self.assertEqual(1, len(attachments))
|
|
TestVolumeAttachment._compare(self, db_attachment, attachments[0])
|
|
|
|
@mock.patch('cinder.db.volume_attachment_get_all_by_instance_uuid')
|
|
def test_get_all_by_instance_uuid(self, get_by_instance_uuid):
|
|
db_attachment = fake_volume.fake_db_volume_attachment()
|
|
get_by_instance_uuid.return_value = [db_attachment]
|
|
|
|
attachments = objects.VolumeAttachmentList.get_all_by_instance_uuid(
|
|
self.context, mock.sentinel.volume_id, mock.sentinel.uuid)
|
|
self.assertEqual(1, len(attachments))
|
|
TestVolumeAttachment._compare(self, db_attachment, attachments[0])
|