Initial checkin for new CLI and client package
Copied mostly from python-keystoneclient with some Glance-specific stuff. README.rst shows what WILL be the way to do things, not what is currently coded :)
This commit is contained in:
Jay Pipes
@@ -0,0 +1 @@
|
||||
from keystoneclient.v2_0.client import Client
|
||||
@@ -0,0 +1,113 @@
|
||||
# Copyright 2011 Nebula, Inc.
|
||||
# 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.
|
||||
import logging
|
||||
|
||||
from glanceclient import client
|
||||
from glanceclient import exceptions
|
||||
from glanceclient import service_catalog
|
||||
from glanceclient.v1_1 import images
|
||||
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Client(client.HTTPClient):
|
||||
"""Client for the OpenStack Images v1.1 API.
|
||||
|
||||
:param string username: Username for authentication. (optional)
|
||||
:param string password: Password for authentication. (optional)
|
||||
:param string token: Token for authentication. (optional)
|
||||
:param string tenant_name: Tenant id. (optional)
|
||||
:param string tenant_id: Tenant name. (optional)
|
||||
:param string auth_url: Keystone service endpoint for authorization.
|
||||
:param string region_name: Name of a region to select when choosing an
|
||||
endpoint from the service catalog.
|
||||
:param string endpoint: A user-supplied endpoint URL for the glance
|
||||
service. Lazy-authentication is possible for API
|
||||
service calls if endpoint is set at
|
||||
instantiation.(optional)
|
||||
:param integer timeout: Allows customization of the timeout for client
|
||||
http requests. (optional)
|
||||
|
||||
Example::
|
||||
|
||||
>>> from glanceclient.v1_1 import client
|
||||
>>> glance = client.Client(username=USER,
|
||||
password=PASS,
|
||||
tenant_name=TENANT_NAME,
|
||||
auth_url=KEYSTONE_URL)
|
||||
>>> glance.images.list()
|
||||
...
|
||||
>>> image = glance.images.get(IMAGE_ID)
|
||||
>>> image.delete()
|
||||
|
||||
"""
|
||||
|
||||
def __init__(self, endpoint=None, **kwargs):
|
||||
""" Initialize a new client for the Images v1.1 API. """
|
||||
super(Client, self).__init__(endpoint=endpoint, **kwargs)
|
||||
self.images = images.ImageManager(self)
|
||||
# NOTE(gabriel): If we have a pre-defined endpoint then we can
|
||||
# get away with lazy auth. Otherwise auth immediately.
|
||||
if endpoint is None:
|
||||
self.authenticate()
|
||||
else:
|
||||
self.management_url = endpoint
|
||||
|
||||
def authenticate(self):
|
||||
""" Authenticate against the Keystone API.
|
||||
|
||||
Uses the data provided at instantiation to authenticate against
|
||||
the Keystone server. This may use either a username and password
|
||||
or token for authentication. If a tenant id was provided
|
||||
then the resulting authenticated client will be scoped to that
|
||||
tenant and contain a service catalog of available endpoints.
|
||||
|
||||
Returns ``True`` if authentication was successful.
|
||||
"""
|
||||
self.management_url = self.auth_url
|
||||
try:
|
||||
raw_token = self.tokens.authenticate(username=self.username,
|
||||
tenant_id=self.tenant_id,
|
||||
tenant_name=self.tenant_name,
|
||||
password=self.password,
|
||||
token=self.auth_token,
|
||||
return_raw=True)
|
||||
self._extract_service_catalog(self.auth_url, raw_token)
|
||||
return True
|
||||
except (exceptions.AuthorizationFailure, exceptions.Unauthorized):
|
||||
raise
|
||||
except Exception, e:
|
||||
_logger.exception("Authorization Failed.")
|
||||
raise exceptions.AuthorizationFailure("Authorization Failed: "
|
||||
"%s" % e)
|
||||
|
||||
def _extract_service_catalog(self, url, body):
|
||||
""" Set the client's service catalog from the response data. """
|
||||
self.service_catalog = service_catalog.ServiceCatalog(body)
|
||||
try:
|
||||
self.auth_token = self.service_catalog.get_token()['id']
|
||||
except KeyError:
|
||||
raise exceptions.AuthorizationFailure()
|
||||
|
||||
# FIXME(ja): we should be lazy about setting managment_url.
|
||||
# in fact we should rewrite the client to support the service
|
||||
# catalog (api calls should be directable to any endpoints)
|
||||
try:
|
||||
self.management_url = self.service_catalog.url_for(attr='region',
|
||||
filter_value=self.region_name, endpoint_type='adminURL')
|
||||
except:
|
||||
# Unscoped tokens don't return a service catalog
|
||||
_logger.exception("unable to retrieve service catalog with token")
|
||||
@@ -0,0 +1,88 @@
|
||||
# Copyright 2011 OpenStack LLC.
|
||||
# Copyright 2011 Nebula, Inc.
|
||||
# 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.
|
||||
|
||||
import urllib
|
||||
|
||||
from glanceclient import base
|
||||
|
||||
|
||||
class Image(base.Resource):
|
||||
def __repr__(self):
|
||||
return "<Image %s>" % self._info
|
||||
|
||||
def delete(self):
|
||||
return self.manager.delete(self)
|
||||
|
||||
def list_roles(self, tenant=None):
|
||||
return self.manager.list_roles(self.id, base.getid(tenant))
|
||||
|
||||
|
||||
class ImageManager(base.ManagerWithFind):
|
||||
resource_class = Image
|
||||
|
||||
def get(self, image):
|
||||
return self._get("/images/%s" % base.getid(image), "image")
|
||||
|
||||
def update(self, image, **kwargs):
|
||||
"""
|
||||
Update image data.
|
||||
|
||||
Supported arguments include ``name`` and ``is_public``.
|
||||
"""
|
||||
params = {"image": kwargs}
|
||||
params['image']['id'] = base.getid(image)
|
||||
url = "/images/%s" % base.getid(image)
|
||||
return self._update(url, params, "image")
|
||||
|
||||
def create(self, name, is_public=True):
|
||||
"""
|
||||
Create an image.
|
||||
"""
|
||||
params = {
|
||||
"image": {
|
||||
"name": name,
|
||||
"is_public": is_public
|
||||
}
|
||||
}
|
||||
return self._create('/images', params, "image")
|
||||
|
||||
def delete(self, image):
|
||||
"""
|
||||
Delete a image.
|
||||
"""
|
||||
return self._delete("/images/%s" % base.getid(image))
|
||||
|
||||
def list(self, limit=None, marker=None):
|
||||
"""
|
||||
Get a list of images (optionally limited to a tenant)
|
||||
|
||||
:rtype: list of :class:`Image`
|
||||
"""
|
||||
|
||||
params = {}
|
||||
if limit:
|
||||
params['limit'] = int(limit)
|
||||
if marker:
|
||||
params['marker'] = int(marker)
|
||||
|
||||
query = ""
|
||||
if params:
|
||||
query = "?" + urllib.urlencode(params)
|
||||
|
||||
return self._list("/images%s" % query, "images")
|
||||
|
||||
def list_members(self, image):
|
||||
return self.api.members.members_for_image(base.getid(image))
|
||||
Executable
+77
@@ -0,0 +1,77 @@
|
||||
# Copyright 2010 Jacob Kaplan-Moss
|
||||
# Copyright 2011 OpenStack LLC.
|
||||
# Copyright 2011 Nebula, Inc.
|
||||
# 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 glanceclient.v1_1 import client
|
||||
from glanceclient import utils
|
||||
|
||||
CLIENT_CLASS = client.Client
|
||||
|
||||
|
||||
@utils.arg('tenant', metavar='<tenant-id>', nargs='?', default=None,
|
||||
help='Tenant ID (Optional); lists all images if not specified')
|
||||
def do_image_list(gc, args):
|
||||
"""List images"""
|
||||
images = gc.images.list(tenant_id=args.tenant)
|
||||
utils.print_list(images, ['id', 'is_public', 'email', 'name'])
|
||||
|
||||
|
||||
@utils.arg('--name', metavar='<image-name>', required=True,
|
||||
help='New image name (must be unique)')
|
||||
@utils.arg('--is-public', metavar='<true|false>', default=True,
|
||||
help='Initial image is_public status (default true)')
|
||||
def do_image_create(gc, args):
|
||||
"""Create new image"""
|
||||
image = gc.images.create(args.name, args.passwd, args.email,
|
||||
tenant_id=args.tenant_id, is_public=args.is_public)
|
||||
utils.print_dict(image._info)
|
||||
|
||||
|
||||
@utils.arg('--name', metavar='<image-name>',
|
||||
help='Desired new image name')
|
||||
@utils.arg('--is-public', metavar='<true|false>',
|
||||
help='Enable or disable image')
|
||||
@utils.arg('id', metavar='<image-id>', help='Image ID to update')
|
||||
def do_image_update(gc, args):
|
||||
"""Update image's name, email, and is_public status"""
|
||||
kwargs = {}
|
||||
if args.name:
|
||||
kwargs['name'] = args.name
|
||||
if args.email:
|
||||
kwargs['email'] = args.email
|
||||
if args.is_public:
|
||||
kwargs['is_public'] = utils.string_to_bool(args.is_public)
|
||||
|
||||
if not len(kwargs):
|
||||
print "User not updated, no arguments present."
|
||||
return
|
||||
|
||||
try:
|
||||
gc.images.update(args.id, **kwargs)
|
||||
print 'User has been updated.'
|
||||
except Exception, e:
|
||||
print 'Unable to update image: %s' % e
|
||||
|
||||
|
||||
@utils.arg('id', metavar='<image-id>', help='User ID to delete')
|
||||
def do_image_delete(gc, args):
|
||||
"""Delete image"""
|
||||
gc.images.delete(args.id)
|
||||
|
||||
|
||||
def do_token_get(gc, args):
|
||||
"""Display the current user's token"""
|
||||
utils.print_dict(gc.service_catalog.get_token())
|
||||
Reference in New Issue
Block a user