
When using the name or description to filter the share list, share group list, share network list or snapshot list, if the name or description is unicode symbols, the query will fail due to the invalid str value. This change is to fix them. Change-Id: I73ed2b675542d3aeedc9efdba08067819bf7d3e4 Closes-bug: #1712988
242 lines
8.0 KiB
Python
242 lines
8.0 KiB
Python
# Copyright 2013 OpenStack Foundation
|
|
# 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.
|
|
|
|
from six.moves.urllib import parse
|
|
|
|
from manilaclient import api_versions
|
|
from manilaclient import base
|
|
from manilaclient.common.apiclient import base as common_base
|
|
from manilaclient import exceptions
|
|
from manilaclient import utils
|
|
|
|
|
|
RESOURCES_PATH = '/share-networks'
|
|
RESOURCE_PATH = "/share-networks/%s"
|
|
RESOURCE_NAME = 'share_network'
|
|
RESOURCES_NAME = 'share_networks'
|
|
|
|
|
|
class ShareNetwork(common_base.Resource):
|
|
"""Network info for Manila shares."""
|
|
def __repr__(self):
|
|
return "<ShareNetwork: %s>" % self.id
|
|
|
|
def update(self, **kwargs):
|
|
"""Update this share network."""
|
|
return self.manager.update(self, **kwargs)
|
|
|
|
def delete(self):
|
|
"""Delete this share network."""
|
|
self.manager.delete(self)
|
|
|
|
|
|
class ShareNetworkManager(base.ManagerWithFind):
|
|
"""Manage :class:`ShareNetwork` resources."""
|
|
resource_class = ShareNetwork
|
|
|
|
@api_versions.wraps("1.0", "2.25")
|
|
def create(self, neutron_net_id=None, neutron_subnet_id=None,
|
|
nova_net_id=None, name=None, description=None):
|
|
"""Create share network.
|
|
|
|
:param neutron_net_id: ID of Neutron network
|
|
:param neutron_subnet_id: ID of Neutron subnet
|
|
:param nova_net_id: ID of Nova network
|
|
:param name: share network name
|
|
:param description: share network description
|
|
:rtype: :class:`ShareNetwork`
|
|
"""
|
|
values = {}
|
|
if neutron_net_id:
|
|
values['neutron_net_id'] = neutron_net_id
|
|
if neutron_subnet_id:
|
|
values['neutron_subnet_id'] = neutron_subnet_id
|
|
if nova_net_id:
|
|
values['nova_net_id'] = nova_net_id
|
|
if name:
|
|
values['name'] = name
|
|
if description:
|
|
values['description'] = description
|
|
|
|
body = {RESOURCE_NAME: values}
|
|
|
|
return self._create(RESOURCES_PATH, body, RESOURCE_NAME)
|
|
|
|
@api_versions.wraps("2.26") # noqa
|
|
def create(self, neutron_net_id=None, neutron_subnet_id=None,
|
|
name=None, description=None):
|
|
"""Create share network.
|
|
|
|
:param neutron_net_id: ID of Neutron network
|
|
:param neutron_subnet_id: ID of Neutron subnet
|
|
:param name: share network name
|
|
:param description: share network description
|
|
:rtype: :class:`ShareNetwork`
|
|
"""
|
|
values = {}
|
|
if neutron_net_id:
|
|
values['neutron_net_id'] = neutron_net_id
|
|
if neutron_subnet_id:
|
|
values['neutron_subnet_id'] = neutron_subnet_id
|
|
if name:
|
|
values['name'] = name
|
|
if description:
|
|
values['description'] = description
|
|
|
|
body = {RESOURCE_NAME: values}
|
|
|
|
return self._create(RESOURCES_PATH, body, RESOURCE_NAME)
|
|
|
|
def add_security_service(self, share_network, security_service):
|
|
"""Associate given security service with a share network.
|
|
|
|
:param share_network: share network name, id or ShareNetwork instance
|
|
:param security_service: name, id or SecurityService instance
|
|
:rtype: :class:`ShareNetwork`
|
|
"""
|
|
body = {
|
|
'add_security_service': {
|
|
'security_service_id': common_base.getid(security_service),
|
|
},
|
|
}
|
|
return self._create(
|
|
RESOURCE_PATH % common_base.getid(share_network) + '/action',
|
|
body,
|
|
RESOURCE_NAME,
|
|
)
|
|
|
|
def remove_security_service(self, share_network, security_service):
|
|
"""Dissociate security service from a share network.
|
|
|
|
:param share_network: share network name, id or ShareNetwork instance
|
|
:param security_service: name, id or SecurityService instance
|
|
:rtype: :class:`ShareNetwork`
|
|
"""
|
|
body = {
|
|
'remove_security_service': {
|
|
'security_service_id': common_base.getid(security_service),
|
|
},
|
|
}
|
|
return self._create(
|
|
RESOURCE_PATH % common_base.getid(share_network) + '/action',
|
|
body,
|
|
RESOURCE_NAME,
|
|
)
|
|
|
|
def get(self, share_network):
|
|
"""Get a share network.
|
|
|
|
:param policy: share network to get.
|
|
:rtype: :class:`NetworkInfo`
|
|
"""
|
|
return self._get(RESOURCE_PATH % common_base.getid(share_network),
|
|
RESOURCE_NAME)
|
|
|
|
@api_versions.wraps("1.0", "2.25")
|
|
def update(self, share_network, neutron_net_id=None,
|
|
neutron_subnet_id=None, nova_net_id=None,
|
|
name=None, description=None):
|
|
"""Updates a share network.
|
|
|
|
:param share_network: share network to update.
|
|
:rtype: :class:`ShareNetwork`
|
|
"""
|
|
values = {}
|
|
if neutron_net_id is not None:
|
|
values['neutron_net_id'] = neutron_net_id
|
|
if neutron_subnet_id is not None:
|
|
values['neutron_subnet_id'] = neutron_subnet_id
|
|
if nova_net_id is not None:
|
|
values['nova_net_id'] = nova_net_id
|
|
if name is not None:
|
|
values['name'] = name
|
|
if description is not None:
|
|
values['description'] = description
|
|
|
|
for k, v in values.items():
|
|
if v == '':
|
|
values[k] = None
|
|
|
|
if not values:
|
|
msg = "Must specify fields to be updated"
|
|
raise exceptions.CommandError(msg)
|
|
|
|
body = {RESOURCE_NAME: values}
|
|
return self._update(RESOURCE_PATH % common_base.getid(share_network),
|
|
body,
|
|
RESOURCE_NAME)
|
|
|
|
@api_versions.wraps("2.26") # noqa
|
|
def update(self, share_network, neutron_net_id=None,
|
|
neutron_subnet_id=None, name=None,
|
|
description=None):
|
|
"""Updates a share network.
|
|
|
|
:param share_network: share network to update.
|
|
:rtype: :class:`ShareNetwork`
|
|
"""
|
|
values = {}
|
|
if neutron_net_id is not None:
|
|
values['neutron_net_id'] = neutron_net_id
|
|
if neutron_subnet_id is not None:
|
|
values['neutron_subnet_id'] = neutron_subnet_id
|
|
if name is not None:
|
|
values['name'] = name
|
|
if description is not None:
|
|
values['description'] = description
|
|
|
|
for k, v in values.items():
|
|
if v == '':
|
|
values[k] = None
|
|
|
|
if not values:
|
|
msg = "Must specify fields to be updated"
|
|
raise exceptions.CommandError(msg)
|
|
|
|
body = {RESOURCE_NAME: values}
|
|
return self._update(RESOURCE_PATH % common_base.getid(share_network),
|
|
body,
|
|
RESOURCE_NAME)
|
|
|
|
def delete(self, share_network):
|
|
"""Delete a share network.
|
|
|
|
:param share_network: share network to be deleted.
|
|
"""
|
|
self._delete(RESOURCE_PATH % common_base.getid(share_network))
|
|
|
|
def list(self, detailed=True, search_opts=None):
|
|
"""Get a list of all share network.
|
|
|
|
:rtype: list of :class:`NetworkInfo`
|
|
"""
|
|
if not search_opts:
|
|
search_opts = {}
|
|
|
|
query_string = ""
|
|
if search_opts:
|
|
search_opts = utils.unicode_key_value_to_string(search_opts)
|
|
params = sorted(
|
|
[(k, v) for (k, v) in list(search_opts.items()) if v])
|
|
if params:
|
|
query_string = "?%s" % parse.urlencode(params)
|
|
|
|
if detailed:
|
|
path = RESOURCES_PATH + "/detail" + query_string
|
|
else:
|
|
path = RESOURCES_PATH + query_string
|
|
|
|
return self._list(path, RESOURCES_NAME)
|