Merge "Migrate backups clients to tempest.lib"
This commit is contained in:
commit
a8789c6140
|
@ -6,6 +6,7 @@ features:
|
|||
so the other projects can use these modules as stable libraries without
|
||||
any maintenance changes.
|
||||
|
||||
* backups_client
|
||||
* encryption_types_client (v1)
|
||||
* encryption_types_client (v2)
|
||||
* qos_clients (v1)
|
||||
|
|
|
@ -53,10 +53,6 @@ class SnapshotBuildErrorException(exceptions.TempestException):
|
|||
message = "Snapshot %(snapshot_id)s failed to build and is in ERROR status"
|
||||
|
||||
|
||||
class VolumeBackupException(exceptions.TempestException):
|
||||
message = "Volume backup %(backup_id)s failed and is in ERROR status"
|
||||
|
||||
|
||||
class StackBuildErrorException(exceptions.TempestException):
|
||||
message = ("Stack %(stack_identifier)s is in %(stack_status)s status "
|
||||
"due to '%(stack_status_reason)s'")
|
||||
|
|
|
@ -239,3 +239,7 @@ class ServiceClientRegistrationException(TempestException):
|
|||
|
||||
class PluginRegistrationException(TempestException):
|
||||
message = "Error registering plugin %(name)s: %(detailed_error)s"
|
||||
|
||||
|
||||
class VolumeBackupException(TempestException):
|
||||
message = "Volume backup %(backup_id)s failed and is in ERROR status"
|
||||
|
|
|
@ -19,8 +19,9 @@ from tempest.lib.common import rest_client
|
|||
from tempest.lib import exceptions as lib_exc
|
||||
|
||||
|
||||
class BaseBackupsClient(rest_client.RestClient):
|
||||
"""Client class to send CRUD Volume backup API requests"""
|
||||
class BackupsClient(rest_client.RestClient):
|
||||
"""Volume V1 Backups client"""
|
||||
api_version = "v1"
|
||||
|
||||
def create_backup(self, **kwargs):
|
||||
"""Creates a backup of volume.
|
|
@ -0,0 +1,102 @@
|
|||
# Copyright 2014 OpenStack Foundation
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo_serialization import jsonutils as json
|
||||
|
||||
from tempest.lib.common import rest_client
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
|
||||
|
||||
class BackupsClient(rest_client.RestClient):
|
||||
"""Volume V2 Backups client"""
|
||||
api_version = "v2"
|
||||
|
||||
def create_backup(self, **kwargs):
|
||||
"""Creates a backup of volume.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-blockstorage-v2.html#createBackup
|
||||
"""
|
||||
post_body = json.dumps({'backup': kwargs})
|
||||
resp, body = self.post('backups', post_body)
|
||||
body = json.loads(body)
|
||||
self.expected_success(202, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def restore_backup(self, backup_id, **kwargs):
|
||||
"""Restore volume from backup.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-blockstorage-v2.html#restoreBackup
|
||||
"""
|
||||
post_body = json.dumps({'restore': kwargs})
|
||||
resp, body = self.post('backups/%s/restore' % (backup_id), post_body)
|
||||
body = json.loads(body)
|
||||
self.expected_success(202, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def delete_backup(self, backup_id):
|
||||
"""Delete a backup of volume."""
|
||||
resp, body = self.delete('backups/%s' % backup_id)
|
||||
self.expected_success(202, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def show_backup(self, backup_id):
|
||||
"""Returns the details of a single backup."""
|
||||
url = "backups/%s" % backup_id
|
||||
resp, body = self.get(url)
|
||||
body = json.loads(body)
|
||||
self.expected_success(200, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def list_backups(self, detail=False):
|
||||
"""Information for all the tenant's backups."""
|
||||
url = "backups"
|
||||
if detail:
|
||||
url += "/detail"
|
||||
resp, body = self.get(url)
|
||||
body = json.loads(body)
|
||||
self.expected_success(200, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def export_backup(self, backup_id):
|
||||
"""Export backup metadata record."""
|
||||
url = "backups/%s/export_record" % backup_id
|
||||
resp, body = self.get(url)
|
||||
body = json.loads(body)
|
||||
self.expected_success(200, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def import_backup(self, **kwargs):
|
||||
"""Import backup metadata record."""
|
||||
post_body = json.dumps({'backup-record': kwargs})
|
||||
resp, body = self.post("backups/import_record", post_body)
|
||||
body = json.loads(body)
|
||||
self.expected_success(201, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def reset_backup_status(self, backup_id, status):
|
||||
"""Reset the specified backup's status."""
|
||||
post_body = json.dumps({'os-reset_status': {"status": status}})
|
||||
resp, body = self.post('backups/%s/action' % backup_id, post_body)
|
||||
self.expected_success(202, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def is_resource_deleted(self, id):
|
||||
try:
|
||||
self.show_backup(id)
|
||||
except lib_exc.NotFound:
|
||||
return True
|
||||
return False
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
from tempest.lib.services.volume.v1.availability_zone_client import \
|
||||
AvailabilityZoneClient
|
||||
from tempest.lib.services.volume.v1.backups_client import BackupsClient
|
||||
from tempest.lib.services.volume.v1.encryption_types_client import \
|
||||
EncryptionTypesClient
|
||||
from tempest.lib.services.volume.v1.extensions_client import ExtensionsClient
|
||||
|
@ -23,7 +24,6 @@ from tempest.lib.services.volume.v1.quotas_client import QuotasClient
|
|||
from tempest.lib.services.volume.v1.services_client import ServicesClient
|
||||
from tempest.lib.services.volume.v1.snapshots_client import SnapshotsClient
|
||||
from tempest.lib.services.volume.v1.types_client import TypesClient
|
||||
from tempest.services.volume.v1.json.backups_client import BackupsClient
|
||||
from tempest.services.volume.v1.json.volumes_client import VolumesClient
|
||||
|
||||
__all__ = ['AvailabilityZoneClient', 'EncryptionTypesClient',
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
# Copyright 2014 OpenStack Foundation
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.services.volume.base import base_backups_client
|
||||
|
||||
|
||||
class BackupsClient(base_backups_client.BaseBackupsClient):
|
||||
"""Volume V1 Backups client"""
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
from tempest.lib.services.volume.v2.availability_zone_client import \
|
||||
AvailabilityZoneClient
|
||||
from tempest.lib.services.volume.v2.backups_client import BackupsClient
|
||||
from tempest.lib.services.volume.v2.encryption_types_client import \
|
||||
EncryptionTypesClient
|
||||
from tempest.lib.services.volume.v2.extensions_client import ExtensionsClient
|
||||
|
@ -23,10 +24,9 @@ from tempest.lib.services.volume.v2.quotas_client import QuotasClient
|
|||
from tempest.lib.services.volume.v2.services_client import ServicesClient
|
||||
from tempest.lib.services.volume.v2.snapshots_client import SnapshotsClient
|
||||
from tempest.lib.services.volume.v2.types_client import TypesClient
|
||||
from tempest.services.volume.v2.json.backups_client import BackupsClient
|
||||
from tempest.services.volume.v2.json.volumes_client import VolumesClient
|
||||
|
||||
__all__ = ['AvailabilityZoneClient', 'EncryptionTypesClient',
|
||||
'ExtensionsClient', 'HostsClient', 'QosSpecsClient',
|
||||
'QuotasClient', 'ServicesClient', 'SnapshotsClient',
|
||||
'TypesClient', 'BackupsClient', 'VolumesClient', ]
|
||||
__all__ = ['AvailabilityZoneClient', 'BackupsClient', 'EncryptionTypesClient',
|
||||
'ExtensionsClient', 'HostsClient', 'QosSpecsClient', 'QuotasClient',
|
||||
'ServicesClient', 'SnapshotsClient', 'TypesClient',
|
||||
'VolumesClient', ]
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
# Copyright 2014 OpenStack Foundation
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.services.volume.base import base_backups_client
|
||||
|
||||
|
||||
class BackupsClient(base_backups_client.BaseBackupsClient):
|
||||
"""Client class to send CRUD Volume V2 API requests"""
|
||||
api_version = "v2"
|
Loading…
Reference in New Issue