openstack
/
python-openstackclient
Code Issues Proposed changes

Upgraded to PEP8 1.3.3 to stay aligned with Nova, etc. 

Made all the necessary changes to pass new PEP8 standards.

Also cleaned up docstrings to conform to the HACKING stanards.

Change-Id: Ib8df3030da7a7885655689ab5da0717748c9edbe
This commit is contained in:
Josh Kearney 2013-01-31 13:31:41 -06:00
parent aa4f12aec1
commit b26cb5bf68
21 changed files with 325 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openstackclient/common/clientmanager.py
View File

@ -13,8 +13,7 @@
# under the License. # under the License.
# #
"""Manage access to the clients, including authenticating when needed. """Manage access to the clients, including authenticating when needed."""
"""
import logging import logging
@ -22,13 +21,12 @@ from openstackclient.compute import client as compute_client
from openstackclient.identity import client as identity_client from openstackclient.identity import client as identity_client
from openstackclient.image import client as image_client from openstackclient.image import client as image_client
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
class ClientCache(object): class ClientCache(object):
"""Descriptor class for caching created client handles. """Descriptor class for caching created client handles."""
"""
def __init__(self, factory): def __init__(self, factory):
self.factory = factory self.factory = factory
self._handle = None self._handle = None
@ -41,20 +39,14 @@ class ClientCache(object):
class ClientManager(object): class ClientManager(object):
"""Manages access to API clients, including authentication. """Manages access to API clients, including authentication."""
"""
compute = ClientCache(compute_client.make_client) compute = ClientCache(compute_client.make_client)
identity = ClientCache(identity_client.make_client) identity = ClientCache(identity_client.make_client)
image = ClientCache(image_client.make_client) image = ClientCache(image_client.make_client)
def __init__(self, token=None, url=None, def __init__(self, token=None, url=None, auth_url=None, tenant_name=None,
auth_url=None, tenant_id=None, username=None, password=None,
tenant_name=None, tenant_id=None, region_name=None, api_version=None):
username=None, password=None,
region_name=None,
api_version=None,
):
self._token = token self._token = token
self._url = url self._url = url
self._auth_url = auth_url self._auth_url = auth_url
@ -74,8 +66,7 @@ class ClientManager(object):
return return
def get_endpoint_for_service_type(self, service_type): def get_endpoint_for_service_type(self, service_type):
"""Return the endpoint URL for the service type. """Return the endpoint URL for the service type."""
"""
# See if we are using password flow auth, i.e. we have a # See if we are using password flow auth, i.e. we have a
# service catalog to select endpoints from # service catalog to select endpoints from
if self._service_catalog: if self._service_catalog:

8
openstackclient/common/command.py
View File

@ -13,17 +13,13 @@
# under the License. # under the License.
# #
""" """OpenStack base command"""
OpenStack base command
"""
from cliff.command import Command from cliff.command import Command
class OpenStackCommand(Command): class OpenStackCommand(Command):
"""Base class for OpenStack commands """Base class for OpenStack commands."""
"""
api = None api = None
def run(self, parsed_args): def run(self, parsed_args):

57
openstackclient/common/exceptions.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """Exception definitions."""
Exception definitions.
"""
class CommandError(Exception): class CommandError(Exception):
@ -27,8 +25,7 @@ class AuthorizationFailure(Exception):
class NoTokenLookupException(Exception): class NoTokenLookupException(Exception):
"""This form of authentication does not support looking up """This does not support looking up endpoints from an existing token."""
endpoints from an existing token."""
pass pass
@ -38,15 +35,12 @@ class EndpointNotFound(Exception):
class UnsupportedVersion(Exception): class UnsupportedVersion(Exception):
"""Indicates that the user is trying to use an unsupported """The user is trying to use an unsupported version of the API"""
version of the API"""
pass pass
class ClientException(Exception): class ClientException(Exception):
""" """The base exception class for all exceptions this library raises."""
The base exception class for all exceptions this library raises.
"""
def __init__(self, code, message=None, details=None): def __init__(self, code, message=None, details=None):
self.code = code self.code = code
self.message = message or self.__class__.message self.message = message or self.__class__.message
@ -57,59 +51,44 @@ class ClientException(Exception):
class BadRequest(ClientException): class BadRequest(ClientException):
""" """HTTP 400 - Bad request: you sent some malformed data."""
HTTP 400 - Bad request: you sent some malformed data.
"""
http_status = 400 http_status = 400
message = "Bad request" message = "Bad request"
class Unauthorized(ClientException): class Unauthorized(ClientException):
""" """HTTP 401 - Unauthorized: bad credentials."""
HTTP 401 - Unauthorized: bad credentials.
"""
http_status = 401 http_status = 401
message = "Unauthorized" message = "Unauthorized"
class Forbidden(ClientException): class Forbidden(ClientException):
""" """HTTP 403 - Forbidden: not authorized to access to this resource."""
HTTP 403 - Forbidden: your credentials don't give you access to this
resource.
"""
http_status = 403 http_status = 403
message = "Forbidden" message = "Forbidden"
class NotFound(ClientException): class NotFound(ClientException):
""" """HTTP 404 - Not found"""
HTTP 404 - Not found
"""
http_status = 404 http_status = 404
message = "Not found" message = "Not found"
class Conflict(ClientException): class Conflict(ClientException):
""" """HTTP 409 - Conflict"""
HTTP 409 - Conflict
"""
http_status = 409 http_status = 409
message = "Conflict" message = "Conflict"
class OverLimit(ClientException): class OverLimit(ClientException):
""" """HTTP 413 - Over limit: reached the API limits for this time period."""
HTTP 413 - Over limit: you're over the API limits for this time period.
"""
http_status = 413 http_status = 413
message = "Over limit" message = "Over limit"
# NotImplemented is a python keyword. # NotImplemented is a python keyword.
class HTTPNotImplemented(ClientException): class HTTPNotImplemented(ClientException):
""" """HTTP 501 - Not Implemented: server does not support this operation."""
HTTP 501 - Not Implemented: the server does not support this operation.
"""
http_status = 501 http_status = 501
message = "Not Implemented" message = "Not Implemented"
@ -120,14 +99,18 @@ class HTTPNotImplemented(ClientException):
# for c in ClientException.__subclasses__()) # for c in ClientException.__subclasses__())
# #
# Instead, we have to hardcode it: # Instead, we have to hardcode it:
_code_map = dict((c.http_status, c) for c in [BadRequest, Unauthorized, _code_map = dict((c.http_status, c) for c in [
Forbidden, NotFound, OverLimit, HTTPNotImplemented]) BadRequest,
Unauthorized,
Forbidden,
NotFound,
OverLimit,
HTTPNotImplemented
])
def from_response(response, body): def from_response(response, body):
""" """Return an instance of a ClientException based on an httplib2 response.
Return an instance of a ClientException or subclass
based on an httplib2 response.
Usage:: Usage::

24
openstackclient/common/openstackkeyring.py
View File

@ -13,50 +13,48 @@
# under the License. # under the License.
# #
""" """Keyring backend for Openstack, to store encrypted password in a file."""
Keyring backend for Openstack, to store encrypted password in a file.
"""
from Crypto.Cipher import AES from Crypto.Cipher import AES
import keyring import keyring
import os import os
KEYRING_FILE = os.path.join(os.path.expanduser('~'), '.openstack-keyring.cfg') KEYRING_FILE = os.path.join(os.path.expanduser('~'), '.openstack-keyring.cfg')
class OpenstackKeyring(keyring.backend.BasicFileKeyring): class OpenstackKeyring(keyring.backend.BasicFileKeyring):
""" Openstack Keyring to store encrypted password """ """Openstack Keyring to store encrypted password."""
filename = KEYRING_FILE filename = KEYRING_FILE
def supported(self): def supported(self):
""" applicable for all platforms, but not recommend """ """Applicable for all platforms, but not recommend."""
pass pass
def _init_crypter(self): def _init_crypter(self):
""" initialize the crypter using the class name """ """Initialize the crypter using the class name."""
block_size = 32 block_size = 32
padding = '0' padding = '0'
# init the cipher with the class name, upto block_size # init the cipher with the class name, upto block_size
password = __name__[block_size:] password = __name__[block_size:]
password = password + (block_size - len(password) % \ password = password + (block_size - len(password) %
block_size) * padding block_size) * padding
return AES.new(password, AES.MODE_CFB) return AES.new(password, AES.MODE_CFB)
def encrypt(self, password): def encrypt(self, password):
""" encrypt the given password """ """Encrypt the given password."""
crypter = self._init_crypter() crypter = self._init_crypter()
return crypter.encrypt(password) return crypter.encrypt(password)
def decrypt(self, password_encrypted): def decrypt(self, password_encrypted):
""" decrypt the given password """ """Decrypt the given password."""
crypter = self._init_crypter() crypter = self._init_crypter()
return crypter.decrypt(password_encrypted) return crypter.decrypt(password_encrypted)
def os_keyring(): def os_keyring():
""" initialize the openstack keyring """ """Initialize the openstack keyring."""
return keyring.core.load_keyring(None, keyring = 'openstackclient.common.openstackkeyring.OpenstackKeyring'
'openstackclient.common.openstackkeyring.OpenstackKeyring') return keyring.core.load_keyring(None, keyring)

4
openstackclient/common/utils.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """Common client utilities"""
Common client utilities
"""
import os import os
import sys import sys

