c7456c675f
1) Added new params for filtering by: - share network - snapshot - volume type - host - limit and offset a la pagination - project id (useful with '--all-tenants') - metadata* - extra-specs* - direction (asc, desc)* - key of share* * requires server-side update 2) Added aliases for params, mostly in perspective to avoid mess of underscore and dash symbols. 3) Updated utils.print_list func to print results as is without reordering. Implements blueprint improve-share-list-filtering Change-Id: I6fe92c5242f18c900e109271f9182bd5ed287b25
315 lines
11 KiB
Python
315 lines
11 KiB
Python
# Copyright 2012 NetApp
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
"""Interface for shares extension."""
|
|
|
|
import collections
|
|
import re
|
|
try:
|
|
from urllib import urlencode # noqa
|
|
except ImportError:
|
|
from urllib.parse import urlencode # noqa
|
|
|
|
from manilaclient import base
|
|
from manilaclient.common import constants
|
|
from manilaclient import exceptions
|
|
from manilaclient.openstack.common.apiclient import base as common_base
|
|
|
|
|
|
class Share(common_base.Resource):
|
|
"""A share is an extra block level storage to the OpenStack instances."""
|
|
def __repr__(self):
|
|
return "<Share: %s>" % self.id
|
|
|
|
def update(self, **kwargs):
|
|
"""Update this share."""
|
|
self.manager.update(self, **kwargs)
|
|
|
|
def delete(self):
|
|
"""Delete this share."""
|
|
self.manager.delete(self)
|
|
|
|
def force_delete(self):
|
|
"""Delete the specified share ignoring its current state."""
|
|
self.manager.force_delete(self)
|
|
|
|
def allow(self, access_type, access):
|
|
"""Allow access to a share."""
|
|
self._validate_access(access_type, access)
|
|
return self.manager.allow(self, access_type, access)
|
|
|
|
def deny(self, id):
|
|
"""Deny access from IP to a share."""
|
|
return self.manager.deny(self, id)
|
|
|
|
def access_list(self):
|
|
"""Deny access from IP to a share."""
|
|
return self.manager.access_list(self)
|
|
|
|
def _validate_access(self, access_type, access):
|
|
if access_type == 'ip':
|
|
self._validate_ip_range(access)
|
|
elif access_type == 'user':
|
|
self._validate_username(access)
|
|
elif access_type == 'cert':
|
|
# 'access' is used as the certificate's CN (common name)
|
|
# to which access is allowed or denied by the backend.
|
|
# The standard allows for just about any string in the
|
|
# common name. The meaning of a string depends on its
|
|
# interpretation and is limited to 64 characters.
|
|
self._validate_common_name(access.strip())
|
|
else:
|
|
raise exceptions.CommandError(
|
|
'Only ip, user, and cert types are supported')
|
|
|
|
def update_all_metadata(self, metadata):
|
|
"""Update all metadata of this share."""
|
|
return self.manager.update_all_metadata(self, metadata)
|
|
|
|
@staticmethod
|
|
def _validate_common_name(access):
|
|
if len(access) == 0 or len(access) > 64:
|
|
exc_str = ('Invalid CN (common name). Must be 1-64 chars long.')
|
|
raise exceptions.CommandError(exc_str)
|
|
|
|
@staticmethod
|
|
def _validate_username(access):
|
|
valid_useraname_re = '[\w\.\-_\`;\'\{\}\[\]]{4,32}$'
|
|
username = access
|
|
if not re.match(valid_useraname_re, username):
|
|
exc_str = ('Invalid user or group name. Must be 4-32 chars long '
|
|
'and consist of alfanum and ]{.-_\'`;}[')
|
|
raise exceptions.CommandError(exc_str)
|
|
|
|
@staticmethod
|
|
def _validate_ip_range(ip_range):
|
|
ip_range = ip_range.split('/')
|
|
exc_str = ('Supported ip format examples:\n'
|
|
'\t10.0.0.2, 10.0.0.0/24')
|
|
if len(ip_range) > 2:
|
|
raise exceptions.CommandError(exc_str)
|
|
if len(ip_range) == 2:
|
|
try:
|
|
prefix = int(ip_range[1])
|
|
if prefix < 0 or prefix > 32:
|
|
raise ValueError()
|
|
except ValueError:
|
|
msg = 'IP prefix should be in range from 0 to 32'
|
|
raise exceptions.CommandError(msg)
|
|
ip_range = ip_range[0].split('.')
|
|
if len(ip_range) != 4:
|
|
raise exceptions.CommandError(exc_str)
|
|
for item in ip_range:
|
|
try:
|
|
if 0 <= int(item) <= 255:
|
|
continue
|
|
raise ValueError()
|
|
except ValueError:
|
|
raise exceptions.CommandError(exc_str)
|
|
|
|
def reset_state(self, state):
|
|
"""Update the share with the provided state."""
|
|
self.manager.reset_state(self, state)
|
|
|
|
|
|
class ShareManager(base.ManagerWithFind):
|
|
"""Manage :class:`Share` resources."""
|
|
resource_class = Share
|
|
|
|
def create(self, share_proto, size, snapshot_id=None, name=None,
|
|
description=None, metadata=None, share_network=None,
|
|
volume_type=None):
|
|
"""Create NAS.
|
|
|
|
:param size: Size of NAS in GB
|
|
:param snapshot_id: ID of the snapshot
|
|
:param name: Name of the NAS
|
|
:param description: Short description of a share
|
|
:param share_proto: Type of NAS (NFS or CIFS)
|
|
:param metadata: Optional metadata to set on volume creation
|
|
:rtype: :class:`Share`
|
|
"""
|
|
|
|
if metadata is None:
|
|
share_metadata = {}
|
|
else:
|
|
share_metadata = metadata
|
|
|
|
body = {'share': {'size': size,
|
|
'snapshot_id': snapshot_id,
|
|
'name': name,
|
|
'description': description,
|
|
'metadata': share_metadata,
|
|
'share_proto': share_proto,
|
|
'share_network_id': common_base.getid(share_network),
|
|
'volume_type': volume_type}}
|
|
return self._create('/shares', body, 'share')
|
|
|
|
def get(self, share_id):
|
|
"""Get a share.
|
|
|
|
:param share_id: The ID of the share to delete.
|
|
:rtype: :class:`Share`
|
|
"""
|
|
return self._get("/shares/%s" % share_id, "share")
|
|
|
|
def update(self, share, **kwargs):
|
|
"""Updates a share.
|
|
|
|
:param share: Share to update.
|
|
:rtype: :class:`Share`
|
|
"""
|
|
if not kwargs:
|
|
return
|
|
|
|
body = {'share': kwargs, }
|
|
return self._update("/shares/%s" % share.id, body)
|
|
|
|
def list(self, detailed=True, search_opts=None,
|
|
sort_key=None, sort_dir=None):
|
|
"""Get a list of all shares.
|
|
|
|
:param detailed: Whether to return detailed share info.
|
|
:param search_opts: Search options to filter out shares.
|
|
:param sort_key: Key to be sorted.
|
|
:param sort_dir: Sort direction, should be 'desc' or 'asc'.
|
|
:rtype: list of :class:`Share`
|
|
"""
|
|
if search_opts is None:
|
|
search_opts = {}
|
|
|
|
if sort_key is not None:
|
|
if sort_key in constants.SHARE_SORT_KEY_VALUES:
|
|
search_opts['sort_key'] = sort_key
|
|
# NOTE(vponomaryov): Replace aliases with appropriate keys
|
|
if sort_key == 'volume_type':
|
|
search_opts['sort_key'] = 'volume_type_id'
|
|
elif sort_key == 'snapshot':
|
|
search_opts['sort_key'] = 'snapshot_id'
|
|
elif sort_key == 'share_network':
|
|
search_opts['sort_key'] = 'share_network_id'
|
|
else:
|
|
raise ValueError('sort_key must be one of the following: %s.'
|
|
% ', '.join(constants.SHARE_SORT_KEY_VALUES))
|
|
|
|
if sort_dir is not None:
|
|
if sort_dir in constants.SORT_DIR_VALUES:
|
|
search_opts['sort_dir'] = sort_dir
|
|
else:
|
|
raise ValueError('sort_dir must be one of the following: %s.'
|
|
% ', '.join(constants.SORT_DIR_VALUES))
|
|
|
|
if search_opts:
|
|
query_string = urlencode(
|
|
sorted([(k, v) for (k, v) in list(search_opts.items()) if v]))
|
|
if query_string:
|
|
query_string = "?%s" % (query_string,)
|
|
else:
|
|
query_string = ''
|
|
|
|
if detailed:
|
|
path = "/shares/detail%s" % (query_string,)
|
|
else:
|
|
path = "/shares%s" % (query_string,)
|
|
|
|
return self._list(path, 'shares')
|
|
|
|
def delete(self, share):
|
|
"""Delete a share.
|
|
|
|
:param share: The :class:`Share` to delete.
|
|
"""
|
|
self._delete("/shares/%s" % common_base.getid(share))
|
|
|
|
def force_delete(self, share):
|
|
return self._action('os-force_delete', common_base.getid(share))
|
|
|
|
def allow(self, share, access_type, access):
|
|
"""Allow access from IP to a shares.
|
|
|
|
:param share: The :class:`Share` to delete.
|
|
:param access_type: string that represents access type ('ip','domain')
|
|
:param access: string that represents access ('127.0.0.1')
|
|
"""
|
|
access = self._action('os-allow_access', share,
|
|
{'access_type': access_type,
|
|
'access_to': access})[1]["access"]
|
|
return access
|
|
|
|
def deny(self, share, id):
|
|
"""Deny access from IP to a shares.
|
|
|
|
:param share: The :class:`Share` to delete.
|
|
:param ip: string that represents ip address
|
|
"""
|
|
return self._action('os-deny_access', share, {'access_id': id})
|
|
|
|
def access_list(self, share):
|
|
"""Get access list to the share."""
|
|
access_list = self._action("os-access_list", share)[1]["access_list"]
|
|
if access_list:
|
|
t = collections.namedtuple('Access', list(access_list[0]))
|
|
return [t(*value.values()) for value in access_list]
|
|
else:
|
|
return []
|
|
|
|
def get_metadata(self, share):
|
|
"""Get a shares metadata.
|
|
|
|
:param share: The :class:`Share`.
|
|
"""
|
|
return self._get("/shares/%s/metadata" % common_base.getid(share),
|
|
"metadata")
|
|
|
|
def set_metadata(self, share, metadata):
|
|
"""Update/Set a shares metadata.
|
|
|
|
:param share: The :class:`Share`.
|
|
:param metadata: A list of keys to be set.
|
|
"""
|
|
body = {'metadata': metadata}
|
|
return self._create("/shares/%s/metadata" % common_base.getid(share),
|
|
body, "metadata")
|
|
|
|
def delete_metadata(self, share, keys):
|
|
"""Delete specified keys from volumes metadata.
|
|
|
|
:param share: The :class:`Share`.
|
|
:param keys: A list of keys to be removed.
|
|
"""
|
|
for k in keys:
|
|
self._delete("/shares/%s/metadata/%s" % (common_base.getid(share),
|
|
k))
|
|
|
|
def update_all_metadata(self, share, metadata):
|
|
"""Update all metadata of a share.
|
|
|
|
:param share: The :class:`Volume`.
|
|
:param metadata: A list of keys to be updated.
|
|
"""
|
|
body = {'metadata': metadata}
|
|
return self._update("/shares/%s/metadata" % common_base.getid(share),
|
|
body)
|
|
|
|
def _action(self, action, share, info=None, **kwargs):
|
|
"""Perform a share 'action'."""
|
|
body = {action: info}
|
|
self.run_hooks('modify_body_for_action', body, **kwargs)
|
|
url = '/shares/%s/action' % common_base.getid(share)
|
|
return self.api.client.post(url, body=body)
|
|
|
|
def reset_state(self, share, state):
|
|
"""Update the provided share with the provided state."""
|
|
return self._action('os-reset_status', share, {'status': state})
|