tunnel type is not passed right

[yong sheng gong]

cfg.CONF.OVS.tunnel_type is not the same as self.tunnel_type:

        if self.enable_tunneling:
            self.tunnel_type = cfg.CONF.OVS.tunnel_type or constants.TYPE_GRE
        elif cfg.CONF.OVS.tunnel_type:
            self.tunnel_type = cfg.CONF.OVS.tunnel_type
            self.enable_tunneling = True

class OVSRpcCallbacks(dhcp_rpc_base.DhcpRpcCallbackMixin,
                      l3_rpc_base.L3RpcCallbackMixin,
                      sg_db_rpc.SecurityGroupServerRpcCallbackMixin):
    def tunnel_sync(self, rpc_context, **kwargs):
        """Update new tunnel.

        Updates the datbase with the tunnel IP. All listening agents will also
        be notified about the new tunnel IP.
        """
        tunnel_ip = kwargs.get('tunnel_ip')
        # Update the database with the IP
        tunnel = ovs_db_v2.add_tunnel_endpoint(tunnel_ip)
        tunnels = ovs_db_v2.get_tunnel_endpoints()
        entry = dict()
        entry['tunnels'] = tunnels
        # Notify all other listening agents
        self.notifier.tunnel_update(rpc_context, tunnel.ip_address,
                                    tunnel.id, cfg.CONF.OVS.tunnel_type) -->> should be plugin.tunnel_type
        # Return the list of tunnels IP's to the agent
        return entry

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit dcb94c962ffd7961a6fb9979712ed468175a855e
Author: Yong Sheng Gong <email address hidden>
Date: Mon Jul 15 14:04:21 2013 +0800

    Use the correct tunnel_type to notify agents

    Bug #1201274

    Change-Id: I9de55d168ba03cb6a5273b4c2ce140cd190e38ee