9
openstackclient/compute/client.py
View File

@ -27,13 +27,11 @@ API_VERSIONS = {
def make_client(instance): def make_client(instance):
"""Returns a compute service client. """Returns a compute service client."""
"""
compute_client = utils.get_client_class( compute_client = utils.get_client_class(
API_NAME, API_NAME,
instance._api_version[API_NAME], instance._api_version[API_NAME],
API_VERSIONS, API_VERSIONS)
)
LOG.debug('instantiating compute client: %s' % compute_client) LOG.debug('instantiating compute client: %s' % compute_client)
client = compute_client( client = compute_client(
username=instance._username, username=instance._username,
@ -49,8 +47,7 @@ def make_client(instance):
extensions=[], extensions=[],
service_type=API_NAME, service_type=API_NAME,
# FIXME(dhellmann): what is service_name? # FIXME(dhellmann): what is service_name?
service_name='', service_name='')
)
# Populate the Nova client to skip another auth query to Identity # Populate the Nova client to skip another auth query to Identity
if instance._url: if instance._url:

151
openstackclient/compute/v2/server.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """Server action implementations"""
Server action implementations
"""
import logging import logging
import os import os
@ -128,109 +126,93 @@ class CreateServer(show.ShowOne):
parser.add_argument( parser.add_argument(
'server_name', 'server_name',
metavar='<server-name>', metavar='<server-name>',
help='New server name', help='New server name')
)
parser.add_argument( parser.add_argument(
'--image', '--image',
metavar='<image>', metavar='<image>',
required=True, required=True,
help='Create server from this image', help='Create server from this image')
)
parser.add_argument( parser.add_argument(
'--flavor', '--flavor',
metavar='<flavor>', metavar='<flavor>',
required=True, required=True,
help='Create server with this flavor', help='Create server with this flavor')
)
parser.add_argument( parser.add_argument(
'--security-group', '--security-group',
metavar='<security-group-name>', metavar='<security-group-name>',
action='append', action='append',
default=[], default=[],
help='Security group to assign to this server ' \ help='Security group to assign to this server '
'(repeat for multiple groups)', '(repeat for multiple groups)')
)
parser.add_argument( parser.add_argument(
'--key-name', '--key-name',
metavar='<key-name>', metavar='<key-name>',
help='Keypair to inject into this server (optional extension)', help='Keypair to inject into this server (optional extension)')
)
parser.add_argument( parser.add_argument(
'--meta-data', '--meta-data',
metavar='<key=value>', metavar='<key=value>',
action='append', action='append',
default=[], default=[],
help='Metadata to store for this server ' \ help='Metadata to store for this server '
'(repeat for multiple values)', '(repeat for multiple values)')
)
parser.add_argument( parser.add_argument(
'--file', '--file',
metavar='<dest-filename=source-filename>', metavar='<dest-filename=source-filename>',
action='append', action='append',
default=[], default=[],
help='File to inject into image before boot ' \ help='File to inject into image before boot '
'(repeat for multiple files)', '(repeat for multiple files)')
)
parser.add_argument( parser.add_argument(
'--user-data', '--user-data',
metavar='<user-data>', metavar='<user-data>',
help='User data file to be serverd by the metadata server', help='User data file to be serverd by the metadata server')
)
parser.add_argument( parser.add_argument(
'--availability-zone', '--availability-zone',
metavar='<zone-name>', metavar='<zone-name>',
help='Keypair to inject into this server', help='Keypair to inject into this server')
)
parser.add_argument( parser.add_argument(
'--block-device-mapping', '--block-device-mapping',
metavar='<dev-name=mapping>', metavar='<dev-name=mapping>',
action='append', action='append',
default=[], default=[],
help='Map block devices; map is ' \ help='Map block devices; map is '
'<id>:<type>:<size(GB)>:<delete_on_terminate> ' \ '<id>:<type>:<size(GB)>:<delete_on_terminate> '
'(optional extension)', '(optional extension)')
)
parser.add_argument( parser.add_argument(
'--nic', '--nic',
metavar='<nic-config-string>', metavar='<nic-config-string>',
action='append', action='append',
default=[], default=[],
help='Specify NIC configuration (optional extension)', help='Specify NIC configuration (optional extension)')
)
parser.add_argument( parser.add_argument(
'--hint', '--hint',
metavar='<key=value>', metavar='<key=value>',
action='append', action='append',
default=[], default=[],
help='Hints for the scheduler (optional extension)', help='Hints for the scheduler (optional extension)')
)
parser.add_argument( parser.add_argument(
'--config-drive', '--config-drive',
metavar='<config-drive-volume>|True', metavar='<config-drive-volume>|True',
default=False, default=False,
help='Use specified volume as the config drive, ' \ help='Use specified volume as the config drive, '
'or \'True\' to use an ephemeral drive', 'or \'True\' to use an ephemeral drive')
)
parser.add_argument( parser.add_argument(
'--min', '--min',
metavar='<count>', metavar='<count>',
type=int, type=int,
default=1, default=1,
help='Minimum number of servers to launch (default=1)', help='Minimum number of servers to launch (default=1)')
)
parser.add_argument( parser.add_argument(
'--max', '--max',
metavar='<count>', metavar='<count>',
type=int, type=int,
default=1, default=1,
help='Maximum number of servers to launch (default=1)', help='Maximum number of servers to launch (default=1)')
)
parser.add_argument( parser.add_argument(
'--wait', '--wait',
dest='wait', dest='wait',
action='store_true', action='store_true',
help='Wait for server to become active to return', help='Wait for server to become active to return')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -270,7 +252,7 @@ class CreateServer(show.ShowOne):
try: try:
userdata = open(parsed_args.user_data) userdata = open(parsed_args.user_data)
except IOError, e: except IOError, e:
raise exceptions.CommandError("Can't open '%s': %s" % \ raise exceptions.CommandError("Can't open '%s': %s" %
(parsed_args.user_data, e)) (parsed_args.user_data, e))
block_device_mapping = dict(v.split('=', 1) block_device_mapping = dict(v.split('=', 1)
@ -319,8 +301,7 @@ class CreateServer(show.ShowOne):
block_device_mapping=block_device_mapping, block_device_mapping=block_device_mapping,
nics=nics, nics=nics,
scheduler_hints=hints, scheduler_hints=hints,
config_drive=config_drive, config_drive=config_drive)
)
self.log.debug('boot_args: %s' % boot_args) self.log.debug('boot_args: %s' % boot_args)
self.log.debug('boot_kwargs: %s' % boot_kwargs) self.log.debug('boot_kwargs: %s' % boot_kwargs)
@ -345,8 +326,7 @@ class DeleteServer(command.Command):
parser.add_argument( parser.add_argument(
'server', 'server',
metavar='<server>', metavar='<server>',
help='Name or ID of server to delete', help='Name or ID of server to delete')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -369,55 +349,45 @@ class ListServer(lister.Lister):
parser.add_argument( parser.add_argument(
'--reservation-id', '--reservation-id',
metavar='<reservation-id>', metavar='<reservation-id>',
help='only return instances that match the reservation', help='only return instances that match the reservation')
)
parser.add_argument( parser.add_argument(
'--ip', '--ip',
metavar='<ip-address-regex>', metavar='<ip-address-regex>',
help='regular expression to match IP address', help='regular expression to match IP address')
)
parser.add_argument( parser.add_argument(
'--ip6', '--ip6',
metavar='<ip-address-regex>', metavar='<ip-address-regex>',
help='regular expression to match IPv6 address', help='regular expression to match IPv6 address')
)
parser.add_argument( parser.add_argument(
'--name', '--name',
metavar='<name>', metavar='<name>',
help='regular expression to match name', help='regular expression to match name')
)
parser.add_argument( parser.add_argument(
'--instance-name', '--instance-name',
metavar='<server-name>', metavar='<server-name>',
help='regular expression to match instance name', help='regular expression to match instance name')
)
parser.add_argument( parser.add_argument(
'--status', '--status',
metavar='<status>', metavar='<status>',
help='search by server status',
# FIXME(dhellmann): Add choices? # FIXME(dhellmann): Add choices?
) help='search by server status')
parser.add_argument( parser.add_argument(
'--flavor', '--flavor',
metavar='<flavor>', metavar='<flavor>',
help='search by flavor ID', help='search by flavor ID')
)
parser.add_argument( parser.add_argument(
'--image', '--image',
metavar='<image>', metavar='<image>',
help='search by image ID', help='search by image ID')
)
parser.add_argument( parser.add_argument(
'--host', '--host',
metavar='<hostname>', metavar='<hostname>',
help='search by hostname', help='search by hostname')
)
parser.add_argument( parser.add_argument(
'--all-tenants', '--all-tenants',
action='store_true', action='store_true',
default=bool(int(os.environ.get("ALL_TENANTS", 0))), default=bool(int(os.environ.get("ALL_TENANTS", 0))),
help='display information from all tenants (admin only)', help='display information from all tenants (admin only)')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -443,8 +413,7 @@ class ListServer(lister.Lister):
(utils.get_item_properties( (utils.get_item_properties(
s, columns, s, columns,
formatters={'Networks': _format_servers_list_networks}, formatters={'Networks': _format_servers_list_networks},
) for s in data), ) for s in data))
)
class PauseServer(command.Command): class PauseServer(command.Command):
@ -458,8 +427,7 @@ class PauseServer(command.Command):
parser.add_argument( parser.add_argument(
'server', 'server',
metavar='<server>', metavar='<server>',
help='Name or ID of server to pause', help='Name or ID of server to pause')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -482,8 +450,7 @@ class RebootServer(command.Command):
parser.add_argument( parser.add_argument(
'server', 'server',
metavar='<server>', metavar='<server>',
help='Name or ID of server to reboot', help='Name or ID of server to reboot')
)
group = parser.add_mutually_exclusive_group() group = parser.add_mutually_exclusive_group()
group.add_argument( group.add_argument(
'--hard', '--hard',
@ -491,22 +458,19 @@ class RebootServer(command.Command):
action='store_const', action='store_const',
const=servers.REBOOT_HARD, const=servers.REBOOT_HARD,
default=servers.REBOOT_SOFT, default=servers.REBOOT_SOFT,
help='Perform a hard reboot', help='Perform a hard reboot')
)
group.add_argument( group.add_argument(
'--soft', '--soft',
dest='reboot_type', dest='reboot_type',
action='store_const', action='store_const',
const=servers.REBOOT_SOFT, const=servers.REBOOT_SOFT,
default=servers.REBOOT_SOFT, default=servers.REBOOT_SOFT,
help='Perform a soft reboot', help='Perform a soft reboot')
)
parser.add_argument( parser.add_argument(
'--wait', '--wait',
dest='wait', dest='wait',
action='store_true', action='store_true',
help='Wait for server to become active to return', help='Wait for server to become active to return')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -534,26 +498,22 @@ class RebuildServer(show.ShowOne):
parser.add_argument( parser.add_argument(
'server', 'server',
metavar='<server>', metavar='<server>',
help='Server name or ID', help='Server name or ID')
)
parser.add_argument( parser.add_argument(
'--image', '--image',
metavar='<image>', metavar='<image>',
required=True, required=True,
help='Recreate server from this image', help='Recreate server from this image')
)
parser.add_argument( parser.add_argument(
'--rebuild-password', '--rebuild-password',
metavar='<rebuild_password>', metavar='<rebuild_password>',
default=False, default=False,
help="Set the provided password on the rebuild instance", help="Set the provided password on the rebuild instance")
)
parser.add_argument( parser.add_argument(
'--wait', '--wait',
dest='wait', dest='wait',
action='store_true', action='store_true',
help='Wait for server to become active to return', help='Wait for server to become active to return')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -593,8 +553,7 @@ class ResumeServer(command.Command):
parser.add_argument( parser.add_argument(
'server', 'server',
metavar='<server>', metavar='<server>',
help='Name or ID of server to resume', help='Name or ID of server to resume')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -617,7 +576,7 @@ class ShowServer(show.ShowOne):
parser.add_argument( parser.add_argument(
'server', 'server',
metavar='<server>', metavar='<server>',
help='Name or ID of server to display'), help='Name or ID of server to display')
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -641,15 +600,14 @@ class SuspendServer(command.Command):
parser.add_argument( parser.add_argument(
'server', 'server',
metavar='<server>', metavar='<server>',
help='Name or ID of server to suspend', help='Name or ID of server to suspend')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
compute_client = self.app.client_manager.compute compute_client = self.app.client_manager.compute
server = utils.find_resource( server = utils.find_resource(compute_client.servers,
compute_client.servers, parsed_args.server) parsed_args.server)
server.suspend() server.suspend()
return return
@ -665,14 +623,13 @@ class UnpauseServer(command.Command):
parser.add_argument( parser.add_argument(
'server', 'server',
metavar='<server>', metavar='<server>',
help='Name or ID of server to unpause', help='Name or ID of server to unpause')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
compute_client = self.app.client_manager.compute compute_client = self.app.client_manager.compute
server = utils.find_resource( server = utils.find_resource(compute_client.servers,
compute_client.servers, parsed_args.server) parsed_args.server)
server.unpause() server.unpause()
return return

13
openstackclient/identity/client.py
View File

@ -17,6 +17,7 @@ import logging
from openstackclient.common import utils from openstackclient.common import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
API_NAME = 'identity' API_NAME = 'identity'
@ -27,19 +28,16 @@ API_VERSIONS = {
def make_client(instance): def make_client(instance):
"""Returns an identity service client. """Returns an identity service client."""
"""
identity_client = utils.get_client_class( identity_client = utils.get_client_class(
API_NAME, API_NAME,
instance._api_version[API_NAME], instance._api_version[API_NAME],
API_VERSIONS, API_VERSIONS)
)
if instance._url: if instance._url:
LOG.debug('instantiating identity client: token flow') LOG.debug('instantiating identity client: token flow')
client = identity_client( client = identity_client(
endpoint=instance._url, endpoint=instance._url,
token=instance._token, token=instance._token)
)
else: else:
LOG.debug('instantiating identity client: password flow') LOG.debug('instantiating identity client: password flow')
client = identity_client( client = identity_client(
@ -48,6 +46,5 @@ def make_client(instance):
tenant_name=instance._tenant_name, tenant_name=instance._tenant_name,
tenant_id=instance._tenant_id, tenant_id=instance._tenant_id,
auth_url=instance._auth_url, auth_url=instance._auth_url,
region_name=instance._region_name, region_name=instance._region_name)
)
return client return client

22
openstackclient/identity/v2_0/endpoint.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """Endpoint action implementations"""
Endpoint action implementations
"""
import logging import logging
@ -61,15 +59,14 @@ class CreateEndpoint(show.ShowOne):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
service = utils.find_resource( service = utils.find_resource(identity_client.services,
identity_client.services, parsed_args.service) parsed_args.service)
endpoint = identity_client.endpoints.create( endpoint = identity_client.endpoints.create(
parsed_args.region, parsed_args.region,
service.id, service.id,
parsed_args.publicurl, parsed_args.publicurl,
parsed_args.adminurl, parsed_args.adminurl,
parsed_args.internalurl, parsed_args.internalurl,)
)
info = {} info = {}
info.update(endpoint._info) info.update(endpoint._info)
@ -133,8 +130,7 @@ class ListEndpoint(lister.Lister):
(utils.get_item_properties( (utils.get_item_properties(
s, columns, s, columns,
formatters={}, formatters={},
) for s in data), ) for s in data))
)
class ShowEndpoint(show.ShowOne): class ShowEndpoint(show.ShowOne):
@ -196,8 +192,8 @@ class ShowEndpoint(show.ShowOne):
# The Identity 2.0 API doesn't support retrieving a single # The Identity 2.0 API doesn't support retrieving a single
# endpoint so we have to do this ourselves # endpoint so we have to do this ourselves
try: try:
service = utils.find_resource( service = utils.find_resource(identity_client.services,
identity_client.services, parsed_args.service) parsed_args.service)
except exceptions.CommandError: except exceptions.CommandError:
try: try:
# search for service type # search for service type
@ -215,8 +211,8 @@ class ShowEndpoint(show.ShowOne):
if ep.service_id == service.id: if ep.service_id == service.id:
info = {} info = {}
info.update(ep._info) info.update(ep._info)
service = utils.find_resource( service = utils.find_resource(identity_client.services,
identity_client.services, ep.service_id) ep.service_id)
info['service_name'] = service.name info['service_name'] = service.name
info['service_type'] = service.type info['service_type'] = service.type
return zip(*sorted(info.iteritems())) return zip(*sorted(info.iteritems()))

