b7d3468460
The new attachment_update method in Cinder's API creates an attachment
object and populates it with the provided connector info. In addition,
we set the volumes status to in-use and update the attachment object
status to "attached".
This isn't really accurate though, because we don't know if the volume
is actually attached (connected) by the consumer or not. Also a big
side effect here is that currently all of our tests and automation
use volume-status to determine if a volume is fully connected/ready
for use and that everything went well. It's used as an ack in most
cases.
This change goes back to using multiple states to signify where a
an attachment is in it's life-cycle:
1. attachment_create
We've created an empty attachment record but haven't done anything
with it yet.
2. attachment_update
We provided a connector and set up the TGT so that everything is
ready for a consumer to connect/use it.
3. attachment_complete
An ACK back from the consumer letting us know that they connected
it successfully and are doing their thing.
It would be cool to just key all these checks of the attachment object itself,
and just use attachment_update to do so, maybe in the future?
Change-Id: I3b28d2cb89a8d81c7cdec425f355c78bfdfe3450
Related-Bug: #1710295
86 lines
3.4 KiB
Python
86 lines
3.4 KiB
Python
# 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.
|
|
|
|
"""Attachment interface."""
|
|
|
|
from cinderclient import base
|
|
|
|
|
|
class VolumeAttachment(base.Resource):
|
|
"""An attachment is a connected volume."""
|
|
def __repr__(self):
|
|
"""Obj to Str method."""
|
|
return "<Attachment: %s>" % self.id
|
|
|
|
|
|
class VolumeAttachmentManager(base.ManagerWithFind):
|
|
resource_class = VolumeAttachment
|
|
|
|
def create(self, volume_id, connector, instance_id):
|
|
"""Create a attachment for specified volume."""
|
|
body = {'attachment': {'volume_uuid': volume_id,
|
|
'instance_uuid': instance_id,
|
|
'connector': connector}}
|
|
retval = self._create('/attachments', body, 'attachment')
|
|
return retval.to_dict()
|
|
|
|
def delete(self, attachment):
|
|
"""Delete an attachment by ID."""
|
|
return self._delete("/attachments/%s" % base.getid(attachment))
|
|
|
|
def list(self, detailed=False, search_opts=None, marker=None, limit=None,
|
|
sort_key=None, sort_dir=None, sort=None):
|
|
"""List all attachments."""
|
|
resource_type = "attachments"
|
|
url = self._build_list_url(resource_type,
|
|
detailed=detailed,
|
|
search_opts=search_opts,
|
|
marker=marker,
|
|
limit=limit,
|
|
sort_key=sort_key,
|
|
sort_dir=sort_dir, sort=sort)
|
|
return self._list(url, resource_type, limit=limit)
|
|
|
|
def show(self, id):
|
|
"""Attachment show.
|
|
|
|
:param id: Attachment ID.
|
|
"""
|
|
url = '/attachments/%s' % id
|
|
resp, body = self.api.client.get(url)
|
|
return self.resource_class(self, body['attachment'], loaded=True,
|
|
resp=resp)
|
|
|
|
def update(self, id, connector):
|
|
"""Attachment update."""
|
|
body = {'attachment': {'connector': connector}}
|
|
resp = self._update('/attachments/%s' % id, body)
|
|
return self.resource_class(self, resp['attachment'], loaded=True,
|
|
resp=resp)
|
|
|
|
def complete(self, attachment):
|
|
"""Mark the attachment as completed."""
|
|
resp, body = self._action_return_resp_and_body('os-complete',
|
|
attachment,
|
|
None)
|
|
return resp
|
|
|
|
def _action_return_resp_and_body(self, action, attachment, info=None,
|
|
**kwargs):
|
|
"""Perform a attachments "action" and return response headers and body.
|
|
|
|
"""
|
|
body = {action: info}
|
|
self.run_hooks('modify_body_for_action', body, **kwargs)
|
|
url = '/attachments/%s/action' % base.getid(attachment)
|
|
return self.api.client.post(url, body=body)
|