Browse Source

Merge "Assume interface detach called for port not found" into stable/victoria

changes/83/787983/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
9181439680
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      heat/engine/clients/os/nova.py
  2. +1
    -1
      heat/tests/openstack/nova/test_server.py

+ 1
- 1
heat/engine/clients/os/nova.py View File

@ -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):


+ 1
- 1
heat/tests/openstack/nova/test_server.py View File

@ -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):


Loading…
Cancel
Save