86
openstackclient/identity/v2_0/role.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """Role action implementations"""
Role action implementations
"""
import logging import logging
@ -37,36 +35,30 @@ class AddRole(show.ShowOne):
parser.add_argument( parser.add_argument(
'role', 'role',
metavar='<role>', metavar='<role>',
help='Role name or ID to add to user', help='Role name or ID to add to user')
)
parser.add_argument( parser.add_argument(
'--tenant', '--tenant',
metavar='<tenant>', metavar='<tenant>',
required=True, required=True,
help='Name or ID of tenant to include', help='Name or ID of tenant to include')
)
parser.add_argument( parser.add_argument(
'--user', '--user',
metavar='<user>', metavar='<user>',
required=True, required=True,
help='Name or ID of user to include', help='Name or ID of user to include')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
role = utils.find_resource( role = utils.find_resource(identity_client.roles, parsed_args.role)
identity_client.roles, parsed_args.role) tenant = utils.find_resource(identity_client.tenants,
tenant = utils.find_resource( parsed_args.tenant)
identity_client.tenants, parsed_args.tenant) user = utils.find_resource(identity_client.users, parsed_args.user)
user = utils.find_resource(
identity_client.users, parsed_args.user)
role = identity_client.roles.add_user_role( role = identity_client.roles.add_user_role(
user, user,
role, role,
tenant, tenant)
)
info = {} info = {}
info.update(role._info) info.update(role._info)
@ -84,16 +76,13 @@ class CreateRole(show.ShowOne):
parser.add_argument( parser.add_argument(
'role_name', 'role_name',
metavar='<role-name>', metavar='<role-name>',
help='New role name', help='New role name')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
role = identity_client.roles.create( role = identity_client.roles.create(parsed_args.role_name)
parsed_args.role_name,
)
info = {} info = {}
info.update(role._info) info.update(role._info)
@ -111,15 +100,13 @@ class DeleteRole(command.Command):
parser.add_argument( parser.add_argument(
'role', 'role',
metavar='<role>', metavar='<role>',
help='Name or ID of role to delete', help='Name or ID of role to delete')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
role = utils.find_resource( role = utils.find_resource(identity_client.roles, parsed_args.role)
identity_client.roles, parsed_args.role)
identity_client.roles.delete(role.id) identity_client.roles.delete(role.id)
return return
@ -138,8 +125,7 @@ class ListRole(lister.Lister):
(utils.get_item_properties( (utils.get_item_properties(
s, columns, s, columns,
formatters={}, formatters={},
) for s in data), ) for s in data))
)
class ListUserRole(lister.Lister): class ListUserRole(lister.Lister):
@ -154,13 +140,11 @@ class ListUserRole(lister.Lister):
'user', 'user',
metavar='<user>', metavar='<user>',
nargs='?', nargs='?',
help='Name or ID of user to include', help='Name or ID of user to include')
)
parser.add_argument( parser.add_argument(
'--tenant', '--tenant',
metavar='<tenant>', metavar='<tenant>',
help='Name or ID of tenant to include', help='Name or ID of tenant to include')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -176,10 +160,9 @@ class ListUserRole(lister.Lister):
if not parsed_args.user: if not parsed_args.user:
parsed_args.user = identity_client.auth_user_id parsed_args.user = identity_client.auth_user_id
tenant = utils.find_resource( tenant = utils.find_resource(identity_client.tenants,
identity_client.tenants, parsed_args.tenant) parsed_args.tenant)
user = utils.find_resource( user = utils.find_resource(identity_client.users, parsed_args.user)
identity_client.users, parsed_args.user)
data = identity_client.roles.roles_for_user(user.id, tenant.id) data = identity_client.roles.roles_for_user(user.id, tenant.id)
@ -192,8 +175,7 @@ class ListUserRole(lister.Lister):
(utils.get_item_properties( (utils.get_item_properties(
s, columns, s, columns,
formatters={}, formatters={},
) for s in data), ) for s in data))
)
class RemoveRole(command.Command): class RemoveRole(command.Command):
@ -207,36 +189,30 @@ class RemoveRole(command.Command):
parser.add_argument( parser.add_argument(
'role', 'role',
metavar='<role>', metavar='<role>',
help='Role name or ID to remove from user', help='Role name or ID to remove from user')
)
parser.add_argument( parser.add_argument(
'--tenant', '--tenant',
metavar='<tenant>', metavar='<tenant>',
required=True, required=True,
help='Name or ID of tenant', help='Name or ID of tenant')
)
parser.add_argument( parser.add_argument(
'--user', '--user',
metavar='<user>', metavar='<user>',
required=True, required=True,
help='Name or ID of user', help='Name or ID of user')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
role = utils.find_resource( role = utils.find_resource(identity_client.roles, parsed_args.role)
identity_client.roles, parsed_args.role) tenant = utils.find_resource(identity_client.tenants,
tenant = utils.find_resource( parsed_args.tenant)
identity_client.tenants, parsed_args.tenant) user = utils.find_resource(identity_client.users, parsed_args.user)
user = utils.find_resource(
identity_client.users, parsed_args.user)
identity_client.roles.remove_user_role( identity_client.roles.remove_user_role(
user.id, user.id,
role.id, role.id,
tenant.id, tenant.id)
)
class ShowRole(show.ShowOne): class ShowRole(show.ShowOne):
@ -250,15 +226,13 @@ class ShowRole(show.ShowOne):
parser.add_argument( parser.add_argument(
'role', 'role',
metavar='<role>', metavar='<role>',
help='Name or ID of role to display', help='Name or ID of role to display')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
role = utils.find_resource( role = utils.find_resource(identity_client.roles, parsed_args.role)
identity_client.roles, parsed_args.role)
info = {} info = {}
info.update(role._info) info.update(role._info)

23
openstackclient/identity/v2_0/service.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """Service action implementations"""
Service action implementations
"""
import logging import logging
@ -44,13 +42,11 @@ class CreateService(show.ShowOne):
'--type', '--type',
metavar='<service-type>', metavar='<service-type>',
required=True, required=True,
help='New service type', help='New service type')
)
parser.add_argument( parser.add_argument(
'--description', '--description',
metavar='<service-description>', metavar='<service-description>',
help='New service description', help='New service description')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -59,8 +55,7 @@ class CreateService(show.ShowOne):
service = identity_client.services.create( service = identity_client.services.create(
parsed_args.name, parsed_args.name,
parsed_args.type, parsed_args.type,
parsed_args.description, parsed_args.description)
)
info = {} info = {}
info.update(service._info) info.update(service._info)
@ -78,8 +73,7 @@ class DeleteService(command.Command):
parser.add_argument( parser.add_argument(
'service', 'service',
metavar='<service-id>', metavar='<service-id>',
help='ID of service to delete', help='ID of service to delete')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -115,8 +109,7 @@ class ListService(lister.Lister):
(utils.get_item_properties( (utils.get_item_properties(
s, columns, s, columns,
formatters={}, formatters={},
) for s in data), ) for s in data))
)
class ShowService(show.ShowOne): class ShowService(show.ShowOne):
@ -138,8 +131,8 @@ class ShowService(show.ShowOne):
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
try: try:
# search for the usual ID or name # search for the usual ID or name
service = utils.find_resource( service = utils.find_resource(identity_client.services,
identity_client.services, parsed_args.service) parsed_args.service)
except exceptions.CommandError: except exceptions.CommandError:
try: try:
# search for service type # search for service type

