Merge "Add "--read-only" and "--read-write" options in "volume set""

2 files changed, 90 insertions, 16 deletions

diff --git a/openstackclient/tests/unit/volume/v1/test_volume.py b/openstackclient/tests/unit/volume/v1/test_volume.py
index 8e79ecbb..fe767648 100644
--- a/openstackclient/tests/unit/volume/v1/test_volume.py
+++ b/openstackclient/tests/unit/volume/v1/test_volume.py
@@ -906,8 +906,7 @@ class TestVolumeSet(TestVolume):
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(volume.LOG, 'error')
-    def test_volume_set_size_smaller(self, mock_log_error):
+    def test_volume_set_size_smaller(self):
         self._volume.status = 'available'
         arglist = [
             '--size', '1',
@@ -922,15 +921,11 @@ class TestVolumeSet(TestVolume):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
-
-        mock_log_error.assert_called_with("New size must be greater "
-                                          "than %s GB",
-                                          self._volume.size)
-        self.assertIsNone(result)
+        self.assertRaises(exceptions.CommandError,
+                          self.cmd.take_action,
+                          parsed_args)
 
-    @mock.patch.object(volume.LOG, 'error')
-    def test_volume_set_size_not_available(self, mock_log_error):
+    def test_volume_set_size_not_available(self):
         self._volume.status = 'error'
         arglist = [
             '--size', '130',
@@ -945,12 +940,9 @@ class TestVolumeSet(TestVolume):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
-
-        mock_log_error.assert_called_with("Volume is in %s state, it must be "
-                                          "available before size can be "
-                                          "extended", 'error')
-        self.assertIsNone(result)
+        self.assertRaises(exceptions.CommandError,
+                          self.cmd.take_action,
+                          parsed_args)
 
     def test_volume_set_property(self):
         arglist = [
@@ -958,6 +950,8 @@ class TestVolumeSet(TestVolume):
             self._volume.display_name,
         ]
         verifylist = [
+            ('read_only', False),
+            ('read_write', False),
             ('name', None),
             ('description', None),
             ('size', None),
@@ -978,6 +972,7 @@ class TestVolumeSet(TestVolume):
             self._volume.id,
             metadata
         )
+        self.volumes_mock.update_readonly_flag.assert_not_called()
         self.assertIsNone(result)
 
     def test_volume_set_bootable(self):
@@ -1005,6 +1000,44 @@ class TestVolumeSet(TestVolume):
             self.volumes_mock.set_bootable.assert_called_with(
                 self._volume.id, verifylist[index][0][1])
 
+    def test_volume_set_readonly(self):
+        arglist = [
+            '--read-only',
+            self._volume.id
+        ]
+        verifylist = [
+            ('read_only', True),
+            ('read_write', False),
+            ('volume', self._volume.id)
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+        self.volumes_mock.update_readonly_flag.assert_called_once_with(
+            self._volume.id,
+            True)
+        self.assertIsNone(result)
+
+    def test_volume_set_read_write(self):
+        arglist = [
+            '--read-write',
+            self._volume.id
+        ]
+        verifylist = [
+            ('read_only', False),
+            ('read_write', True),
+            ('volume', self._volume.id)
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+        self.volumes_mock.update_readonly_flag.assert_called_once_with(
+            self._volume.id,
+            False)
+        self.assertIsNone(result)
+
 
 class TestVolumeShow(TestVolume):
 
diff --git a/openstackclient/tests/unit/volume/v2/test_volume.py b/openstackclient/tests/unit/volume/v2/test_volume.py
index 0a436e61..fc99bf6e 100644
--- a/openstackclient/tests/unit/volume/v2/test_volume.py
+++ b/openstackclient/tests/unit/volume/v2/test_volume.py
@@ -1123,6 +1123,8 @@ class TestVolumeSet(TestVolume):
             self.new_volume.id
         ]
         verifylist = [
+            ('read_only', False),
+            ('read_write', False),
             ('state', 'error'),
             ('volume', self.new_volume.id)
         ]
@@ -1132,6 +1134,7 @@ class TestVolumeSet(TestVolume):
         result = self.cmd.take_action(parsed_args)
         self.volumes_mock.reset_state.assert_called_with(
             self.new_volume.id, 'error')
+        self.volumes_mock.update_readonly_flag.assert_not_called()
         self.assertIsNone(result)
 
     def test_volume_set_state_failed(self):
@@ -1180,6 +1183,44 @@ class TestVolumeSet(TestVolume):
             self.volumes_mock.set_bootable.assert_called_with(
                 self.new_volume.id, verifylist[index][0][1])
 
+    def test_volume_set_readonly(self):
+        arglist = [
+            '--read-only',
+            self.new_volume.id
+        ]
+        verifylist = [
+            ('read_only', True),
+            ('read_write', False),
+            ('volume', self.new_volume.id)
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+        self.volumes_mock.update_readonly_flag.assert_called_once_with(
+            self.new_volume.id,
+            True)
+        self.assertIsNone(result)
+
+    def test_volume_set_read_write(self):
+        arglist = [
+            '--read-write',
+            self.new_volume.id
+        ]
+        verifylist = [
+            ('read_only', False),
+            ('read_write', True),
+            ('volume', self.new_volume.id)
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+        self.volumes_mock.update_readonly_flag.assert_called_once_with(
+            self.new_volume.id,
+            False)
+        self.assertIsNone(result)
+
 
 class TestVolumeShow(TestVolume):