ML2 plugin with gre tunnel_type is unable to use provider extension options

[Mathieu Rohon]

my localrc has the options :

ENABLE_TENANT_TUNNELS=True
TENANT_TUNNEL_RANGE=1:1

Q_PLUGIN=ml2
Q_AGENT_EXTRA_AGENT_OPTS=(tunnel_types=gre)

but when we want to set a provider network out of the range, it doesn't work :
neutron net-create net-gre1 --tenant-id 50ef18c194a946089f0618b812fd8df6 --provider:network_type gre --provider:segmentation_id 2
Unable to create the network. No tenant network is available for allocation.

it tries to allocate a tenant network, when a provider network is asked.

[Robert Kukura (rkukura)]

It looks like the segmentation_id is being completely ignored when network_type is set to gre:

$ OS_USERNAME=admin neutron net-create --tenant-id demo net-gre --provider:network_type gre --provider:segmentation_id 7
Created a new network:
+---------------------------+--------------------------------------+
| Field | Value |
+---------------------------+--------------------------------------+
| admin_state_up | True |
| id | 6e6bdd98-38db-4e29-931b-728dbb9b4355 |
| name | net-gre |
| provider:network_type | gre |
| provider:physical_network | |
| provider:segmentation_id | 5 |
| router:external | False |
| shared | False |
| status | ACTIVE |
| subnets | |
| tenant_id | demo |
+---------------------------+--------------------------------------+

Even stranger, it looks like the tenant_network_type is used when vlan is specified:

$ OS_USERNAME=admin neutron net-create --tenant-id demo net-vxlan --provider:network_type vxlan --provider:segmentation_id 123456
Created a new network:
+---------------------------+--------------------------------------+
| Field | Value |
+---------------------------+--------------------------------------+
| admin_state_up | True |
| id | 71f630f3-dbdd-4f50-9c75-685beaf218c4 |
| name | net-vxlan |
| provider:network_type | gre |
| provider:physical_network | |
| provider:segmentation_id | 6 |
| router:external | False |
| shared | False |
| status | ACTIVE |
| subnets | |
| tenant_id | demo |
+---------------------------+--------------------------------------+

But specifying a vlan works as expected:

$ OS_USERNAME=admin neutron net-create --tenant-id demo net-vlan --provider:network_type vlan --provider:physical_network physnet1 --provider:segmentation_id 1234
Created a new network:
+---------------------------+--------------------------------------+
| Field | Value |
+---------------------------+--------------------------------------+
| admin_state_up | True |
| id | d5debfa4-47d2-4850-bbf2-e6b3119e3567 |
| name | net-vlan |
| pro...

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/37516
Committed: http://github.com/openstack/neutron/commit/c1b1af72e93da37383d6111195bfc8c63cc49fae
Submitter: Jenkins
Branch: master

commit c1b1af72e93da37383d6111195bfc8c63cc49fae
Author: mathieu-rohon <email address hidden>
Date: Thu Jul 25 10:38:16 2013 +0200

    ML2 tunnel drivers validate provider networks correctly

    there was a copy/paste error in GRE/VXlan type drivers implementation.
    the segment wasn't returned while validating the provider network.

    Change-Id: I7df6d2e714d09618644f935a9ed41354b62de9d0
    Fixes: bug #1202244