Nicira plugin unable to load net-gateway extension

[Salvatore Orlando]

Following:

commit 13f9e02a64eb578547ede95ce7849b264d511619
Author: Salvatore Orlando <email address hidden>
Date: Thu May 2 19:39:30 2013 +0200

    Remove calls to policy.check from plugin logic

    Blueprint make-authz-orthogonal

The name of the 'network-gateway' resource has been changed into 'network_gateway' as this is the form which appears in the request body, and that the policy engine uses to validate.

Unfortunately, due to the way string are builts in network_gw.py this also change the alias and collection_name for the resource, making the extension unavailable. Fix is straightforward.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/30011
Committed: http://github.com/openstack/quantum/commit/64a523714d306783fdeb0e5eb2fb3be386bba54e
Submitter: Jenkins
Branch: master

commit 64a523714d306783fdeb0e5eb2fb3be386bba54e
Author: Salvatore Orlando <email address hidden>
Date: Wed May 22 00:24:13 2013 +0100

    Restore correct alias for network-gateway extension

    Bug 1182682

    Change-Id: I85a93e6ccac32515c7ebb2dfe41ba67cf11c9d9f