DISCOVERY.port change in vrouter agent conf doesn't work

[Slobodan Blatnjak]

DISCOVERY.port configuration added to agent code in commit https://github.com/Juniper/contrail-controller/commit/1fc07f227a576aab90ba32fcadc5028235bea586
-# IP address of discovery server
-# server=10.204.217.52
+# IP address and port of discovery server
+# port=5998
+# server=127.0.0.1

doesn't work on 2.21-102 and 2.21.2. Port change in config file is ignored.

[DISCOVERY]
#If DEFAULT.collectors and/or CONTROL-NODE and/or DNS is not specified this
/etc/contrail/contrail-vrouter-agent.conf

# IP address and port of discovery server
# port=5998
port=9110
# server=127.0.0.1
server=10.41.0.20

root@vrouter-0:/home/ubuntu# tcpdump port 5998
listening on eth0, link-type EN10MB (Ethernet), capture size 65535 bytes
07:49:48.682860 IP 10.41.0.22.38672 > 10.41.0.20.5998: Flags [S], seq 786616545, win 29200, options [mss 1460,sackOK,TS val 83584336 ecr 0,nop,wscale 7], length 0
07:49:48.684436 IP 10.41.0.20.5998 > 10.41.0.22.38672: Flags [S.], seq 3759982292, ack 786616546, win 28960, options [mss 1460,sackOK,TS val 168689472 ecr 83584336,nop,wscale 7], length 0
07:49:48.684513 IP 10.41.0.22.38672 > 10.41.0.20.5998: Flags [.], ack 1, win 229, options [nop,nop,TS val 83584337 ecr 168689472], length 0
07:49:48.684648 IP 10.41.0.22.38672 > 10.41.0.20.5998: Flags [P.], seq 1:303, ack 1, win 229, options [nop,nop,TS val 83584337 ecr 168689472], length 302
07:49:48.684972 IP 10.41.0.20.5998 > 10.41.0.22.38672: Flags [.], ack 303, win 235, options [nop,nop,TS val 168689472 ecr 83584337], length 0
07:49:48.694913 IP 10.41.0.20.5998 > 10.41.0.22.38672: Flags [P.], seq 1:266, ack 303, win 235, options [nop,nop,TS val 168689474 ecr 83584337], length 265
07:49:48.694949 IP 10.41.0.22.38672 > 10.41.0.20.5998: Flags [.], ack 266, win 237, options [nop,nop,TS val 83584339 ecr 168689474], length 0
07:49:48.695309 IP 10.41.0.22.38672 > 10.41.0.20.5998: Flags [F.], seq 303, ack 266, win 237, options [nop,nop,TS val 83584340 ecr 168689474], length 0
07:49:48.695660 IP 10.41.0.20.5998 > 10.41.0.22.38672: Flags [F.], seq 266, ack 304, win 235, options [nop,nop,TS val 168689474 ecr 83584340], length 0
07:49:48.69

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/21412
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/21413
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/21412
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/21484
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/21412
Committed: http://github.org/Juniper/contrail-controller/commit/f6e048b3cc58ed13ae773b767f528ea8b8f5ae82
Submitter: Zuul
Branch: master

commit f6e048b3cc58ed13ae773b767f528ea8b8f5ae82
Author: harsh <email address hidden>
Date: Fri Jun 24 15:42:13 2016 +0530

For Discovey agent client initialization use port value as set in agent param.

Change-Id: I0a7cc1d11f7ca9e8bacc7fcdf8eec92726eb6a3f
Closes-Bug: #1580109

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/21648
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/21653
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/21967
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/21970
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/21972
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/21967
Committed: http://github.org/Juniper/contrail-controller/commit/80c10d7bf02b3ee0067a642656372f69a4de7d6c
Submitter: Zuul
Branch: R3.0

commit 80c10d7bf02b3ee0067a642656372f69a4de7d6c
Author: harsh <email address hidden>
Date: Thu Jul 14 11:13:46 2016 +0530

For Discovey agent client initialization use port value as set in agent param.

Change-Id: I38dbc90d3d563a43d22898b8209f89c5c2f8cea0
Closes-Bug: #1580109

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/21653
Committed: http://github.org/Juniper/contrail-controller/commit/8b0cda66538b480ef4447cc2c7fd3f6cd2b8f4bd
Submitter: Zuul
Branch: R2.21.x

commit 8b0cda66538b480ef4447cc2c7fd3f6cd2b8f4bd
Author: Kumar Harsh <email address hidden>
Date: Tue Jul 12 11:37:02 2016 +0530

For Discovey agent client initialization use port value as set in agent param.

Closes-Bug: #1580109

Change-Id: Ic84036bb500618e26bbc8ffd67aa78eadc28e8e8

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/21970
Committed: http://github.org/Juniper/contrail-controller/commit/5931e6ee1e48a280b39c5bc928bac02b27439162
Submitter: Zuul
Branch: R2.22.x

commit 5931e6ee1e48a280b39c5bc928bac02b27439162
Author: harsh <email address hidden>
Date: Thu Jul 14 11:50:53 2016 +0530

For Discovey agent client initialization use port value as set in agent param.

Change-Id: Ib38120638a8dbe98c54f82a709481ac02654aecb
Closes-Bug: #1580109

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/21972
Committed: http://github.org/Juniper/contrail-controller/commit/09347041bde4b15e82e8617c5a7d299258309440
Submitter: Zuul
Branch: R2.20

commit 09347041bde4b15e82e8617c5a7d299258309440
Author: harsh <email address hidden>
Date: Thu Jul 14 11:59:23 2016 +0530

For Discovey agent client initialization use port value as set in agent param.

Change-Id: I4a2597950d8efce2a02cd111ff8e454a5e9b75af
Closes-Bug: #1580109