Fix #1 Ensure Stale Cleaup Timers do not periodically (return value of TimerCallback Routine)
Fix #2
  o Core was seen as the AgentXmppChannel was deleted and accessed in the TimerCallback Routine.
  o AgentXmppChannel can be deleted when a new set of XmppServers are returned by Discovery Server
  o As soon the XmppChannel goes down both AgentXmppChannel & BgpPeer ds are dissociated
Fix #3
  o No ReScheduling of Timers required as Timers are Started as part of XmppStateMachine task
    and Timer Callbacks as part of DBTask and both the tasks are exclusive, hence Timer
    Cancel() will not fail and can be used to ReStart the Timer.

    LaunchPad Id: #1385428

Change-Id: I0cf451abbe25d71abdcfaca482538a459434515a
BugID #1389059:Fix memory calculation value from 1000 to 1024. Byte should be devided by 1024 instead of 1000.

Change-Id: I9d95c3230ebd804871ea51e986a66b7bdf3b9d8e
Merge "Fix #1 Ensure Stale Cleaup Timers do not periodically (return value of TimerCallback Routine) Fix #2   o Core was seen as the AgentXmppChannel was deleted and accessed in the TimerCallback Routine.   o AgentXmppChannel can be deleted when a new set of XmppServers are returned by Discovery Server   o As soon the XmppChannel goes down both AgentXmppChannel & BgpPeer ds are dissociated Fix #3   o No ReScheduling of Timers required as Timers are Started as part of XmppStateMachine task     and Timer Callbacks as part of DBTask and both the tasks are exclusive, hence Timer     Cancel() will not fail and can be used to ReStart the Timer."
Delete inet6 routes added via xmpp

Change-Id: Iebe849956b84be9df956b887dda11af8df9107de
Decouple discovery service names from sandesh module and service
names. Move back to using 'Collector', 'ApiServer', 'OpServer' as
discovery service names.
Closes-Bug: #1389359

Change-Id: Ic58137f5a443d29fb33438f1a402c0b74f96738b
Add support to link v6 subnet to logical router

Change-Id: I785c08ab875b9b9c568d8ab1a4f3d4a2d9a325fe
Add FreeBSD support in tap-related functions in test_util.cc.

Change-Id: Ifb36e0edfaab282b16b591a7b8d0aa3159b963e2
Merge "Delete inet6 routes added via xmpp"
This set contains following changes:

1) vRouterAgent  restart:
   vcenter-plugin now has a 2 sec periodic checking for
   active vRouterAgent thrift connections. If connection
   is broken, it attempts to connect every 2 sec.
   When connection is successful, Port information
   (VMI info) stored on client (vCenter-plugin) is replayed as
   AddPort to Agent. contrail-vrouter-api Java code is
   modifed to return success/failure during AddPort &
   DeletePort operation. vrouter-api unit tests  modified
   accordingly. Contrail-vrouter-api doesn't use thrift
   reconnecting logic but relies on 2 sec timer to create
   client connection if one is closed.

 2) vCenter-Plugin Restart: code changes to handle vcenter plugin restart.
    When vcenter-plugin boots, first run of syncVirtualNetworks() does
    AddPort on VMIs existing on both API-Server and vCenter Server.

3) Misc bug fix

4) IpamSubnetType constructor has one additional paramter in latest version of Java API.

Change-Id: I6d37f827c55829dcb221db0d0c2d6253fba3e364
Implement introspect command to show xmpp connections

Add a new XmppSandeshContext structure so that the xmpp code does
not have any dependency on bgp. Note that struct BgpSandeshContext
should really be named something like ControlNodeSandeshContext.

Change-Id: Idb87b767192a20a80be3925ddd05d409a88249ad
Closes-Bug: 1389453
Merge "Decouple discovery service names from sandesh module and service names. Move back to using 'Collector', 'ApiServer', 'OpServer' as discovery service names. Closes-Bug: #1389359"
Fetch specific flow from introspect is failing,

as the provided key params are not complete.
Fixing http introspect to use family as IPv4, by default.

this will require change when we support IPv6 flow as well.
Closes-Bug: #1382012

Change-Id: I1393ea21dbcaf3938d56802afb863103d7277eb7
fixing return values for non-void functions for strict compilers.

Change-Id: I6988beacc14d897b1c97a0827d19c7fc48ab1f27
We need two versions of agent UVE library
-One with stats support.
-Other one without stats support.

The UVE library with stats support is same as the current UVE library which is linked with contrail-vrouter-agent
The UVE library without stats can be used for linking with vrouter-agent defined for other platforms like Junos . The vrouter-agent defined for these platforms currently don't link with the current UVE library because of its tight integration with flow and ksync modules.
Closes-Bug: #1389180

Change-Id: I666e27e469ac772cb050e5491a52276ae0162847
Fix svc_monitor unit tests

Closes-Bug: #1366025
Change-Id: Icc3b90bd077188477ef2cfb617307c9f8e3ec955
Fix SVC scheduler unit tests

Use the constant value to match the UVE module_id attribute.

Change-Id: I225017e8ad3767b907b1b79233708d1ee638b4ef
Partial-bug: #1385311
Closes-bug: #1366075
Preserve Communities when creating ServiceChain routes

Change-Id: I371ac8bb4eedc256854ef3743d64ebae1604b2f4
Closes-Bug: 1388421
Merge "Implement introspect command to show xmpp connections"
Move clear xmpp connection command to xmpp server

Change-Id: Ia3e51c53bc14dae847d56e104bfecae45aa5aa63
Merge "We need two versions of agent UVE library -One with stats support. -Other one without stats support."