58
openstackclient/identity/v2_0/tenant.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """Tenant action implementations"""
Tenant action implementations
"""
import logging import logging
@ -37,27 +35,23 @@ class CreateTenant(show.ShowOne):
parser.add_argument( parser.add_argument(
'tenant_name', 'tenant_name',
metavar='<tenant-name>', metavar='<tenant-name>',
help='New tenant name', help='New tenant name')
)
parser.add_argument( parser.add_argument(
'--description', '--description',
metavar='<tenant-description>', metavar='<tenant-description>',
help='New tenant description', help='New tenant description')
)
enable_group = parser.add_mutually_exclusive_group() enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument( enable_group.add_argument(
'--enable', '--enable',
dest='enabled', dest='enabled',
action='store_true', action='store_true',
default=True, default=True,
help='Enable tenant', help='Enable tenant')
)
enable_group.add_argument( enable_group.add_argument(
'--disable', '--disable',
dest='enabled', dest='enabled',
action='store_false', action='store_false',
help='Disable tenant', help='Disable tenant')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -66,8 +60,7 @@ class CreateTenant(show.ShowOne):
tenant = identity_client.tenants.create( tenant = identity_client.tenants.create(
parsed_args.tenant_name, parsed_args.tenant_name,
description=parsed_args.description, description=parsed_args.description,
enabled=parsed_args.enabled, enabled=parsed_args.enabled)
)
info = {} info = {}
info.update(tenant._info) info.update(tenant._info)
@ -85,15 +78,14 @@ class DeleteTenant(command.Command):
parser.add_argument( parser.add_argument(
'tenant', 'tenant',
metavar='<tenant>', metavar='<tenant>',
help='Name or ID of tenant to delete', help='Name or ID of tenant to delete')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
tenant = utils.find_resource( tenant = utils.find_resource(identity_client.tenants,
identity_client.tenants, parsed_args.tenant) parsed_args.tenant)
identity_client.tenants.delete(tenant.id) identity_client.tenants.delete(tenant.id)
return return
@ -110,8 +102,7 @@ class ListTenant(lister.Lister):
'--long', '--long',
action='store_true', action='store_true',
default=False, default=False,
help='Additional fields are listed in output', help='Additional fields are listed in output')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -125,8 +116,7 @@ class ListTenant(lister.Lister):
(utils.get_item_properties( (utils.get_item_properties(
s, columns, s, columns,
formatters={}, formatters={},
) for s in data), ) for s in data))
)
class SetTenant(command.Command): class SetTenant(command.Command):
@ -140,39 +130,34 @@ class SetTenant(command.Command):
parser.add_argument( parser.add_argument(
'tenant', 'tenant',
metavar='<tenant>', metavar='<tenant>',
help='Name or ID of tenant to change', help='Name or ID of tenant to change')
)
parser.add_argument( parser.add_argument(
'--name', '--name',
metavar='<new-tenant-name>', metavar='<new-tenant-name>',
help='New tenant name', help='New tenant name')
)
parser.add_argument( parser.add_argument(
'--description', '--description',
metavar='<tenant-description>', metavar='<tenant-description>',
help='New tenant description', help='New tenant description')
)
enable_group = parser.add_mutually_exclusive_group() enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument( enable_group.add_argument(
'--enable', '--enable',
dest='enabled', dest='enabled',
action='store_true', action='store_true',
default=True, default=True,
help='Enable tenant (default)', help='Enable tenant (default)')
)
enable_group.add_argument( enable_group.add_argument(
'--disable', '--disable',
dest='enabled', dest='enabled',
action='store_false', action='store_false',
help='Disable tenant', help='Disable tenant')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
tenant = utils.find_resource( tenant = utils.find_resource(identity_client.tenants,
identity_client.tenants, parsed_args.tenant) parsed_args.tenant)
kwargs = {} kwargs = {}
if parsed_args.name: if parsed_args.name:
kwargs['name'] = parsed_args.name kwargs['name'] = parsed_args.name
@ -199,15 +184,14 @@ class ShowTenant(show.ShowOne):
parser.add_argument( parser.add_argument(
'tenant', 'tenant',
metavar='<tenant>', metavar='<tenant>',
help='Name or ID of tenant to display', help='Name or ID of tenant to display')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
tenant = utils.find_resource( tenant = utils.find_resource(identity_client.tenants,
identity_client.tenants, parsed_args.tenant) parsed_args.tenant)
info = {} info = {}
info.update(tenant._info) info.update(tenant._info)

78
openstackclient/identity/v2_0/user.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """User action implementations"""
User action implementations
"""
import logging import logging
@ -37,45 +35,39 @@ class CreateUser(show.ShowOne):
parser.add_argument( parser.add_argument(
'name', 'name',
metavar='<user-name>', metavar='<user-name>',
help='New user name', help='New user name')
)
parser.add_argument( parser.add_argument(
'--password', '--password',
metavar='<user-password>', metavar='<user-password>',
help='New user password', help='New user password')
)
parser.add_argument( parser.add_argument(
'--email', '--email',
metavar='<user-email>', metavar='<user-email>',
help='New user email address', help='New user email address')
)
parser.add_argument( parser.add_argument(
'--tenant', '--tenant',
metavar='<tenant>', metavar='<tenant>',
help='New default tenant name or ID', help='New default tenant name or ID')
)
enable_group = parser.add_mutually_exclusive_group() enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument( enable_group.add_argument(
'--enable', '--enable',
dest='enabled', dest='enabled',
action='store_true', action='store_true',
default=True, default=True,
help='Enable user', help='Enable user')
)
enable_group.add_argument( enable_group.add_argument(
'--disable', '--disable',
dest='enabled', dest='enabled',
action='store_false', action='store_false',
help='Disable user', help='Disable user')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
if parsed_args.tenant: if parsed_args.tenant:
tenant_id = utils.find_resource( tenant_id = utils.find_resource(identity_client.tenants,
identity_client.tenants, parsed_args.tenant).id parsed_args.tenant).id
else: else:
tenant_id = None tenant_id = None
user = identity_client.users.create( user = identity_client.users.create(
@ -83,8 +75,7 @@ class CreateUser(show.ShowOne):
parsed_args.password, parsed_args.password,
parsed_args.email, parsed_args.email,
tenant_id=tenant_id, tenant_id=tenant_id,
enabled=parsed_args.enabled, enabled=parsed_args.enabled)
)
info = {} info = {}
info.update(user._info) info.update(user._info)
@ -102,15 +93,13 @@ class DeleteUser(command.Command):
parser.add_argument( parser.add_argument(
'user', 'user',
metavar='<user>', metavar='<user>',
help='Name or ID of user to delete', help='Name or ID of user to delete')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
user = utils.find_resource( user = utils.find_resource(identity_client.users, parsed_args.user)
identity_client.users, parsed_args.user)
identity_client.users.delete(user.id) identity_client.users.delete(user.id)
return return
@ -126,14 +115,12 @@ class ListUser(lister.Lister):
parser.add_argument( parser.add_argument(
'--tenant', '--tenant',
metavar='<tenant>', metavar='<tenant>',
help='Name or ID of tenant to filter users', help='Name or ID of tenant to filter users')
)
parser.add_argument( parser.add_argument(
'--long', '--long',
action='store_true', action='store_true',
default=False, default=False,
help='Additional fields are listed in output', help='Additional fields are listed in output')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -147,8 +134,7 @@ class ListUser(lister.Lister):
(utils.get_item_properties( (utils.get_item_properties(
s, columns, s, columns,
formatters={}, formatters={},
) for s in data), ) for s in data))
)
class SetUser(command.Command): class SetUser(command.Command):
@ -162,57 +148,49 @@ class SetUser(command.Command):
parser.add_argument( parser.add_argument(
'user', 'user',
metavar='<user>', metavar='<user>',
help='Name or ID of user to change', help='Name or ID of user to change')
)
parser.add_argument( parser.add_argument(
'--name', '--name',
metavar='<new-user-name>', metavar='<new-user-name>',
help='New user name', help='New user name')
)
parser.add_argument( parser.add_argument(
'--password', '--password',
metavar='<user-password>', metavar='<user-password>',
help='New user password', help='New user password')
)
parser.add_argument( parser.add_argument(
'--email', '--email',
metavar='<user-email>', metavar='<user-email>',
help='New user email address', help='New user email address')
)
parser.add_argument( parser.add_argument(
'--tenant', '--tenant',
metavar='<tenant>', metavar='<tenant>',
help='New default tenant name or ID', help='New default tenant name or ID')
)
enable_group = parser.add_mutually_exclusive_group() enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument( enable_group.add_argument(
'--enable', '--enable',
dest='enabled', dest='enabled',
action='store_true', action='store_true',
default=True, default=True,
help='Enable user (default)', help='Enable user (default)')
)
enable_group.add_argument( enable_group.add_argument(
'--disable', '--disable',
dest='enabled', dest='enabled',
action='store_false', action='store_false',
help='Disable user', help='Disable user')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
user = utils.find_resource( user = utils.find_resource(identity_client.users, parsed_args.user)
identity_client.users, parsed_args.user)
kwargs = {} kwargs = {}
if parsed_args.name: if parsed_args.name:
kwargs['name'] = parsed_args.name kwargs['name'] = parsed_args.name
if parsed_args.email: if parsed_args.email:
kwargs['email'] = parsed_args.email kwargs['email'] = parsed_args.email
if parsed_args.tenant: if parsed_args.tenant:
tenant_id = utils.find_resource( tenant_id = utils.find_resource(identity_client.tenants,
identity_client.tenants, parsed_args.tenant).id parsed_args.tenant).id
kwargs['tenantId'] = tenant_id kwargs['tenantId'] = tenant_id
if 'enabled' in parsed_args: if 'enabled' in parsed_args:
kwargs['enabled'] = parsed_args.enabled kwargs['enabled'] = parsed_args.enabled
@ -235,15 +213,13 @@ class ShowUser(show.ShowOne):
parser.add_argument( parser.add_argument(
'user', 'user',
metavar='<user>', metavar='<user>',
help='Name or ID of user to display', help='Name or ID of user to display')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
user = utils.find_resource( user = utils.find_resource(identity_client.users, parsed_args.user)
identity_client.users, parsed_args.user)
info = {} info = {}
info.update(user._info) info.update(user._info)

53
openstackclient/identity/v3/group.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """Group action implementations"""
Group action implementations
"""
import logging import logging
@ -37,18 +35,15 @@ class CreateGroup(show.ShowOne):
parser.add_argument( parser.add_argument(
'name', 'name',
metavar='<group-name>', metavar='<group-name>',
help='New group name', help='New group name')
)
parser.add_argument( parser.add_argument(
'--description', '--description',
metavar='<group-description>', metavar='<group-description>',
help='New group description', help='New group description')
)
parser.add_argument( parser.add_argument(
'--domain', '--domain',
metavar='<group-domain>', metavar='<group-domain>',
help='References the domain ID or name which owns the group', help='References the domain ID or name which owns the group')
)
return parser return parser
@ -56,15 +51,14 @@ class CreateGroup(show.ShowOne):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
if parsed_args.domain: if parsed_args.domain:
domain = utils.find_resource( domain = utils.find_resource(identity_client.domains,
identity_client.domains, parsed_args.domain).id parsed_args.domain).id
else: else:
domain = None domain = None
group = identity_client.groups.create( group = identity_client.groups.create(
parsed_args.name, parsed_args.name,
domain=domain, domain=domain,
description=parsed_args.description, description=parsed_args.description)
)
info = {} info = {}
info.update(group._info) info.update(group._info)
@ -82,15 +76,13 @@ class DeleteGroup(command.Command):
parser.add_argument( parser.add_argument(
'group', 'group',
metavar='<group>', metavar='<group>',
help='Name or ID of group to delete', help='Name or ID of group to delete')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
group = utils.find_resource( group = utils.find_resource(identity_client.groups, parsed_args.group)
identity_client.groups, parsed_args.group)
identity_client.groups.delete(group.id) identity_client.groups.delete(group.id)
return return
@ -107,8 +99,7 @@ class ListGroup(lister.Lister):
'--long', '--long',
action='store_true', action='store_true',
default=False, default=False,
help='Additional fields are listed in output', help='Additional fields are listed in output')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -122,8 +113,7 @@ class ListGroup(lister.Lister):
(utils.get_item_properties( (utils.get_item_properties(
s, columns, s, columns,
formatters={}, formatters={},
) for s in data), ) for s in data))
)
class SetGroup(command.Command): class SetGroup(command.Command):
@ -137,30 +127,25 @@ class SetGroup(command.Command):
parser.add_argument( parser.add_argument(
'group', 'group',
metavar='<group>', metavar='<group>',
help='Name or ID of group to change', help='Name or ID of group to change')
)
parser.add_argument( parser.add_argument(
'--name', '--name',
metavar='<new-group-name>', metavar='<new-group-name>',
help='New group name', help='New group name')
)
parser.add_argument( parser.add_argument(
'--domain', '--domain',
metavar='<group-domain>', metavar='<group-domain>',
help='New domain name or ID that will now own the group', help='New domain name or ID that will now own the group')
)
parser.add_argument( parser.add_argument(
'--description', '--description',
metavar='<group-description>', metavar='<group-description>',
help='New group description', help='New group description')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
group = utils.find_resource( group = utils.find_resource(identity_client.groups, parsed_args.group)
identity_client.groups, parsed_args.group)
kwargs = {} kwargs = {}
if parsed_args.name: if parsed_args.name:
kwargs['name'] = parsed_args.name kwargs['name'] = parsed_args.name
@ -189,15 +174,13 @@ class ShowGroup(show.ShowOne):
parser.add_argument( parser.add_argument(
'group', 'group',
metavar='<group>', metavar='<group>',
help='Name or ID of group to display', help='Name or ID of group to display')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
group = utils.find_resource( group = utils.find_resource(identity_client.groups, parsed_args.group)
identity_client.groups, parsed_args.group)
info = {} info = {}
info.update(group._info) info.update(group._info)

70
openstackclient/identity/v3/project.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """Project action implementations"""
Project action implementations
"""
import logging import logging
@ -37,18 +35,15 @@ class CreateProject(show.ShowOne):
parser.add_argument( parser.add_argument(
'project_name', 'project_name',
metavar='<project-name>', metavar='<project-name>',
help='New project name', help='New project name')
)
parser.add_argument( parser.add_argument(
'--domain', '--domain',
metavar='<project-domain>', metavar='<project-domain>',
help='References the domain name or ID which owns the project', help='References the domain name or ID which owns the project')
)
parser.add_argument( parser.add_argument(
'--description', '--description',
metavar='<project-description>', metavar='<project-description>',
help='New project description', help='New project description')
)
# FIXME (stevemar): need to update enabled/disabled as per Dolph's # FIXME (stevemar): need to update enabled/disabled as per Dolph's
# comments in 19999/4 # comments in 19999/4
enable_group = parser.add_mutually_exclusive_group() enable_group = parser.add_mutually_exclusive_group()
@ -57,30 +52,29 @@ class CreateProject(show.ShowOne):
dest='enabled', dest='enabled',
action='store_true', action='store_true',
default=True, default=True,
help='Enable project', help='Enable project')
)
enable_group.add_argument( enable_group.add_argument(
'--disable', '--disable',
dest='enabled', dest='enabled',
action='store_false', action='store_false',
help='Disable project', help='Disable project')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
if parsed_args.domain: if parsed_args.domain:
domain = utils.find_resource( domain = utils.find_resource(identity_client.domains,
identity_client.domains, parsed_args.domain).id parsed_args.domain).id
else: else:
domain = None domain = None
project = identity_client.projects.create( project = identity_client.projects.create(
parsed_args.project_name, parsed_args.project_name,
domain=domain, domain=domain,
description=parsed_args.description, description=parsed_args.description,
enabled=parsed_args.enabled, enabled=parsed_args.enabled)
)
info = {} info = {}
info.update(project._info) info.update(project._info)
@ -98,15 +92,14 @@ class DeleteProject(command.Command):
parser.add_argument( parser.add_argument(
'project', 'project',
metavar='<project>', metavar='<project>',
help='Name or ID of project to delete', help='Name or ID of project to delete')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
project = utils.find_resource( project = utils.find_resource(identity_client.projects,
identity_client.projects, parsed_args.project) parsed_args.project)
identity_client.projects.delete(project.id) identity_client.projects.delete(project.id)
return return
@ -123,8 +116,7 @@ class ListProject(lister.Lister):
'--long', '--long',
action='store_true', action='store_true',
default=False, default=False,
help='Additional fields are listed in output', help='Additional fields are listed in output')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -138,8 +130,7 @@ class ListProject(lister.Lister):
(utils.get_item_properties( (utils.get_item_properties(
s, columns, s, columns,
formatters={}, formatters={},
) for s in data), ) for s in data))
)
class SetProject(command.Command): class SetProject(command.Command):
@ -153,44 +144,38 @@ class SetProject(command.Command):
parser.add_argument( parser.add_argument(
'project', 'project',
metavar='<project>', metavar='<project>',
help='Name or ID of project to change', help='Name or ID of project to change')
)
parser.add_argument( parser.add_argument(
'--name', '--name',
metavar='<new-project-name>', metavar='<new-project-name>',
help='New project name', help='New project name')
)
parser.add_argument( parser.add_argument(
'--domain', '--domain',
metavar='<project-domain>', metavar='<project-domain>',
help='New domain name or ID that will now own the project', help='New domain name or ID that will now own the project')
)
parser.add_argument( parser.add_argument(
'--description', '--description',
metavar='<project-description>', metavar='<project-description>',
help='New project description', help='New project description')
)
enable_group = parser.add_mutually_exclusive_group() enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument( enable_group.add_argument(
'--enable', '--enable',
dest='enabled', dest='enabled',
action='store_true', action='store_true',
default=True, default=True,
help='Enable project (default)', help='Enable project (default)')
)
enable_group.add_argument( enable_group.add_argument(
'--disable', '--disable',
dest='enabled', dest='enabled',
action='store_false', action='store_false',
help='Disable project', help='Disable project')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
project = utils.find_resource( project = utils.find_resource(identity_client.projects,
identity_client.projects, parsed_args.project) parsed_args.project)
kwargs = {} kwargs = {}
if parsed_args.name: if parsed_args.name:
kwargs['name'] = parsed_args.name kwargs['name'] = parsed_args.name
@ -221,15 +206,14 @@ class ShowProject(show.ShowOne):
parser.add_argument( parser.add_argument(
'project', 'project',
metavar='<project>', metavar='<project>',
help='Name or ID of project to display', help='Name or ID of project to display')
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
project = utils.find_resource( project = utils.find_resource(identity_client.projects,
identity_client.projects, parsed_args.project) parsed_args.project)
info = {} info = {}
info.update(project._info) info.update(project._info)

3
openstackclient/image/client.py
View File

@ -32,8 +32,7 @@ def make_client(instance):
image_client = utils.get_client_class( image_client = utils.get_client_class(
API_NAME, API_NAME,
instance._api_version[API_NAME], instance._api_version[API_NAME],
API_VERSIONS API_VERSIONS)
)
if not instance._url: if not instance._url:
instance._url = instance.get_endpoint_for_service_type(API_NAME) instance._url = instance.get_endpoint_for_service_type(API_NAME)

68
openstackclient/shell.py
View File

@ -13,9 +13,7 @@
# under the License. # under the License.
# #
""" """Command-line interface to the OpenStack APIs"""
Command-line interface to the OpenStack APIs
"""
import getpass import getpass
import logging import logging
@ -59,8 +57,7 @@ class OpenStackShell(App):
super(OpenStackShell, self).__init__( super(OpenStackShell, self).__init__(
description=__doc__.strip(), description=__doc__.strip(),
version=VERSION, version=VERSION,
command_manager=CommandManager('openstack.cli'), command_manager=CommandManager('openstack.cli'))
)
# This is instantiated in initialize_app() only when using # This is instantiated in initialize_app() only when using
# password flow auth # password flow auth
@ -69,57 +66,64 @@ class OpenStackShell(App):
def build_option_parser(self, description, version): def build_option_parser(self, description, version):
parser = super(OpenStackShell, self).build_option_parser( parser = super(OpenStackShell, self).build_option_parser(
description, description,
version, version)
)
# Global arguments # Global arguments
parser.add_argument('--os-auth-url', metavar='<auth-url>', parser.add_argument(
'--os-auth-url',
metavar='<auth-url>',
default=env('OS_AUTH_URL'), default=env('OS_AUTH_URL'),
help='Authentication URL (Env: OS_AUTH_URL)') help='Authentication URL (Env: OS_AUTH_URL)')
parser.add_argument(
parser.add_argument('--os-tenant-name', metavar='<auth-tenant-name>', '--os-tenant-name',
metavar='<auth-tenant-name>',
default=env('OS_TENANT_NAME'), default=env('OS_TENANT_NAME'),
help='Authentication tenant name (Env: OS_TENANT_NAME)') help='Authentication tenant name (Env: OS_TENANT_NAME)')
parser.add_argument(
parser.add_argument('--os-tenant-id', metavar='<auth-tenant-id>', '--os-tenant-id',
metavar='<auth-tenant-id>',
default=env('OS_TENANT_ID'), default=env('OS_TENANT_ID'),
help='Authentication tenant ID (Env: OS_TENANT_ID)') help='Authentication tenant ID (Env: OS_TENANT_ID)')
parser.add_argument(
parser.add_argument('--os-username', metavar='<auth-username>', '--os-username',
metavar='<auth-username>',
default=utils.env('OS_USERNAME'), default=utils.env('OS_USERNAME'),
help='Authentication username (Env: OS_USERNAME)') help='Authentication username (Env: OS_USERNAME)')
parser.add_argument(
parser.add_argument('--os-password', metavar='<auth-password>', '--os-password',
metavar='<auth-password>',
default=utils.env('OS_PASSWORD'), default=utils.env('OS_PASSWORD'),
help='Authentication password (Env: OS_PASSWORD)') help='Authentication password (Env: OS_PASSWORD)')
parser.add_argument(
parser.add_argument('--os-region-name', metavar='<auth-region-name>', '--os-region-name',
metavar='<auth-region-name>',
default=env('OS_REGION_NAME'), default=env('OS_REGION_NAME'),
help='Authentication region name (Env: OS_REGION_NAME)') help='Authentication region name (Env: OS_REGION_NAME)')
parser.add_argument(
parser.add_argument('--os-identity-api-version', '--os-identity-api-version',
metavar='<identity-api-version>', metavar='<identity-api-version>',
default=env('OS_IDENTITY_API_VERSION', default='2.0'), default=env('OS_IDENTITY_API_VERSION', default='2.0'),
help='Identity API version, default=2.0 ' help='Identity API version, default=2.0 '
'(Env: OS_IDENTITY_API_VERSION)') '(Env: OS_IDENTITY_API_VERSION)')
parser.add_argument(
parser.add_argument('--os-compute-api-version', '--os-compute-api-version',
metavar='<compute-api-version>', metavar='<compute-api-version>',
default=env('OS_COMPUTE_API_VERSION', default='2'), default=env('OS_COMPUTE_API_VERSION', default='2'),
help='Compute API version, default=2 ' help='Compute API version, default=2 '
'(Env: OS_COMPUTE_API_VERSION)') '(Env: OS_COMPUTE_API_VERSION)')
parser.add_argument(
parser.add_argument('--os-image-api-version', '--os-image-api-version',
metavar='<image-api-version>', metavar='<image-api-version>',
default=env('OS_IMAGE_API_VERSION', default='1.0'), default=env('OS_IMAGE_API_VERSION', default='1.0'),
help='Image API version, default=1.0 ' help='Image API version, default=1.0 (Env: OS_IMAGE_API_VERSION)')
'(Env: OS_IMAGE_API_VERSION)') parser.add_argument(
'--os-token',
parser.add_argument('--os-token', metavar='<token>', metavar='<token>',
default=env('OS_TOKEN'), default=env('OS_TOKEN'),
help='Defaults to env[OS_TOKEN]') help='Defaults to env[OS_TOKEN]')
parser.add_argument(
parser.add_argument('--os-url', metavar='<url>', '--os-url',
metavar='<url>',
default=env('OS_URL'), default=env('OS_URL'),
help='Defaults to env[OS_URL]') help='Defaults to env[OS_URL]')
@ -198,8 +202,7 @@ class OpenStackShell(App):
username=self.options.os_username, username=self.options.os_username,
password=self.options.os_password, password=self.options.os_password,
region_name=self.options.os_region_name, region_name=self.options.os_region_name,
api_version=self.api_version, api_version=self.api_version)
)
return return
def init_keyring_backend(self): def init_keyring_backend(self):
@ -260,7 +263,6 @@ class OpenStackShell(App):
def prepare_to_run_command(self, cmd): def prepare_to_run_command(self, cmd):
"""Set up auth and API versions""" """Set up auth and API versions"""
self.log.debug('prepare_to_run_command %s', cmd.__class__.__name__) self.log.debug('prepare_to_run_command %s', cmd.__class__.__name__)
self.log.debug("api: %s" % cmd.api if hasattr(cmd, 'api') else None) self.log.debug("api: %s" % cmd.api if hasattr(cmd, 'api') else None)
return return

