From: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date: Tue, 10 Feb 2015 04:00:34 +0000 (+0900)
Subject: OVS DVR: Use a right mac address value to compose a flow
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=294d778eb870fcb0e463347ce931758ef296e309;p=openstack-build%2Fneutron-build.git

OVS DVR: Use a right mac address value to compose a flow

Closes-Bug: #1420092
Change-Id: Ifbeab18e6f9dfc4564b931543ceb3a65edc03b91
---

diff --git a/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py
index f58c4a563..368d5a294 100644
--- a/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py
@@ -295,7 +295,7 @@ class OVSDVRNeutronAgent(dvr_rpc.DVRAgentRpcApiMixin):
                 self.phys_brs[physical_network].add_flow(
                     table=constants.DVR_NOT_LEARN_VLAN,
                     priority=2,
-                    dl_src=mac,
+                    dl_src=mac['mac_address'],
                     actions="output:%s" %
                     self.phys_ofports[physical_network])
 
@@ -313,7 +313,7 @@ class OVSDVRNeutronAgent(dvr_rpc.DVRAgentRpcApiMixin):
                 # result in flow explosions
                 self.tun_br.add_flow(table=constants.DVR_NOT_LEARN,
                                  priority=1,
-                                 dl_src=mac,
+                                 dl_src=mac['mac_address'],
                                  actions="output:%s" %
                                  self.patch_int_ofport)
             self.registered_dvr_macs.add(mac['mac_address'])