Testbed.py changes for tor-agent ha provisioning

[Vedamurthy Joshi]

It is possible that the users can get into confusion on how to populate testbed.py in the case of HA setup.

This is to track testbed parameter changes for HA setup

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/11357
Submitter: Ashok Singh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/11357
Committed: http://github.org/Juniper/contrail-fabric-utils/commit/9804fd3e10dfee6e772b6d0d0d806fc66b96e797
Submitter: Zuul
Branch: R2.20

commit 9804fd3e10dfee6e772b6d0d0d806fc66b96e797
Author: ashoksingh <email address hidden>
Date: Mon Jun 8 10:52:35 2015 +0530

Remove some unnecessary options and rename some options pertaining to tor_agent provisioning from testbed file.

Removed standby_tor_agent_ip, standby_tor_agent_tor_id and standby_tor_agent_tor_ovs_port options from testbed.py file. Redundant TOR Agent is identified by its 'tor_name'. Two TOR Agents which need to be redundant to each other should have the same 'tor_name' configured. They should also have the same 'tor_ovs_port" configured.
Also renamed tor_id to tor_agent_id and tor_http_server_port to tor_agent_http_server_port
Also made ca_cert_file as global parameter instead of per tor-agent parameter

Change-Id: I8d9e427056d34157b8291a5a31de864615992849
Closes-Bug: #1458502

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/11409
Submitter: Ashok Singh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/11409
Committed: http://github.org/Juniper/contrail-fabric-utils/commit/0248cfc298c6fdc92db733ed950527a9a46013bf
Submitter: Zuul
Branch: master

commit 0248cfc298c6fdc92db733ed950527a9a46013bf
Author: ashoksingh <email address hidden>
Date: Mon Jun 8 10:52:35 2015 +0530

Remove some unnecessary options and rename some options pertaining to tor_agent provisioning from testbed file.

Removed standby_tor_agent_ip, standby_tor_agent_tor_id and standby_tor_agent_tor_ovs_port options from testbed.py file. Redundant TOR Agent is identified by its 'tor_name'. Two TOR Agents which need to be redundant to each other should have the same 'tor_name' configured. They should also have the same 'tor_ovs_port" configured.
Also renamed tor_id to tor_agent_id and tor_http_server_port to tor_agent_http_server_port
Also made ca_cert_file as global parameter instead of per tor-agent parameter

Closes-Bug: #1458502
(cherry picked from commit 9804fd3e10dfee6e772b6d0d0d806fc66b96e797)

Change-Id: If5d720e7c0b3100995245034dd63775bacd3c40c