Open stable/havana

Change-Id: I840bc75d4eadbaea7f3d9cd8b8ae85a4e9d6843f
Removing rpc communication from db transaction

In a transaction context of ExtraRoute_db_mixin.update_router() was
called super method that uses subtransaction and communication with l3
agent. In case of agent's heartbeat happens while there is running
transaction, update heartbeat in agents table gets stuck in a deadlock.

Closes-Bug: #1211915
Change-Id: I96e6a9d7172d5a0e3e720a81fcd10f04c40aef07
(cherry picked from commit 5becbbec6a686667925f399904cebd97b583c35a)
Fix to not send fdb updates when no port changes

(cherry picked from commit 28054a62314daaf30f636e4989cded529b6f12d5)
Fixes bug: 1241874

Change-Id: I36d453c01301ce0b04f64e719ff8f2fe55c72fa2
nvp:log only in rm router iface if port not found

The code currently raises when it's not able to find the port to be
deleted on the backend. This might happen, for instance, when the
port is manually removed or, in some cases, if port creation failed
in the first place.

There's little sense in raising when a resource to be removed is not
found; therefore this patch replaces the raise statement with a log
statement.

Bug 1240720

Change-Id: Ifa756b07ef41346a44325341c8e0e8994dc64dde
(cherry picked from commit 477dac0373b5e84c71365d7a71b9cc41aafcb491)
Fix L2pop to not send updates for unrelated networks

With this patch L2 population mechanism driver
sends updates only with ports related to the
network id of the port which is being updated.

(cherry picked from commit de24799696a8199b13223c2ca3820a9ef015bbe0)
Fixes bug: 1240744

Change-Id: If7d51ce26bf0d0837a00da07fe85f48d55e681c6
Fix access to lifetime dict in update_ipsecpolicy method

Also add corresponding unit test.

Change-Id: Ie1141b5034415ccf3039a71dfedc47cfb2ca7a88
Closes-Bug: #1237912
(cherry picked from commit 48e36b542904effb9b35c9d62bd0247e25f0dac6)
Fix lb doesn't remove vxlan int. if no int. map

LinuxBridge agent doesn't remove vxlan interfaces
if interface_mappings is not set.

(cherry picked from commit f39c8965d9679971afa3db101c09ca2740b39a91)
Fixes bug: 1240742

Change-Id: I163f1ac8cbd46b8d8836152e2be8cb7608a8ca22
Refactor configuring of floating ips on a router

This approach to configuring floating ips is stateless and idempotent.
This allows it to handle corner cases, such as reusing a floating ip
address with a different floating ip id in a way that is easier to
understand.

The concept is to wipe the floating ips clean and rebuild them each
time with the following optimizations.  To avoid bad performance in
manipulating iptables, it is called in the context of a call to
defer_apply_on.  To avoid a disruption in network flow a set
difference is use to determine the set of addresses that no longer
belong on the inteface rather than removing them all blindly.

Change-Id: I0cfb58d487b1925e0a0db2a701c5ea3c56a0b2b5
Fixes: Bug #1209011
Fix error while creating l2 gateway services in nvp

Ensure that Conflict errors are not masked; also ensure
that coding errors do not mask NVP API errors.

Fixes bug #1244259

Change-Id: I27586d72af89fd39f6443dbab33f0e4e762b0c99
(cherry picked from commit 94950eeb22c95da6b2115ea99f6131700decaa09)
fix nvp version validation for distributed router creation

Fix typo on major version. This was not caught during unit tests
so adds a few to ensure this does not regress.

Fix bug #1243862

Change-Id: Ie136aaa504939d8ac77dda07e3f955aed8c233f9
(cherry picked from commit 9eb06332f0292ed4db7b322e483167cb40740d6e)
Merge "nvp:log only in rm router iface if port not found" into stable/havana
Merge "Fix error while creating l2 gateway services in nvp" into stable/havana
Merge "fix nvp version validation for distributed router creation" into stable/havana
Handle VLAN interfaces with Linux IP wrapper

Check if the interface name contains '@' character and use the part
before that character as interface name.

(cherry picked from commit 202fe60b646429aabeb2ef8b1430a1ba9b356061)
Closes-Bug: #1240125

Change-Id: I981c11ed0d62088a0774c09fbeef795f9987cc2f
Merge "Fix L2pop to not send updates for unrelated networks" into stable/havana
Merge "Fix to not send fdb updates when no port changes" into stable/havana
Merge "Fix lb doesn't remove vxlan int. if no int. map" into stable/havana
Merge "Handle VLAN interfaces with Linux IP wrapper" into stable/havana
Avoid suppressing underlying error when deploy.loadapp fails

Raise log level at the first load attempt. If there is a
fundamental problem with the environment, a Lookup error
is not helpful in troubleshooting the problem further.

Fix bug 1210236

(cherry picked from commit: 696e9f3fc8ef7e8bd2a8f21071f3ef91fac14ad5)

Change-Id: I55aa11a0e5a37dbef3f0c1b55aa4c9c11bbf55d9
Merge "Avoid suppressing underlying error when deploy.loadapp fails" into stable/havana