diff options
| author | ramishra <ramishra@redhat.com> | 2021-04-01 18:00:00 +0530 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2021-04-14 08:07:10 +0000 |
| commit | 59328b2543417aafd37e145f323434f853276662 (patch) | |
| tree | 27b1db38983e0d3394bb60ea17b63de08dd31420 | |
| parent | 8bdf6b984a457301b43fdecf0dc27e667bcfc910 (diff) | |
| download | heat-59328b2543417aafd37e145f323434f853276662.tar.gz | |
Assume interface detach called for port not found
If the interface has been detached before we call
detach_interface, then we keep on calling it as we
get a 404 from nova. Let's assume it's being called
and check if the interface has been detached.
Task: 42195
Change-Id: I768eeb10c2c24a0c93749b11636ef3e003ecfcd9
(cherry picked from commit 6ff0dc2e19ddf3a3447810f8a55b29d9bec52136)
| -rw-r--r-- | heat/engine/clients/os/nova.py | 2 | ||||
| -rw-r--r-- | heat/tests/openstack/nova/test_server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/heat/engine/clients/os/nova.py b/heat/engine/clients/os/nova.py index cd19b2ea5..c0f280bbf 100644 --- a/heat/engine/clients/os/nova.py +++ b/heat/engine/clients/os/nova.py @@ -793,7 +793,7 @@ echo -e '%s\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers server = self.fetch_server(server_id) if server: server.interface_detach(port_id) - return True + return True def interface_attach(self, server_id, port_id=None, net_id=None, fip=None, security_groups=None): diff --git a/heat/tests/openstack/nova/test_server.py b/heat/tests/openstack/nova/test_server.py index f4aec2a81..47ab98963 100644 --- a/heat/tests/openstack/nova/test_server.py +++ b/heat/tests/openstack/nova/test_server.py @@ -5073,7 +5073,7 @@ class ServerInternalPortTest(ServersTest): server.client().servers.get.return_value = nova_server server.prepare_for_replace() - check_detach.assert_not_called() + self.assertEqual(3, check_detach.call_count) self.assertEqual(0, self.port_delete.call_count) def test_prepare_ports_for_replace_error_state(self): |