Check task_state of instance before volume actions

Check task_state before verify resize or before detachment.

We need to make sure the task_state moved out from resize_finish before
we trigger some action like attach/detach volume.

So when we update flvor and volume at the samethime, the resize action
will not affect volume attachment/detachment.

Depends-On: https://review.opendev.org/#/c/700512/

Change-Id: I64033d5a0a8fea5c4fd93b1deb111d3d8fba0cf7
Story: #2007042
Task: #37854
Task: #37855
Task: #37869

3 files changed, 225 insertions, 0 deletions

diff --git a/heat/tests/clients/test_nova_client.py b/heat/tests/clients/test_nova_client.py
index afd3caaf6..884170ae0 100644
--- a/heat/tests/clients/test_nova_client.py
+++ b/heat/tests/clients/test_nova_client.py
@@ -181,6 +181,26 @@ class NovaClientPluginTest(NovaClientPluginTestCase):
         observed = self.nova_plugin.get_status(server)
         self.assertEqual('ACTIVE', observed)
 
+    def test_check_verify_resize_task_state(self):
+        """Tests the check_verify_resize function with resize task_state."""
+        my_server = mock.MagicMock(status='Foo')
+        setattr(my_server, 'OS-EXT-STS:task_state', 'resize_finish')
+        self.nova_client.servers.get.side_effect = [my_server]
+
+        self.assertEqual(
+            False, self.nova_plugin.check_verify_resize('my_server'))
+
+    def test_check_verify_resize_error(self):
+        """Tests the check_verify_resize function with unknown status."""
+        my_server = mock.MagicMock(status='Foo')
+        setattr(my_server, 'OS-EXT-STS:task_state', 'active')
+        self.nova_client.servers.get.side_effect = [my_server]
+
+        self.assertRaises(
+            exception.ResourceUnknownStatus,
+            self.nova_plugin.check_verify_resize,
+            'my_server')
+
     def _absolute_limits(self):
         max_personality = mock.Mock()
         max_personality.name = 'maxPersonality'
diff --git a/heat/tests/openstack/cinder/test_volume.py b/heat/tests/openstack/cinder/test_volume.py
index 254483736..4023b3a82 100644
--- a/heat/tests/openstack/cinder/test_volume.py
+++ b/heat/tests/openstack/cinder/test_volume.py
@@ -893,6 +893,37 @@ class CinderVolumeTest(vt_base.VolumeTestCase):
         self.fc.volumes.delete_server_volume.assert_called_with(
             'WikiDatabase', 'vol-123')
 
+    def test_cinder_volume_attachment_with_serv_resize_task_state(self):
+        self.stack_name = 'test_cvolume_attach_usrv_resize_task_state_stack'
+
+        fv1 = self._mock_create_server_volume_script(
+            vt_base.FakeVolume('attaching'))
+        fva = vt_base.FakeVolume('in-use')
+        fv2 = self._mock_create_server_volume_script(
+            vt_base.FakeVolume('attaching'), update=True)
+        self._mock_create_volume(vt_base.FakeVolume('creating'),
+                                 self.stack_name,
+                                 extra_get_mocks=[
+                                     fv1, fva,
+                                     vt_base.FakeVolume('available'), fv2])
+        self.stub_VolumeConstraint_validate()
+
+        # delete script
+        self.fc.volumes.get_server_volume.side_effect = [
+            fva, fva, fakes_nova.fake_exception()]
+        self.fc.volumes.delete_server_volume.return_value = None
+
+        stack = utils.parse_stack(self.t, stack_name=self.stack_name)
+
+        self.create_volume(self.t, stack, 'volume')
+
+        rsrc = self.create_attachment(self.t, stack, 'attachment')
+        prg_detach = mock.MagicMock(cinder_complete=True, nova_complete=True)
+        prg_attach = mock.MagicMock(called=False, srv_id='InstanceInResize')
+        self.assertEqual(False,
+                         rsrc.check_update_complete((prg_detach, prg_attach)))
+        self.assertEqual(False, prg_attach.called)
+
     def test_delete_attachment_has_not_been_created(self):
         self.stack_name = 'test_delete_attachment_has_not_been_created'
         stack = utils.parse_stack(self.t, stack_name=self.stack_name)