2
run_tests.sh
View File

@ -101,7 +101,7 @@ function copy_subunit_log {
function run_pep8 { function run_pep8 {
echo "Running pep8 ..." echo "Running pep8 ..."
srcfiles="openstackclient tests" srcfiles="openstackclient tests setup.py"
# Just run PEP8 in current environment # Just run PEP8 in current environment
# #
# NOTE(sirp): W602 (deprecated 3-arg raise) is being ignored for the # NOTE(sirp): W602 (deprecated 3-arg raise) is being ignored for the

5
setup.py
View File

@ -63,7 +63,6 @@ setuptools.setup(
'openstackclient.identity.v2_0.endpoint:ListEndpoint', 'openstackclient.identity.v2_0.endpoint:ListEndpoint',
'show_endpoint=' + 'show_endpoint=' +
'openstackclient.identity.v2_0.endpoint:ShowEndpoint', 'openstackclient.identity.v2_0.endpoint:ShowEndpoint',
'add_role=' + 'add_role=' +
'openstackclient.identity.v2_0.role:AddRole', 'openstackclient.identity.v2_0.role:AddRole',
'create_role=' + 'create_role=' +
@ -74,7 +73,6 @@ setuptools.setup(
'remove_role=' + 'remove_role=' +
'openstackclient.identity.v2_0.role:RemoveRole', 'openstackclient.identity.v2_0.role:RemoveRole',
'show_role=openstackclient.identity.v2_0.role:ShowRole', 'show_role=openstackclient.identity.v2_0.role:ShowRole',
'create_server=openstackclient.compute.v2.server:CreateServer', 'create_server=openstackclient.compute.v2.server:CreateServer',
'delete_server=openstackclient.compute.v2.server:DeleteServer', 'delete_server=openstackclient.compute.v2.server:DeleteServer',
'list_server=openstackclient.compute.v2.server:ListServer', 'list_server=openstackclient.compute.v2.server:ListServer',
@ -85,14 +83,12 @@ setuptools.setup(
'show_server=openstackclient.compute.v2.server:ShowServer', 'show_server=openstackclient.compute.v2.server:ShowServer',
'suspend_server=openstackclient.compute.v2.server:SuspendServer', 'suspend_server=openstackclient.compute.v2.server:SuspendServer',
'unpause_server=openstackclient.compute.v2.server:UnpauseServer', 'unpause_server=openstackclient.compute.v2.server:UnpauseServer',
'create_service=' + 'create_service=' +
'openstackclient.identity.v2_0.service:CreateService', 'openstackclient.identity.v2_0.service:CreateService',
'delete_service=' + 'delete_service=' +
'openstackclient.identity.v2_0.service:DeleteService', 'openstackclient.identity.v2_0.service:DeleteService',
'list_service=openstackclient.identity.v2_0.service:ListService', 'list_service=openstackclient.identity.v2_0.service:ListService',
'show_service=openstackclient.identity.v2_0.service:ShowService', 'show_service=openstackclient.identity.v2_0.service:ShowService',
'create_tenant=' + 'create_tenant=' +
'openstackclient.identity.v2_0.tenant:CreateTenant', 'openstackclient.identity.v2_0.tenant:CreateTenant',
'delete_tenant=' + 'delete_tenant=' +
@ -100,7 +96,6 @@ setuptools.setup(
'list_tenant=openstackclient.identity.v2_0.tenant:ListTenant', 'list_tenant=openstackclient.identity.v2_0.tenant:ListTenant',
'set_tenant=openstackclient.identity.v2_0.tenant:SetTenant', 'set_tenant=openstackclient.identity.v2_0.tenant:SetTenant',
'show_tenant=openstackclient.identity.v2_0.tenant:ShowTenant', 'show_tenant=openstackclient.identity.v2_0.tenant:ShowTenant',
'create_user=' + 'create_user=' +
'openstackclient.identity.v2_0.user:CreateUser', 'openstackclient.identity.v2_0.user:CreateUser',
'delete_user=' + 'delete_user=' +

2
tools/test-requires
View File

@ -5,7 +5,7 @@ discover
fixtures>=0.3.12 fixtures>=0.3.12
mock mock
openstack.nose_plugin openstack.nose_plugin
pep8==1.1 pep8==1.3.3
sphinx>=1.1.2 sphinx>=1.1.2
testrepository>=0.0.13 testrepository>=0.0.13
testtools>=0.9.26 testtools>=0.9.26

2
tox.ini
View File

@ -11,7 +11,7 @@ deps = -r{toxinidir}/tools/pip-requires
commands = python setup.py testr --testr-args='{posargs}' commands = python setup.py testr --testr-args='{posargs}'
[testenv:pep8] [testenv:pep8]
deps = pep8==1.1 deps = pep8==1.3.3
commands = pep8 --repeat --show-source openstackclient setup.py commands = pep8 --repeat --show-source openstackclient setup.py
[testenv:venv] [testenv:venv]