openstack
/
python-novaclient
Code Issues Proposed changes

updating server backup action; pep8 fixes

This commit is contained in:
Brian Waldon 2011-07-29 10:06:05 -04:00
parent 20251ccc2f
commit ca8aa158fc
14 changed files with 117 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
novaclient/accounts.py
View File

@ -1,8 +1,10 @@
from novaclient import base
class Account(base.Resource):
pass
class AccountManager(base.BootingManagerWithFind):
resource_class = Account

4
novaclient/client.py
View File

@ -24,6 +24,7 @@ from novaclient import exceptions
_logger = logging.getLogger(__name__)
class OpenStackClient(httplib2.Http):
USER_AGENT = 'python-novaclient/%s' % novaclient.__version__
@ -54,7 +55,8 @@ class OpenStackClient(httplib2.Http):
string_parts.append(' %s' % element)
for element in kwargs['headers']:
string_parts.append(' -H "%s: %s"' % (element,kwargs['headers'][element]))
header = ' -H "%s: %s"' % (element, kwargs['headers'][element])
string_parts.append(header)
_logger.debug("REQ: %s\n" % "".join(string_parts))
_logger.debug("RESP:%s %s\n", resp, body)

1
novaclient/exceptions.py
View File

@ -3,6 +3,7 @@
Exception definitions.
"""
class OpenStackException(Exception):
"""
The base exception class for all exceptions this library raises.

21
novaclient/images.py
View File

@ -46,8 +46,7 @@ class ImageManager(base.ManagerWithFind):
detail = "/detail"
return self._list("/images%s" % detail, "images")
def create(self, server, name, image_type=None, backup_type=None, rotation=None):
def create(self, server, name):
"""
Create a new image by snapshotting a running :class:`Server`
@ -55,23 +54,7 @@ class ImageManager(base.ManagerWithFind):
:param server: The :class:`Server` (or its ID) to make a snapshot of.
:rtype: :class:`Image`
"""
if image_type is None:
image_type = "snapshot"
if image_type not in ("backup", "snapshot"):
raise Exception("Invalid image_type: must be backup or snapshot")
if image_type == "backup":
if not rotation:
raise Exception("rotation is required for backups")
elif not backup_type:
raise Exception("backup_type required for backups")
elif backup_type not in ("daily", "weekly"):
raise Exception("Invalid backup_type: must be daily or weekly")
data = {"image": {"serverId": base.getid(server), "name": name,
"image_type": image_type, "backup_type": backup_type,
"rotation": rotation}}
data = {"image": {"serverId": base.getid(server), "name": name}}
return self._create("/images", data, "image")
def delete(self, image):

37
novaclient/servers.py
View File

@ -154,6 +154,18 @@ class Server(base.Resource):
"""
self.manager.resize(self, flavor)
def backup(self, image_name, backup_type, rotation):
"""
Create a server backup.
:param server: The :class:`Server` (or its ID).
:param image_name: The name to assign the newly create image.
:param backup_type: 'daily' or 'weekly'
:param rotation: number of backups of type 'backup_type' to keep
:returns Newly created :class:`Image` object
"""
return self.manager.backup(self, image_name, backup_type, rotation)
def confirm_resize(self):
"""
Confirm that the resize worked, thus removing the original server.
@ -370,6 +382,31 @@ class ServerManager(base.BootingManagerWithFind):
"""
self._action('resize', server, {'flavorId': base.getid(flavor)})
def backup(self, server, image_name, backup_type, rotation):
"""
Create a server backup.
:param server: The :class:`Server` (or its ID).
:param image_name: The name to assign the newly create image.
:param backup_type: 'daily' or 'weekly'
:param rotation: number of backups of type 'backup_type' to keep
:returns Newly created :class:`Image` object
"""
if not rotation:
raise Exception("rotation is required for backups")
elif not backup_type:
raise Exception("backup_type required for backups")
elif backup_type not in ("daily", "weekly"):
raise Exception("Invalid backup_type: must be daily or weekly")
data = {
"name": image_name,
"rotation": rotation,
"backup_type": backup_type,
}
self._action('createBackup', server, data)
def pause(self, server):
"""
Pause the server.

30
novaclient/shell.py
View File

