Skip to content

Commit 311e775

Browse files
committed
Make snapshot and backup name optional
Cinder does not require snapshot and backup name. These arguments are optional. Change-Id: I05d59efc9642205a25684bf0b77758328296d959
1 parent e49c3f6 commit 311e775

7 files changed

Lines changed: 52 additions & 4 deletions

File tree

openstackclient/tests/volume/v2/test_backup.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,30 @@ def test_backup_create(self):
7777
self.assertEqual(columns, volume_fakes.BACKUP_columns)
7878
self.assertEqual(data, volume_fakes.BACKUP_data)
7979

80+
def test_backup_create_without_name(self):
81+
arglist = [
82+
volume_fakes.volume_id,
83+
"--description", volume_fakes.backup_description,
84+
"--container", volume_fakes.backup_name
85+
]
86+
verifylist = [
87+
("volume", volume_fakes.volume_id),
88+
("description", volume_fakes.backup_description),
89+
("container", volume_fakes.backup_name)
90+
]
91+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
92+
93+
columns, data = self.cmd.take_action(parsed_args)
94+
95+
self.backups_mock.create.assert_called_with(
96+
volume_fakes.volume_id,
97+
container=volume_fakes.backup_name,
98+
name=None,
99+
description=volume_fakes.backup_description
100+
)
101+
self.assertEqual(columns, volume_fakes.BACKUP_columns)
102+
self.assertEqual(data, volume_fakes.BACKUP_data)
103+
80104

81105
class TestBackupDelete(TestBackup):
82106

openstackclient/tests/volume/v2/test_snapshot.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,30 @@ def test_snapshot_create(self):
7575
self.assertEqual(columns, volume_fakes.SNAPSHOT_columns)
7676
self.assertEqual(data, volume_fakes.SNAPSHOT_data)
7777

78+
def test_snapshot_create_without_name(self):
79+
arglist = [
80+
volume_fakes.volume_id,
81+
"--description", volume_fakes.snapshot_description,
82+
"--force"
83+
]
84+
verifylist = [
85+
("volume", volume_fakes.volume_id),
86+
("description", volume_fakes.snapshot_description),
87+
("force", True)
88+
]
89+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
90+
91+
columns, data = self.cmd.take_action(parsed_args)
92+
93+
self.snapshots_mock.create.assert_called_with(
94+
volume_fakes.volume_id,
95+
force=True,
96+
name=None,
97+
description=volume_fakes.snapshot_description
98+
)
99+
self.assertEqual(columns, volume_fakes.SNAPSHOT_columns)
100+
self.assertEqual(data, volume_fakes.SNAPSHOT_data)
101+
78102

79103
class TestSnapshotDelete(TestSnapshot):
80104

openstackclient/volume/v1/backup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ def get_parser(self, prog_name):
4141
parser.add_argument(
4242
'--name',
4343
metavar='<name>',
44-
required=False,
4544
help='Name of the backup',
4645
)
4746
parser.add_argument(

openstackclient/volume/v1/snapshot.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ def get_parser(self, prog_name):
3636
parser.add_argument(
3737
'--name',
3838
metavar='<name>',
39-
required=True,
4039
help='Name of the snapshot',
4140
)
4241
parser.add_argument(

openstackclient/volume/v2/backup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ def get_parser(self, prog_name):
3535
parser.add_argument(
3636
"--name",
3737
metavar="<name>",
38-
required=True,
3938
help="Name of the backup"
4039
)
4140
parser.add_argument(

openstackclient/volume/v2/snapshot.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ def get_parser(self, prog_name):
3636
parser.add_argument(
3737
"--name",
3838
metavar="<name>",
39-
required=True,
4039
help="Name of the snapshot"
4140
)
4241
parser.add_argument(
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
fixes:
3+
- Make ``--name`` optional in ``volume snapshot create`` and
4+
``volume backup create`` commands.

0 commit comments

Comments
 (0)