Inconsistency in sandesh c++ and python client behavior in subscribing for collector service

[Sundaresan Rajangam]

There is inconsistency in the sandesh c++ and python client behavior with respect to subscribing for the collector service with discovery.

c++ sandesh client behavior:
- subscribes for collector service irrespective of whether the collector list is provided in the InitGenerator(), if CollectorSubFn is not NULL. Looks like InitGenerator() expects either collector list or CollectorSubFn to be specified, not both.

python sandesh client behavior:
- subscribes for collector service only if the collector list is empty in init_generator()

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/16571
Submitter: Sundaresan Rajangam (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/16571
Committed: http://github.org/Juniper/contrail-sandesh/commit/9689b0b2ee6fc669a6c03809a0416ddc3d236842
Submitter: Zuul
Branch: master

commit 9689b0b2ee6fc669a6c03809a0416ddc3d236842
Author: Sundaresan Rajangam <email address hidden>
Date: Wed Jan 27 15:29:31 2016 -0800

Fix inconsistency in sandesh c++/python client code in
collector service subscription with discovery

c++ sandesh client:
- subscribes for collector service irrespective of whether the collector
list is provided in the InitGenerator(), if CollectorSubFn is not NULL.

python sandesh client:
- subscribes for collector service only if the collector list is empty
in init_generator()

Modified the sandesh c++ library to subscribe for the collector service
only if the collector list is empty.

Change-Id: I57a2c8f2612df0b8b8f4ebef72d2dd7f62d8f626
Closes-Bug: #1531524