Cisco plugin (grizzly) does not pass proper args

[Arvind Somya]

The Cisco plugin in grizzly does not pass proper arguments to one method in cisco_nexus_network_driver_v2:

Neutron Master:
self._client.enable_vlan_on_trunk_int(
                        switch_ip, vlan_id, port_id)

Neutron stable/grizzly:
self._client.enable_vlan_on_trunk_int(man,
                                                      port_id,
                                                      vlan_id)

In both branches the driver is set to accept 5 arguments:
def enable_vlan_on_trunk_int(self, mgr, nexus_switch, interface, vlanid):

Looks like the backport from havana to grizzly missed this change. This needs to be backported to stable/grizzly asap.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/grizzly
Review: https://review.openstack.org/42783

[Thierry Carrez (ttx)]

Only affects Grizzly. Created corresponding bugtask

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/42783
Committed: http://github.com/openstack/neutron/commit/07f772a1e851cbcaeb39accea30103173ef50d87
Submitter: Jenkins
Branch: stable/grizzly

commit 07f772a1e851cbcaeb39accea30103173ef50d87
Author: Dane LeBlanc <email address hidden>
Date: Mon Aug 19 19:55:03 2013 -0400

    Cisco plugin (grizzly) does not pass proper args.

    Fixes bug 1213147

    The Cisco plugin in grizzly does not pass proper arguments to
    the enable_vlan_on_trunk_int() method in cisco_nexus_network_driver_v2.
    The definition calls for 4 arguments (not counting self):

        def enable_vlan_on_trunk_int(self, mgr, nexus_switch,
                                     interface, vlanid)

    but the call in the nexus driver passes only 3 arguments:

        self._client.enable_vlan_on_trunk_int(man,
                                              port_id,
                                              vlan_id)

    Change-Id: Ie51affe692151a2ac92f22450e2e70b1005f3507