Merge "ML2 mechanism driver for SR-IOV capable NIC based switching, Part 2"
Merge "Add rule for updating network's router:external attribute"
Encapsulate some port properties in the PortContext

Bindings to host or status may need further encapsulation
to avoid exposing mechanism drivers to underlying DB model
details. This was particularly true in the case of the
l2pop mech driver.

As a result, some docstrings were reworded, and the newly
introduced properties used directly in the mech drivers.

Partially-implements: blueprint neutron-ovs-dvr
Supports blueprint: ml2-hierarchical-port-binding

Change-Id: If2a373ef04d19b164585fb4bde4fe6e0cfaf43be
Handle bool correctly during _extend_extra_router_dict

Ensure that extension attributes are always used to
override the chosen defaults. This was not working
in the case of default boolean True, as the testing
condition was wrong.

Closes-bug: #1348479

Change-Id: I22bce82c6078a96c0eb4a67e6decb6e9205721a8
Merge "Updated from global requirements"
Merge "sync periodic_task fix from incubator"
Merge "VMWare: don't notify on disassociate_floatingips()"
Merge "update vsm credential correctly"
Configuration agent for Cisco devices

A generic config agent for configuring L3+ services in Cisco devices.

This patch targets specifically configuration of L3 fuctionality,
namely routing, NAT and floatingIPs in Cisco CSR1kv virtual appliance.

Implements blueprint: cisco-config-agent
https://blueprints.launchpad.net/neutron/+spec/cisco-config-agent

Change-Id: Ic887a93480eca0b56049c67e32c98658e3a4427f
Add definition for new VIF type

The type VIF_TYPE_DVS is added. This indicates that the port
will be added to a VMware distributed virtual switch.

This is for blueprint vsphere-neutron.

Change-Id: I1b5df837734af9a3f7d48b60de120592b11e392e
Merge "Encapsulate some port properties in the PortContext"
Merge "VPNaaS: Separate validation for Cisco impl"
Set python hash seed to 0 in tox.ini

New tox (>=1.7.0) sets a random python hash seed by default. This is
generally good for testing because it will help keep projects working
regardless of the hash seed, but neutron unittests don't currently pass
with a random hash seed so set it to the python default seed.

This change will allow us to use new tox again and remove the
restriction on tox<=1.6.1 to run unittests.

Note this change will need to be backported to the stable branches to
keep unittests there working with new tox as well.

Change-Id: If151efeb8caae3111515191e238d6e6ae491cd44
Merge "Set python hash seed to 0 in tox.ini"
Fix ML2 Plugin binding:profile update

The current fix changes the logic for binding:profile
update. The binding:profile should be considered as changed
once it is present in the port attributes and differs from
existing binding:profile. The specified binding:profile with
None value should be treated as request to clear binding:profile.

Change-Id: Ibda9a1beec697fbee5be0ee379349035c3626509
Closes-Bug: 1338202
Merge "Add definition for new VIF type"
Merge "Avoid RequestURITooLong exception in metadata agent"
Merge "Cisco: Fix test cases which make incorrect create requests"
Remove redundant code in tests/unit/test_l3_agent

Change-Id: I87d09507cb9e9e37179d6d2035b211aa99f37260
Make test_l3_agent._prepare_router_data a module function

Remove an unneeded class variable, allowing _prepare_router_data
to be changed to a module level function. This allows the function
to be reused by other tests cases.

Change-Id: Ia4de3c535c703fbb2528e6cc9594bcd34f50aca1