@@ -1234,3 +1265,87 @@ class CinderVolumeTest(vt_base.VolumeTestCase):
         }
 
         self.assertEqual(expected, reality)
+
+    def test_detach_volume_to_complete_with_resize_task_state(self):
+        fv = vt_base.FakeVolume('creating')
+        self.stack_name = 'test_cvolume_detach_with_resize_task_state_stack'
+
+        self.stub_SnapshotConstraint_validate()
+        self.stub_VolumeConstraint_validate()
+        self.stub_VolumeTypeConstraint_validate()
+        self.cinder_fc.volumes.create.return_value = fv
+        fv_ready = vt_base.FakeVolume('available', id=fv.id)
+        self.cinder_fc.volumes.get.side_effect = [fv, fv_ready]
+
+        self.t['resources']['volume']['properties'].update({
+            'volume_type': 'lvm',
+        })
+        stack = utils.parse_stack(self.t, stack_name=self.stack_name)
+        rsrc = self.create_volume(self.t, stack, 'volume')
+        prg_detach = mock.MagicMock(called=False, srv_id='InstanceInResize')
+        self.assertEqual(False, rsrc._detach_volume_to_complete(prg_detach))
+        self.assertEqual(False, prg_detach.called)
+
+    def test_detach_volume_to_complete_with_active_task_state(self):
+        fv = vt_base.FakeVolume('creating')
+        self.stack_name = 'test_cvolume_detach_with_active_task_state_stack'
+
+        self.stub_SnapshotConstraint_validate()
+        self.stub_VolumeConstraint_validate()
+        self.stub_VolumeTypeConstraint_validate()
+        self.cinder_fc.volumes.create.return_value = fv
+        fv_ready = vt_base.FakeVolume('available', id=fv.id)
+        self.cinder_fc.volumes.get.side_effect = [fv, fv_ready]
+
+        self.t['resources']['volume']['properties'].update({
+            'volume_type': 'lvm',
+        })
+        stack = utils.parse_stack(self.t, stack_name=self.stack_name)
+        rsrc = self.create_volume(self.t, stack, 'volume')
+        prg_detach = mock.MagicMock(called=False, srv_id='InstanceInActive')
+        self.assertEqual(False, rsrc._detach_volume_to_complete(prg_detach))
+        self.assertEqual(True, prg_detach.called)
+
+    def test_attach_volume_to_complete_with_resize_task_state(self):
+        fv = vt_base.FakeVolume('creating')
+        self.stack_name = 'test_cvolume_attach_with_resize_task_state_stack'
+
+        self.stub_SnapshotConstraint_validate()
+        self.stub_VolumeConstraint_validate()
+        self.stub_VolumeTypeConstraint_validate()
+        self.cinder_fc.volumes.create.return_value = fv
+        fv_ready = vt_base.FakeVolume('available', id=fv.id)
+        self.cinder_fc.volumes.get.side_effect = [fv, fv_ready]
+
+        self.t['resources']['volume']['properties'].update({
+            'volume_type': 'lvm',
+        })
+        stack = utils.parse_stack(self.t, stack_name=self.stack_name)
+        rsrc = self.create_volume(self.t, stack, 'volume')
+        prg_attach = mock.MagicMock(called=False, srv_id='InstanceInResize')
+        self.assertEqual(False, rsrc._attach_volume_to_complete(prg_attach))
+        self.assertEqual(False, prg_attach.called)
+
+    def test_attach_volume_to_complete_with_active_task_state(self):
+        fv = vt_base.FakeVolume('creating')
+        self.stack_name = 'test_cvolume_attach_with_active_task_state_stack'
+
+        self.stub_SnapshotConstraint_validate()
+        self.stub_VolumeConstraint_validate()
+        self.stub_VolumeTypeConstraint_validate()
+        self.cinder_fc.volumes.create.return_value = fv
+        self.cinder_fc.volumes.create.return_value = fv
+        fv_ready = vt_base.FakeVolume('available', id=fv.id)
+        self.cinder_fc.volumes.get.side_effect = [fv, fv_ready]
+
+        self.t['resources']['volume']['properties'].update({
+            'volume_type': 'lvm',
+        })
+        stack = utils.parse_stack(self.t, stack_name=self.stack_name)
+        rsrc = self.create_volume(self.t, stack, 'volume')
+        self._mock_create_server_volume_script(
+            vt_base.FakeVolume('attaching'))
+
+        prg_attach = mock.MagicMock(called=False, srv_id='InstanceInActive')
+        self.assertEqual(False, rsrc._attach_volume_to_complete(prg_attach))
+        self.assertEqual('vol-123', prg_attach.called)
diff --git a/heat/tests/openstack/nova/fakes.py b/heat/tests/openstack/nova/fakes.py
index 4404ea798..b916e6f2c 100644
--- a/heat/tests/openstack/nova/fakes.py
+++ b/heat/tests/openstack/nova/fakes.py
@@ -113,6 +113,8 @@ class FakeSessionClient(base_client.SessionClient):
                           "accessIPv6": "",
                           "metadata": {"Server Label": "Web Head 1",
                                        "Image Version": "2.1"}},
