diff options
| author | ramishra <ramishra@redhat.com> | 2021-04-01 18:00:00 +0530 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2021-04-02 05:35:54 +0000 |
| commit | 0bffa5c2e0e2f12264afebcadda0ec9617e9ed69 (patch) | |
| tree | 96955540a54697e189f79506f7fc36c8b23b5439 | |
| parent | af0dd44dabf56fd0095714c957afe562c83f20fb (diff) | |
| download | heat-0bffa5c2e0e2f12264afebcadda0ec9617e9ed69.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 bb3a8adde..cbd155f79 100644 --- a/heat/engine/clients/os/nova.py +++ b/heat/engine/clients/os/nova.py @@ -788,7 +788,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 b3d36af2b..529a22d57 100644 --- a/heat/tests/openstack/nova/test_server.py +++ b/heat/tests/openstack/nova/test_server.py @@ -5165,7 +5165,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): |