openstack/trove-dashboard
Code Issues Proposed changes

Merge "Add 'swift_container' field into the Backup creation form"

Browse Source
This commit is contained in:
Zuul 2020-09-21 20:49:46 +00:00 committed by Gerrit Code Review
commit 9743646c0a
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
trove_dashboard/api/trove.py
View File

@ -246,9 +246,11 @@ def backup_delete(request, backup_id):
def backup_create(request, name, instance_id, description=None, def backup_create(request, name, instance_id, description=None,
parent_id=None): parent_id=None, swift_container=None):
return troveclient(request).backups.create(name, instance_id, return troveclient(request).backups.create(name, instance_id,
description, parent_id) description=description,
parent_id=parent_id,
swift_container=swift_container)
def nova_client_client(request): def nova_client_client(request):

4
trove_dashboard/content/database_backups/tests.py
View File

@ -86,6 +86,7 @@ class DatabasesBackupsTests(test.TestCase):
backupName, backupName,
database.id, database.id,
backupDesc, backupDesc,
"",
"") "")
self.assertNoFormErrors(res) self.assertNoFormErrors(res)
self.assertRedirectsNoFollow(res, INDEX_URL) self.assertRedirectsNoFollow(res, INDEX_URL)
@ -137,7 +138,8 @@ class DatabasesBackupsTests(test.TestCase):
backupName, backupName,
database.id, database.id,
backupDesc, backupDesc,
backupParent.id) backupParent.id,
"")
self.assertNoFormErrors(res) self.assertNoFormErrors(res)
self.assertRedirectsNoFollow(res, INDEX_URL) self.assertRedirectsNoFollow(res, INDEX_URL)

13
trove_dashboard/content/database_backups/workflows/create_backup.py
View File

@ -37,6 +37,13 @@ class BackupDetailsAction(workflows.Action):
parent = forms.ChoiceField(label=_("Parent Backup"), parent = forms.ChoiceField(label=_("Parent Backup"),
required=False, required=False,
help_text=_("Optional parent backup")) help_text=_("Optional parent backup"))
swift_container = forms.CharField(max_length=256,
widget=forms.TextInput(),
label=_("Swift Container Name"),
required=False,
help_text=_(
"User defined swift container name.")
)
class Meta(object): class Meta(object):
name = _("Details") name = _("Details")
@ -73,7 +80,8 @@ class BackupDetailsAction(workflows.Action):
class SetBackupDetails(workflows.Step): class SetBackupDetails(workflows.Step):
action_class = BackupDetailsAction action_class = BackupDetailsAction
contributes = ["name", "description", "instance", "parent"] contributes = ["name", "description", "instance", "parent",
"swift_container"]
class CreateBackup(workflows.Workflow): class CreateBackup(workflows.Workflow):
@ -100,7 +108,8 @@ class CreateBackup(workflows.Workflow):
context['name'], context['name'],
context['instance'], context['instance'],
context['description'], context['description'],
context['parent']) context['parent'],
context['swift_container'])
return True return True
except Exception: except Exception:
LOG.exception("Exception while creating backup") LOG.exception("Exception while creating backup")

2
trove_dashboard/content/databases/tables.py
View File

@ -33,7 +33,7 @@ from trove_dashboard.content.database_backups \
import tables as backup_tables import tables as backup_tables
ACTIVE_STATES = ("ACTIVE",) ACTIVE_STATES = ("ACTIVE", "HEALTHY",)
class DeleteInstance(tables.DeleteAction): class DeleteInstance(tables.DeleteAction):