+
+                         # 1
                          {"id": "5678",
                           "name": "sample-server2",
                           "OS-EXT-AZ:availability_zone": "nova2",
@@ -137,6 +139,7 @@ class FakeSessionClient(base_client.SessionClient):
                                                      "OS-EXT-IPS-MAC:mac_addr":
                                                      "fa:16:3e:8c:44:cc"}]},
                           "metadata": {}},
+                         # 2
                          {"id": "9101",
                           "name": "hard-reboot",
                           "OS-EXT-SRV-ATTR:instance_name":
@@ -154,6 +157,7 @@ class FakeSessionClient(base_client.SessionClient):
                                         "private": [{"version": 4,
                                                      "addr": "10.13.12.13"}]},
                           "metadata": {"Server Label": "DB 1"}},
+                         # 3
                          {"id": "9102",
                           "name": "server-with-no-ip",
                           "OS-EXT-SRV-ATTR:instance_name":
@@ -166,6 +170,7 @@ class FakeSessionClient(base_client.SessionClient):
                           "accessIPv6": "",
                           "addresses": {"empty_net": []},
                           "metadata": {"Server Label": "DB 1"}},
+                         # 4
                          {"id": "9999",
                           "name": "sample-server3",
                           "OS-EXT-SRV-ATTR:instance_name":
@@ -186,6 +191,7 @@ class FakeSessionClient(base_client.SessionClient):
                           "os-extended-volumes:volumes_attached":
                               [{"id":
                                     "66359157-dace-43ab-a7ed-a7e7cd7be59d"}]},
+                         # 5
                          {"id": 56789,
                           "name": "server-with-metadata",
                           "OS-EXT-SRV-ATTR:instance_name":
@@ -202,6 +208,74 @@ class FakeSessionClient(base_client.SessionClient):
                                                     "addr": "5.6.9.8"}],
                                         "private": [{"version": 4,
                                                      "addr": "10.13.12.13"}]},
