]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
ofagent: Fix VLAN usage for TYPE_FLAT and TYPE_VLAN
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>
Wed, 2 Apr 2014 06:41:38 +0000 (15:41 +0900)
committerYAMAMOTO Takashi <yamamoto@valinux.co.jp>
Mon, 9 Jun 2014 10:19:09 +0000 (19:19 +0900)
commit35b0e003e59232d63b8dbd0da511ee8e3877335e
tree49867799d94d2370246f2a7979df403393c20650
parent787bba2274209b363d38f79a1b8128fd7760f260
ofagent: Fix VLAN usage for TYPE_FLAT and TYPE_VLAN

while ofagent uses OF1.3, the current coding incorrectly uses
OF1.0 terms in some places.  namely, _local_vlan_for_flat uses
0xffff to mean "no VLAN".  it should use OFPVID_NONE and
pop_vlan/push_vlan appropriately.  the same problem exists for
reclaim_local_vlan.

Closes-Bug: 1301144
Change-Id: I3df821fd72471f8bd84366e3b5a1cc7e3489156c
neutron/plugins/ofagent/agent/ofa_neutron_agent.py
neutron/tests/unit/ofagent/fake_oflib.py
neutron/tests/unit/ofagent/test_ofa_neutron_agent.py