Hyper-V agent does not report the correct exception when the network type is set to GRE

[Alessandro Pilotti]

The parameters passed to the HyperVException stating that the network type is invalid are not properly set:

https://github.com/openstack/neutron/blob/2d9e479eb3d5dd3d957fdbccf6d7fd3f5d82ad34/quantum/plugins/hyperv/agent/hyperv_quantum_agent.py#L163

It affects both Grizzly and Havana.

Here are the exception details.

2013-08-05 15:57:42 ERROR [quantum.plugins.hyperv.agent.hyperv_quantum_agent] Error in agent event loop: __init__() takes exactly 1 argument (4 given)
Traceback (most recent call last):
  File "C:\Program Files (x86)\Cloudbase Solutions\OpenStack\Nova\Python27\lib\site-packages\quantum-2013.1.2-py2.7.egg\quantum\plugins\hyperv\agent\hyperv_quantum_agent.py", line 317, in daemon_loop
    sync = self._process_network_ports(port_info)
  File "C:\Program Files (x86)\Cloudbase Solutions\OpenStack\Nova\Python27\lib\site-packages\quantum-2013.1.2-py2.7.egg\quantum\plugins\hyperv\agent\hyperv_quantum_agent.py", line 293, in _process_network_ports
    resync_a = self._treat_devices_added(port_info['added'])
  File "C:\Program Files (x86)\Cloudbase Solutions\OpenStack\Nova\Python27\lib\site-packages\quantum-2013.1.2-py2.7.egg\quantum\plugins\hyperv\agent\hyperv_quantum_agent.py", line 270, in _treat_devices_added
    device_details['admin_state_up'])
  File "C:\Program Files (x86)\Cloudbase Solutions\OpenStack\Nova\Python27\lib\site-packages\quantum-2013.1.2-py2.7.egg\quantum\plugins\hyperv\agent\hyperv_quantum_agent.py", line 239, in _treat_vif_port
    physical_network, segmentation_id)
  File "C:\Program Files (x86)\Cloudbase Solutions\OpenStack\Nova\Python27\lib\site-packages\quantum-2013.1.2-py2.7.egg\quantum\plugins\hyperv\agent\hyperv_quantum_agent.py", line 188, in _port_bound
    physical_network, segmentation_id)
  File "C:\Program Files (x86)\Cloudbase Solutions\OpenStack\Nova\Python27\lib\site-packages\quantum-2013.1.2-py2.7.egg\quantum\plugins\hyperv\agent\hyperv_quantum_agent.py", line 165, in _provision_network
    network_type, net_uuid)
TypeError: __init__() takes exactly 1 argument (4 given)

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit b94c88f80ac2473ec6a61c26bf0e2843a63456b2
Author: Alessandro Pilotti <email address hidden>
Date: Fri Sep 13 19:44:22 2013 +0300

    Fixes Hyper-V agent unsopported network_type issue

    Fixes an issue when an exception is raised in case of not
    supported network types.

    Fixes bug: #1224583

    Change-Id: I847aa825fbf5b7086c9960c051014cc1d7515f62

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/46538
Committed: http://github.com/openstack/neutron/commit/2996012f8916d90fb32af2fa3e2e2978e2f926f9
Submitter: Jenkins
Branch: stable/grizzly

commit 2996012f8916d90fb32af2fa3e2e2978e2f926f9
Author: Alessandro Pilotti <email address hidden>
Date: Thu Sep 12 20:49:55 2013 +0300

    Fixes Hyper-V agent unsopported network_type issue

    Fixes an issue when an exception is raised in case of not supported
    network types.

    Fixes bug: #1224583

    Change-Id: I847aa825fbf5b7086c9960c051014cc1d7515f62