Merge "Add vhost-user support via ovs capabilities/datapath_type"

diff --cc etc/neutron/plugins/ml2/openvswitch_agent.ini
Simple merge

diff --cc neutron/common/constants.py
Simple merge

diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
Simple merge

diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index ea51b95af0d7dd215d061bd4b9afe1caa2ae8c30,3a5476d7275bb45c5e2be0d28ae0a9d96ffce151..2b9adc5aa07a9e808abf8c75acf3ebbd32c972b1
--- 1/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
--- 2/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@@ -181,8 -181,8 +181,9 @@@ class OVSNeutronAgent(sg_rpc.SecurityGr
          '''
          super(OVSNeutronAgent, self).__init__()
          self.conf = conf or cfg.CONF
+         self.ovs = ovs_lib.BaseOVS()
  
 +        self.fullsync = True
          # init bridge classes with configured datapath type.
          self.br_int_cls, self.br_phys_cls, self.br_tun_cls = (
              functools.partial(bridge_classes[b],

diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
Simple merge

diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py
Simple merge