+                          "metadata": {'test': '123', 'this': 'that'}},
+                         # 6
+                         {"id": "WikiDatabase",
+                          "name": "server-with-metadata",
+                          "OS-EXT-STS:task_state": None,
+                          "image": {"id": 2, "name": "sample image"},
+                          "flavor": {"id": 1, "name": "256 MB Server"},
+                          "hostId": "9e107d9d372bb6826bd81d3542a419d6",
+                          "status": "ACTIVE",
+                          "accessIPv4": "192.0.2.0",
+                          "accessIPv6": "::babe:4317:0A83",
+                          "addresses": {"public": [{"version": 4,
+                                                    "addr": "4.5.6.7"},
+                                                   {"version": 4,
+                                                    "addr": "5.6.9.8"}],
+                                        "private": [{"version": 4,
+                                                     "addr": "10.13.12.13"}]},
+                          "metadata": {'test': '123', 'this': 'that'}},
+                         # 7
+                         {"id": "InstanceInResize",
+                          "name": "server-with-metadata",
+                          "OS-EXT-STS:task_state": 'resize_finish',
+                          "image": {"id": 2, "name": "sample image"},
+                          "flavor": {"id": 1, "name": "256 MB Server"},
+                          "hostId": "9e107d9d372bb6826bd81d3542a419d6",
+                          "status": "ACTIVE",
+                          "accessIPv4": "192.0.2.0",
+                          "accessIPv6": "::babe:4317:0A83",
+                          "addresses": {"public": [{"version": 4,
+                                                    "addr": "4.5.6.7"},
+                                                   {"version": 4,
+                                                    "addr": "5.6.9.8"}],
+                                        "private": [{"version": 4,
+                                                     "addr": "10.13.12.13"}]},
+                          "metadata": {'test': '123', 'this': 'that'}},
+                         # 8
+                         {"id": "InstanceInActive",
+                          "name": "server-with-metadata",
+                          "OS-EXT-STS:task_state": 'active',
+                          "image": {"id": 2, "name": "sample image"},
+                          "flavor": {"id": 1, "name": "256 MB Server"},
+                          "hostId": "9e107d9d372bb6826bd81d3542a419d6",
+                          "status": "ACTIVE",
+                          "accessIPv4": "192.0.2.0",
+                          "accessIPv6": "::babe:4317:0A83",
+                          "addresses": {"public": [{"version": 4,
+                                                    "addr": "4.5.6.7"},
+                                                   {"version": 4,
+                                                    "addr": "5.6.9.8"}],
+                                        "private": [{"version": 4,
+                                                     "addr": "10.13.12.13"}]},
+                          "metadata": {'test': '123', 'this': 'that'}},
+                         # 9
+                         {"id": "AnotherServer",
+                          "name": "server-with-metadata",
+                          "OS-EXT-STS:task_state": 'active',
+                          "image": {"id": 2, "name": "sample image"},
+                          "flavor": {"id": 1, "name": "256 MB Server"},
+                          "hostId": "9e107d9d372bb6826bd81d3542a419d6",
+                          "status": "ACTIVE",
+                          "accessIPv4": "192.0.2.0",
+                          "accessIPv6": "::babe:4317:0A83",
+                          "addresses": {"public": [{"version": 4,
+                                                    "addr": "4.5.6.7"},
+                                                   {"version": 4,
+                                                    "addr": "5.6.9.8"}],
+                                        "private": [{"version": 4,
+                                                     "addr": "10.13.12.13"}]},
                           "metadata": {'test': '123', 'this': 'that'}}]})
 
     def get_servers_1234(self, **kw):
@@ -216,6 +290,22 @@ class FakeSessionClient(base_client.SessionClient):
         r = {'server': self.get_servers_detail()[1]['servers'][0]}
         return (200, r)
 
+    def get_servers_WikiDatabase(self, **kw):
+        r = {'server': self.get_servers_detail()[1]['servers'][6]}
+        return (200, r)
+
+    def get_servers_InstanceInResize(self, **kw):
+        r = {'server': self.get_servers_detail()[1]['servers'][7]}
+        return (200, r)
+
+    def get_servers_InstanceInActive(self, **kw):
+        r = {'server': self.get_servers_detail()[1]['servers'][8]}
+        return (200, r)
+
+    def get_servers_AnotherServer(self, **kw):
+        r = {'server': self.get_servers_detail()[1]['servers'][9]}
+        return (200, r)
+
     def get_servers_WikiServerOne1(self, **kw):
         r = {'server': self.get_servers_detail()[1]['servers'][0]}
         return (200, r)