ofagent incorrectly uses OF1.0 VLAN semantics

[YAMAMOTO Takashi]

while ofagent uses OF1.3, it 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.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/85649

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/85649
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=35b0e003e59232d63b8dbd0da511ee8e3877335e
Submitter: Jenkins
Branch: master

commit 35b0e003e59232d63b8dbd0da511ee8e3877335e
Author: YAMAMOTO Takashi <email address hidden>
Date: Wed Apr 2 15:41:38 2014 +0900

    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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/icehouse
Review: https://review.openstack.org/100380

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/100380
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=1da7abde2e5354c2bcd088d2de25254742ea01fe
Submitter: Jenkins
Branch: stable/icehouse

commit 1da7abde2e5354c2bcd088d2de25254742ea01fe
Author: YAMAMOTO Takashi <email address hidden>
Date: Wed Apr 2 15:41:38 2014 +0900

    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
    (cherry picked from commit 35b0e003e59232d63b8dbd0da511ee8e3877335e)