@ -481,27 +481,11 @@ class OpenStackShell(object):
print_list(self.cs.images.list(), ['ID', 'Name', 'Status'])
@arg('server', metavar='<server>', help='Name or ID of server.')
@arg('name', metavar='<name>', help='Name of backup or snapshot.')
@arg('--image-type',
metavar='<backup|snapshot>',
default='snapshot',
help='type of image (default: snapshot)')
@arg('--backup-type',
metavar='<daily|weekly>',
default=None,
help='type of backup')
@arg('--rotation',
default=None,
type=int,
metavar='<rotation>',
help="Number of backups to retain. Used for backup image_type.")
@arg('name', metavar='<name>', help='Name of snapshot.')
def do_image_create(self, args):
"""Create a new image by taking a snapshot of a running server."""
server = self._find_server(args.server)
image = self.cs.images.create(server, args.name,
image_type=args.image_type,
backup_type=args.backup_type,
rotation=args.rotation)
image = self.cs.images.create(server, args.name)
print_dict(image._info)
@arg('image', metavar='<image>', help='Name or ID of image.')
@ -660,6 +644,16 @@ class OpenStackShell(object):
flavor = self._find_flavor(args.flavor)
server.resize(flavor)
@arg('server', metavar='<server>', help='Name or ID of server.')
@arg('name', metavar='<name>', help='Name of snapshot.')
@arg('backup_type', metavar='<daily|weekly>', help='type of backup')
@arg('rotation', type=int, metavar='<rotation>',
help="Number of backups to retain. Used for backup image_type.")
def do_backup(self, args):
"""Resize a server."""
server = self._find_server(args.server)
server.backup(args.name, args.backup_type, args.rotation)
@arg('server', metavar='<server>', help='Name or ID of server.')
def do_migrate(self, args):
"""Migrate a server."""

1
setup.py
View File

@ -2,6 +2,7 @@ import os
import sys
from setuptools import setup, find_packages
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()

6
tests/fakeserver.py
View File

@ -267,6 +267,9 @@ class FakeClient(OpenStackClient):
assert_equal(body[action].keys(), ['imageId'])
elif action == 'resize':
assert_equal(body[action].keys(), ['flavorId'])
elif action == 'createBackup':
assert_equal(set(body[action].keys()),
set(['name', 'rotation', 'backup_type']))
elif action == 'confirmResize':
assert_equal(body[action], None)
# This one method returns a different response code
@ -342,7 +345,7 @@ class FakeClient(OpenStackClient):
def post_images(self, body, **kw):
assert_equal(body.keys(), ['image'])
assert_has_keys(body['image'], required=['serverId', 'name', 'image_type', 'backup_type', 'rotation'])
assert_has_keys(body['image'], required=['serverId', 'name'])
return (202, self.get_images_1()[1])
def delete_images_1(self, **kw):
@ -409,7 +412,6 @@ class FakeClient(OpenStackClient):
{'id': 2, 'api_url': 'http://foo.com', 'username': 'alice'},
]})
def get_zones_detail(self, **kw):
return (200, {'zones': [
{'id': 1, 'api_url': 'http://foo.com', 'username': 'bob',

1
tests/test_accounts.py
View File

@ -7,6 +7,7 @@ from novaclient import Account
cs = FakeServer()
def test_instance_creation_for_account():
s = cs.accounts.create_instance_for(
account_id='test_account',

8
tests/test_servers.py
View File

@ -150,6 +150,14 @@ def test_revert_resized_server():
cs.assert_called('POST', '/servers/1234/action')
def test_backup_server():
s = cs.servers.get(1234)
s.backup("ImageName", "daily", 10)
cs.assert_called('POST', '/servers/1234/action')
cs.servers.backup(s, "ImageName", "daily", 10)
cs.assert_called('POST', '/servers/1234/action')
def test_migrate_server():
s = cs.servers.get(1234)
s.migrate()

21
tests/test_shell.py
View File

@ -195,15 +195,7 @@ def test_snapshot_create():
shell('image-create sample-server mysnapshot')
assert_called(
'POST', '/images',
{'image': {'name': 'mysnapshot', 'serverId': 1234, 'image_type': 'snapshot', 'backup_type': None, 'rotation': None}}
)
def test_backup_create():
shell('image-create sample-server mybackup --image-type backup --backup-type daily --rotation 1')
assert_called(
'POST', '/images',
{'image': {'name': 'mybackup', 'serverId': 1234, 'image_type': 'backup', 'backup_type': 'daily', 'rotation': 1}}
{'image': {'name': 'mysnapshot', 'serverId': 1234}}
)
@ -295,6 +287,15 @@ def test_resize_revert():
assert_called('POST', '/servers/1234/action', {'revertResize': None})
def test_backup():
shell('backup sample-server mybackup daily 1')
assert_called(
'POST', '/servers/1234/action',
{'createBackup': {'name': 'mybackup', 'backup_type': 'daily',
'rotation': 1}}
)
@mock.patch('getpass.getpass', mock.Mock(return_value='p'))
def test_root_password():
shell('root-password sample-server')
@ -326,6 +327,7 @@ def test_zone():
'password': 'xxx'}}
)
def test_zone_add():
shell('zone-add http://zzz frank xxx 0.0 1.0')
assert_called(
@ -335,6 +337,7 @@ def test_zone_add():
'weight_offset': '0.0', 'weight_scale': '1.0'}}
)
def test_zone_delete():
shell('zone-delete 1')
assert_called('DELETE', '/zones/1')