diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py index 2a829bd470b..33a404359d5 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py @@ -1216,7 +1216,9 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, def _get_port_info(self, registered_ports, cur_ports, readd_registered_ports): - port_info = {'current': cur_ports} + port_info = {'current': cur_ports, + 'added': set(), + 'removed': set()} # FIXME(salv-orlando): It's not really necessary to return early # if nothing has changed. if not readd_registered_ports and cur_ports == registered_ports: diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py index c2802bef402..e6f49edaa97 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py +++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py @@ -367,7 +367,9 @@ class TestOvsNeutronAgent(object): def test_scan_ports_returns_current_only_for_unchanged_ports(self): vif_port_set = set([1, 3]) registered_ports = set([1, 3]) - expected = {'current': vif_port_set} + expected = {'current': vif_port_set, + 'added': set(), + 'removed': set()} actual = self.mock_scan_ports(vif_port_set, registered_ports) self.assertEqual(expected, actual) @@ -418,7 +420,8 @@ class TestOvsNeutronAgent(object): vif_port_set = set([1, 2, 3]) registered_ports = set([1, 2, 3]) updated_ports = set([2]) - expected = dict(current=vif_port_set, updated=set([2])) + expected = dict(current=vif_port_set, updated=set([2]), + added=set(), removed=set()) actual = self.mock_scan_ports(vif_port_set, registered_ports, updated_ports) self.assertEqual(expected, actual) @@ -2239,7 +2242,9 @@ class AncillaryBridgesTest(object): def test_scan_ancillary_ports_returns_cur_only_for_unchanged_ports(self): vif_port_set = set([1, 2]) registered_ports = set([1, 2]) - expected = dict(current=vif_port_set) + expected = dict(current=vif_port_set, + added=set(), + removed=set()) actual = self.mock_scan_ancillary_ports(vif_port_set, registered_ports) self.assertEqual(expected, actual)