diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-12 13:33:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-12 13:33:47 +0000 |
| commit | 3d279ed0f318c83b0a47408844632458f0cbb6bf (patch) | |
| tree | d7ffadf5689dcc5718c5f1ac1872c096eef8d5da /ironic/tests/unit/dhcp | |
| parent | cd12d0b538a14b69280b66441bd17806a1067e77 (diff) | |
| parent | f4ff926ab161297d2281394689ea25a7ef10cbb1 (diff) | |
| download | ironic-3d279ed0f318c83b0a47408844632458f0cbb6bf.tar.gz | |
Merge "Fix updating port MAC address for active nodes"
Diffstat (limited to 'ironic/tests/unit/dhcp')
| -rw-r--r-- | ironic/tests/unit/dhcp/test_neutron.py | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/ironic/tests/unit/dhcp/test_neutron.py b/ironic/tests/unit/dhcp/test_neutron.py index a9329143d..e9e867d6e 100644 --- a/ironic/tests/unit/dhcp/test_neutron.py +++ b/ironic/tests/unit/dhcp/test_neutron.py @@ -98,25 +98,67 @@ class TestNeutron(db_base.DbTestCase): api.provider.update_port_dhcp_opts, port_id, opts) + @mock.patch.object(client.Client, 'show_port') @mock.patch.object(client.Client, 'update_port') @mock.patch.object(client.Client, '__init__') - def test_update_port_address(self, mock_client_init, mock_update_port): + def test_update_port_address(self, mock_client_init, mock_update_port, + mock_show_port): address = 'fe:54:00:77:07:d9' port_id = 'fake-port-id' expected = {'port': {'mac_address': address}} mock_client_init.return_value = None + mock_show_port.return_value = {} api = dhcp_factory.DHCPFactory() api.provider.update_port_address(port_id, address) mock_update_port.assert_called_once_with(port_id, expected) + @mock.patch.object(client.Client, 'show_port') + @mock.patch.object(client.Client, 'update_port') + @mock.patch.object(client.Client, '__init__') + def test_update_port_address_with_binding(self, mock_client_init, + mock_update_port, + mock_show_port): + address = 'fe:54:00:77:07:d9' + port_id = 'fake-port-id' + expected = {'port': {'mac_address': address, + 'binding:host_id': 'host'}} + mock_client_init.return_value = None + mock_show_port.return_value = {'port': {'binding:host_id': 'host'}} + + api = dhcp_factory.DHCPFactory() + api.provider.update_port_address(port_id, address) + mock_update_port.assert_any_call(port_id, + {'port': {'binding:host_id': ''}}) + mock_update_port.assert_any_call(port_id, expected) + + @mock.patch.object(client.Client, 'show_port') + @mock.patch.object(client.Client, 'update_port') + @mock.patch.object(client.Client, '__init__') + def test_update_port_address_show_failed(self, mock_client_init, + mock_update_port, + mock_show_port): + address = 'fe:54:00:77:07:d9' + port_id = 'fake-port-id' + mock_client_init.return_value = None + mock_show_port.side_effect = ( + neutron_client_exc.NeutronClientException()) + + api = dhcp_factory.DHCPFactory() + self.assertRaises(exception.FailedToUpdateMacOnPort, + api.provider.update_port_address, port_id, address) + self.assertFalse(mock_update_port.called) + + @mock.patch.object(client.Client, 'show_port') @mock.patch.object(client.Client, 'update_port') @mock.patch.object(client.Client, '__init__') def test_update_port_address_with_exception(self, mock_client_init, - mock_update_port): + mock_update_port, + mock_show_port): address = 'fe:54:00:77:07:d9' port_id = 'fake-port-id' mock_client_init.return_value = None + mock_show_port.return_value = {} api = dhcp_factory.DHCPFactory() mock_update_port.side_effect = ( |