cb3a6bfe1a
Cinder needs the attachment_id to properly identify which attachment of a volume to detach. This patch adapts the Cinder driver to pass the required information. The attachment_id is necessary for volumes that enable multiple attachments in order to terminate the connection properly. The attachment_id is retrieved in the API layer where available and sent through RPC, the RPC version is bumped to 4.7. Also the translation functions are modified to retrieve all necessary information for the volume info coming from Cinder including the multiple attachments. The Nova API returns the volume info in the same format as earlier. Co-Authored-By: Ildiko Vancsa <ildiko.vancsa@ericsson.com> Partially-implements: blueprint multi-attach-volume Change-Id: I3cdc49924acbdd21d1e6678a3bb4cf7de7f1db1a
254 lines
9.1 KiB
Python
254 lines
9.1 KiB
Python
# Copyright 2011 OpenStack Foundation
|
|
#
|
|
# 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 collections
|
|
|
|
from cinderclient.v1 import client as cinder_client_v1
|
|
from cinderclient.v2 import client as cinder_client_v2
|
|
from requests_mock.contrib import fixture
|
|
from testtools import matchers
|
|
|
|
from nova import context
|
|
from nova import exception
|
|
from nova import test
|
|
from nova.volume import cinder
|
|
|
|
|
|
_image_metadata = {
|
|
'kernel_id': 'fake',
|
|
'ramdisk_id': 'fake'
|
|
}
|
|
|
|
|
|
_volume_id = "6edbc2f4-1507-44f8-ac0d-eed1d2608d38"
|
|
_instance_uuid = "f4fda93b-06e0-4743-8117-bc8bcecd651b"
|
|
_instance_uuid_2 = "f4fda93b-06e0-4743-8117-bc8bcecd651c"
|
|
_attachment_id = "3b4db356-253d-4fab-bfa0-e3626c0b8405"
|
|
_attachment_id_2 = "3b4db356-253d-4fab-bfa0-e3626c0b8406"
|
|
_device = "/dev/vdb"
|
|
_device_2 = "/dev/vdc"
|
|
|
|
|
|
_volume_attachment = \
|
|
[{"server_id": _instance_uuid,
|
|
"attachment_id": _attachment_id,
|
|
"host_name": "",
|
|
"volume_id": _volume_id,
|
|
"device": _device,
|
|
"id": _volume_id
|
|
}]
|
|
|
|
|
|
_volume_attachment_2 = _volume_attachment
|
|
_volume_attachment_2.append({"server_id": _instance_uuid_2,
|
|
"attachment_id": _attachment_id_2,
|
|
"host_name": "",
|
|
"volume_id": _volume_id,
|
|
"device": _device_2,
|
|
"id": _volume_id})
|
|
|
|
|
|
exp_volume_attachment = collections.OrderedDict()
|
|
exp_volume_attachment[_instance_uuid] = {'attachment_id': _attachment_id,
|
|
'mountpoint': _device}
|
|
exp_volume_attachment_2 = exp_volume_attachment
|
|
exp_volume_attachment_2[_instance_uuid_2] = {'attachment_id': _attachment_id_2,
|
|
'mountpoint': _device_2}
|
|
|
|
|
|
class BaseCinderTestCase(object):
|
|
|
|
def setUp(self):
|
|
super(BaseCinderTestCase, self).setUp()
|
|
cinder.reset_globals()
|
|
self.requests = self.useFixture(fixture.Fixture())
|
|
self.api = cinder.API()
|
|
|
|
self.context = context.RequestContext('username',
|
|
'project_id',
|
|
auth_token='token',
|
|
service_catalog=self.CATALOG)
|
|
|
|
def flags(self, *args, **kwargs):
|
|
super(BaseCinderTestCase, self).flags(*args, **kwargs)
|
|
cinder.reset_globals()
|
|
|
|
def create_client(self):
|
|
return cinder.cinderclient(self.context)
|
|
|
|
def test_context_with_catalog(self):
|
|
self.assertEqual(self.URL, self.create_client().client.get_endpoint())
|
|
|
|
def test_cinder_http_retries(self):
|
|
retries = 42
|
|
self.flags(http_retries=retries, group='cinder')
|
|
self.assertEqual(retries, self.create_client().client.connect_retries)
|
|
|
|
def test_cinder_api_insecure(self):
|
|
# The True/False negation is awkward, but better for the client
|
|
# to pass us insecure=True and we check verify_cert == False
|
|
self.flags(insecure=True, group='cinder')
|
|
self.assertFalse(self.create_client().client.session.verify)
|
|
|
|
def test_cinder_http_timeout(self):
|
|
timeout = 123
|
|
self.flags(timeout=timeout, group='cinder')
|
|
self.assertEqual(timeout, self.create_client().client.session.timeout)
|
|
|
|
def test_cinder_api_cacert_file(self):
|
|
cacert = "/etc/ssl/certs/ca-certificates.crt"
|
|
self.flags(cafile=cacert, group='cinder')
|
|
self.assertEqual(cacert, self.create_client().client.session.verify)
|
|
|
|
|
|
class CinderTestCase(BaseCinderTestCase, test.NoDBTestCase):
|
|
"""Test case for cinder volume v1 api."""
|
|
|
|
URL = "http://localhost:8776/v1/project_id"
|
|
|
|
CATALOG = [{
|
|
"type": "volumev2",
|
|
"name": "cinderv2",
|
|
"endpoints": [{"publicURL": URL}]
|
|
}]
|
|
|
|
def create_client(self):
|
|
c = super(CinderTestCase, self).create_client()
|
|
self.assertIsInstance(c, cinder_client_v1.Client)
|
|
return c
|
|
|
|
def stub_volume(self, **kwargs):
|
|
volume = {
|
|
'display_name': None,
|
|
'display_description': None,
|
|
"attachments": [],
|
|
"availability_zone": "cinder",
|
|
"created_at": "2012-09-10T00:00:00.000000",
|
|
"id": _volume_id,
|
|
"metadata": {},
|
|
"size": 1,
|
|
"snapshot_id": None,
|
|
"status": "available",
|
|
"volume_type": "None",
|
|
"bootable": "true",
|
|
"multiattach": "true"
|
|
}
|
|
volume.update(kwargs)
|
|
return volume
|
|
|
|
def test_cinder_endpoint_template(self):
|
|
endpoint = 'http://other_host:8776/v1/%(project_id)s'
|
|
self.flags(endpoint_template=endpoint, group='cinder')
|
|
self.assertEqual('http://other_host:8776/v1/project_id',
|
|
self.create_client().client.endpoint_override)
|
|
|
|
def test_get_non_existing_volume(self):
|
|
self.requests.get(self.URL + '/volumes/nonexisting',
|
|
status_code=404)
|
|
|
|
self.assertRaises(exception.VolumeNotFound, self.api.get, self.context,
|
|
'nonexisting')
|
|
|
|
def test_volume_with_image_metadata(self):
|
|
v = self.stub_volume(id='1234', volume_image_metadata=_image_metadata)
|
|
m = self.requests.get(self.URL + '/volumes/5678', json={'volume': v})
|
|
|
|
volume = self.api.get(self.context, '5678')
|
|
self.assertThat(m.last_request.path,
|
|
matchers.EndsWith('/volumes/5678'))
|
|
self.assertIn('volume_image_metadata', volume)
|
|
self.assertEqual(_image_metadata, volume['volume_image_metadata'])
|
|
|
|
|
|
class CinderV2TestCase(BaseCinderTestCase, test.NoDBTestCase):
|
|
"""Test case for cinder volume v2 api."""
|
|
|
|
URL = "http://localhost:8776/v2/project_id"
|
|
|
|
CATALOG = [{
|
|
"type": "volumev2",
|
|
"name": "cinder",
|
|
"endpoints": [{"publicURL": URL}]
|
|
}]
|
|
|
|
def setUp(self):
|
|
super(CinderV2TestCase, self).setUp()
|
|
cinder.CONF.set_override('catalog_info',
|
|
'volumev2:cinder:publicURL', group='cinder')
|
|
self.addCleanup(cinder.CONF.reset)
|
|
|
|
def create_client(self):
|
|
c = super(CinderV2TestCase, self).create_client()
|
|
self.assertIsInstance(c, cinder_client_v2.Client)
|
|
return c
|
|
|
|
def stub_volume(self, **kwargs):
|
|
volume = {
|
|
'name': None,
|
|
'description': None,
|
|
"attachments": [],
|
|
"availability_zone": "cinderv2",
|
|
"created_at": "2013-08-10T00:00:00.000000",
|
|
"id": _volume_id,
|
|
"metadata": {},
|
|
"size": 1,
|
|
"snapshot_id": None,
|
|
"status": "available",
|
|
"volume_type": "None",
|
|
"bootable": "true",
|
|
"multiattach": "true"
|
|
}
|
|
volume.update(kwargs)
|
|
return volume
|
|
|
|
def test_cinder_endpoint_template(self):
|
|
endpoint = 'http://other_host:8776/v2/%(project_id)s'
|
|
self.flags(endpoint_template=endpoint, group='cinder')
|
|
self.assertEqual('http://other_host:8776/v2/project_id',
|
|
self.create_client().client.endpoint_override)
|
|
|
|
def test_get_non_existing_volume(self):
|
|
self.requests.get(self.URL + '/volumes/nonexisting',
|
|
status_code=404)
|
|
|
|
self.assertRaises(exception.VolumeNotFound, self.api.get, self.context,
|
|
'nonexisting')
|
|
|
|
def test_volume_with_image_metadata(self):
|
|
v = self.stub_volume(id='1234', volume_image_metadata=_image_metadata)
|
|
self.requests.get(self.URL + '/volumes/5678', json={'volume': v})
|
|
volume = self.api.get(self.context, '5678')
|
|
self.assertIn('volume_image_metadata', volume)
|
|
self.assertEqual(_image_metadata, volume['volume_image_metadata'])
|
|
|
|
def test_volume_without_attachment(self):
|
|
v = self.stub_volume(id='1234')
|
|
self.requests.get(self.URL + '/volumes/5678', json={'volume': v})
|
|
volume = self.api.get(self.context, '5678')
|
|
self.assertIsNone(volume.get('attachments'))
|
|
|
|
def test_volume_with_one_attachment(self):
|
|
v = self.stub_volume(id='1234', attachments=_volume_attachment)
|
|
self.requests.get(self.URL + '/volumes/5678', json={'volume': v})
|
|
volume = self.api.get(self.context, '5678')
|
|
self.assertIn('attachments', volume)
|
|
self.assertEqual(exp_volume_attachment, volume['attachments'])
|
|
|
|
def test_volume_with_two_attachments(self):
|
|
v = self.stub_volume(id='1234', attachments=_volume_attachment_2)
|
|
self.requests.get(self.URL + '/volumes/5678', json={'volume': v})
|
|
volume = self.api.get(self.context, '5678')
|
|
self.assertIn('attachments', volume)
|
|
self.assertEqual(exp_volume_attachment_2, volume['attachments'])
|