Merge "Closes-Bug: #1351398 The key for the config object table was reversed because of the way sandesh object log was defined. Fixed that."

Change-Id: I43d79f85a1b0e1190fd14d9ecc9b3b2ac83c6115
Merge "Closes-Bug: #1349980 The issue is when we process rabbitmq message for instance ip delete, we access the virtual network. In case of the problem, the VN is deleted by this time. Hence the exception is thrown in "dbe_delete_notification" function of InstanceIpServer. Fix: 1. ip_free_notify should only free the ip from the subnet it already knows. 2. Even if the "dbe_xxx_notification" fails, inform the if map server.  This is to ensure that cassandra and if map are in sync. 3. Add logging for "dbe_oper_subscribe" exceptions. The error is critical and hard to debug without this error log."

Change-Id: I3cdac6897d8d15637691458f1d9a46e7d3e0ae66
* Once composite NH is deleted, all the member component NH reference
  would be released. If the same composite NH gets reused, then
  component NH list was not getting populated. Fixing the same.
* Tests in test_nh already take for a UT for this case.
* Fix for bug 1349165

Change-Id: If744f046ad78bdef3847a7fb84ff0a86951ef6b8
* Print nexthop id in log message

Change-Id: If13fb3feaa2cb68bac075693c10a082dc41ec8c7
* Change tunnel type field in composite NH key maintained in
  agent path.
* Test case to verify that ecmp composite NH gets properly updated
  upon tunnel type change.

Change-Id: I7d4bc5de56c493d79c9620b6b1212f563bb5cd7c
(cherry picked from commit 4f3caeb46b782337a21b3d4fdfb585bae47e0661)
[SNAT SVC monitor] Improve scheduling on VRouter

Add a scheduler base class.
Check if the VRouter is up and running before selected it for running a
network namespace of the SI.
Destroy and recreate the network namespace if the VRouter goes down.
This patch request the vrouter uve on the analytics API, if it receive a
HTTP 200 code, the VRouter is considered up and down otherwise.

Cherry-pick from https://review.opencontrail.org/#/c/956/

Conflicts:
	src/config/svc-monitor/svc_monitor/tests/test_init.py

Change-Id: Ie5c933ee3bd0a7cdac076289b4e9030db8833c82
Merge "* Print nexthop id in log message" into R1.10
Merge "* Once composite NH is deleted, all the member component NH reference   would be released. If the same composite NH gets reused, then   component NH list was not getting populated. Fixing the same. * Tests in test_nh already take for a UT for this case. * Fix for bug 1349165" into R1.10
Vn admin state - make all the relevant interfaces inactive when vn admin is down

Change-Id: Iec459e200ef26b8c7128bfadd6fe7206582f9313
Merge "* Change tunnel type field in composite NH key maintained in   agent path. * Test case to verify that ecmp composite NH gets properly updated   upon tunnel type change." into R1.10
Pull commits from maniline.
1) Restore enqueueing a route add/change/delete request should be done in default vrf.
   https://github.com/Juniper/contrail-controller/commit/0a4c9d1fceecceef4dfb858f80a2e44486828099

2) Agent test cases build fixes and bug fixes.

Change-Id: I0e50b5f5b967bf9e20a6659404cc306c16a546c2
Merge "Vn admin state - make all the relevant interfaces inactive when vn admin is down" into R1.10
Merge "Merge "Closes-Bug: #1349980 The issue is when we process rabbitmq message for instance ip delete, we access the virtual network. In case of the problem, the VN is deleted by this time. Hence the exception is thrown in "dbe_delete_notification" function of InstanceIpServer. Fix: 1. ip_free_notify should only free the ip from the subnet it already knows. 2. Even if the "dbe_xxx_notification" fails, inform the if map server.  This is to ensure that cassandra and if map are in sync. 3. Add logging for "dbe_oper_subscribe" exceptions. The error is critical and hard to debug without this error log."" into R1.10
Merge "[SNAT SVC monitor] Improve scheduling on VRouter" into R1.10
Merge "Pull commits from maniline. 1) Restore enqueueing a route add/change/delete request should be done in default vrf.    https://github.com/Juniper/contrail-controller/commit/0a4c9d1fceecceef4dfb858f80a2e44486828099" into R1.10
Merge "Merge "Closes-Bug: #1351398 The key for the config object table was reversed because of the way sandesh object log was defined. Fixed that."" into R1.10
Merge "Extra dhcp options on port"

Change-Id: I3c339163d5081f616831505a07e1d793d030cb30
Use the correct task instance in cdbq cleanup, initialization and
dequeue tasks to avoid cdbq being deleted when dequeue task is
running

Closes-Bug: #1349731
Change-Id: Ia31ba91f46d3b48c697ccf4c937516ac1642b968
(cherry picked from commit 607baeb462f71b51e1fb9cf9751566216ebcf9ea)
Bug 1348909:

For quota apis, we use vnc_api lib which reads its config from its own
config file vnc_api_lib.ini. However this file can only be read by
root and neutron runs as user name neutron. As a result, it cannot
read this file and reverts to default values of auth host/port. This
works on single node setups, but on multi node setups, if keystone is
not running locally, it fails. With this commit, we are providing a
way to pass auth parameters while creating api lib connection. With
this, our quota driver can pass these values correctly.

Change-Id: I368a7ab5dc6d4eb1ded2bd2b86877c0570a9550d
Bug 1352281: set status to DOWN if admin state is down

Change-Id: Ida5fd3dd5045e9e9568b35ba234c5fa6396585b2