Merge "Make snapshot and backup name optional"

6 files changed, 48 insertions, 4 deletions

diff --git a/openstackclient/tests/volume/v2/test_backup.py b/openstackclient/tests/volume/v2/test_backup.py
index cc8dff5a..0e906e7b 100644
--- a/openstackclient/tests/volume/v2/test_backup.py
+++ b/openstackclient/tests/volume/v2/test_backup.py
@@ -77,6 +77,30 @@ class TestBackupCreate(TestBackup):
         self.assertEqual(columns, volume_fakes.BACKUP_columns)
         self.assertEqual(data, volume_fakes.BACKUP_data)
 
+    def test_backup_create_without_name(self):
+        arglist = [
+            volume_fakes.volume_id,
+            "--description", volume_fakes.backup_description,
+            "--container", volume_fakes.backup_name
+        ]
+        verifylist = [
+            ("volume", volume_fakes.volume_id),
+            ("description", volume_fakes.backup_description),
+            ("container", volume_fakes.backup_name)
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.backups_mock.create.assert_called_with(
+            volume_fakes.volume_id,
+            container=volume_fakes.backup_name,
+            name=None,
+            description=volume_fakes.backup_description
+        )
+        self.assertEqual(columns, volume_fakes.BACKUP_columns)
+        self.assertEqual(data, volume_fakes.BACKUP_data)
+
 
 class TestBackupDelete(TestBackup):
 
diff --git a/openstackclient/tests/volume/v2/test_snapshot.py b/openstackclient/tests/volume/v2/test_snapshot.py
index 87e2fccf..8c75dfb2 100644
--- a/openstackclient/tests/volume/v2/test_snapshot.py
+++ b/openstackclient/tests/volume/v2/test_snapshot.py
@@ -75,6 +75,30 @@ class TestSnapshotCreate(TestSnapshot):
         self.assertEqual(columns, volume_fakes.SNAPSHOT_columns)
         self.assertEqual(data, volume_fakes.SNAPSHOT_data)
 
+    def test_snapshot_create_without_name(self):
+        arglist = [
+            volume_fakes.volume_id,
+            "--description", volume_fakes.snapshot_description,
+            "--force"
+        ]
+        verifylist = [
+            ("volume", volume_fakes.volume_id),
+            ("description", volume_fakes.snapshot_description),
+            ("force", True)
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.snapshots_mock.create.assert_called_with(
+            volume_fakes.volume_id,
+            force=True,
+            name=None,
+            description=volume_fakes.snapshot_description
+        )
+        self.assertEqual(columns, volume_fakes.SNAPSHOT_columns)
+        self.assertEqual(data, volume_fakes.SNAPSHOT_data)
+
 
 class TestSnapshotDelete(TestSnapshot):
 
diff --git a/openstackclient/volume/v1/backup.py b/openstackclient/volume/v1/backup.py
index 32f39fb5..40b60315 100644
--- a/openstackclient/volume/v1/backup.py
+++ b/openstackclient/volume/v1/backup.py
@@ -41,7 +41,6 @@ class CreateBackup(command.ShowOne):
         parser.add_argument(
             '--name',
             metavar='<name>',
-            required=False,
             help='Name of the backup',
         )
         parser.add_argument(
diff --git a/openstackclient/volume/v1/snapshot.py b/openstackclient/volume/v1/snapshot.py
index 95200e40..c54bac8a 100644
--- a/openstackclient/volume/v1/snapshot.py
+++ b/openstackclient/volume/v1/snapshot.py
@@ -36,7 +36,6 @@ class CreateSnapshot(command.ShowOne):
         parser.add_argument(
             '--name',
             metavar='<name>',
-            required=True,
             help='Name of the snapshot',
         )
         parser.add_argument(
diff --git a/openstackclient/volume/v2/backup.py b/openstackclient/volume/v2/backup.py
index 64ca97ae..016a414c 100644
--- a/openstackclient/volume/v2/backup.py
+++ b/openstackclient/volume/v2/backup.py
@@ -35,7 +35,6 @@ class CreateBackup(command.ShowOne):
         parser.add_argument(
             "--name",
             metavar="<name>",
-            required=True,
             help="Name of the backup"
         )
         parser.add_argument(
diff --git a/openstackclient/volume/v2/snapshot.py b/openstackclient/volume/v2/snapshot.py
index 4d00b726..c9e50297 100644
--- a/openstackclient/volume/v2/snapshot.py
+++ b/openstackclient/volume/v2/snapshot.py
@@ -36,7 +36,6 @@ class CreateSnapshot(command.ShowOne):
         parser.add_argument(
             "--name",
             metavar="<name>",
-            required=True,
             help="Name of the snapshot"
         )
         parser.add_argument(