[cloudstack] branch marvin3 updated (50fca5c -> 3288157)

[ga...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gabriel pushed a change to branch marvin3
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 50fca5c  reformat because of indentation problems
     add 3288157  Make Virtual Router '.py' scripts Python3 compatible

No new revisions were added by this update.

Summary of changes:
 systemvm/debian/opt/cloud/bin/configure.py         | 69 +++++++++++-----------
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py      | 32 +++++-----
 systemvm/debian/opt/cloud/bin/cs/CsApp.py          |  5 +-
 systemvm/debian/opt/cloud/bin/cs/CsConfig.py       |  4 +-
 systemvm/debian/opt/cloud/bin/cs/CsDatabag.py      |  2 +-
 systemvm/debian/opt/cloud/bin/cs/CsDhcp.py         |  8 +--
 systemvm/debian/opt/cloud/bin/cs/CsFile.py         |  4 +-
 systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py |  4 +-
 systemvm/debian/opt/cloud/bin/cs/CsHelper.py       |  6 +-
 systemvm/debian/opt/cloud/bin/cs/CsLoadBalancer.py | 10 ++--
 systemvm/debian/opt/cloud/bin/cs/CsMonitor.py      |  8 +--
 systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py    | 20 +++----
 systemvm/debian/opt/cloud/bin/cs/CsProcess.py      | 11 ++--
 systemvm/debian/opt/cloud/bin/cs/CsRedundant.py    | 22 +++----
 systemvm/debian/opt/cloud/bin/cs/CsRoute.py        |  6 +-
 systemvm/debian/opt/cloud/bin/cs/CsRule.py         |  4 +-
 systemvm/debian/opt/cloud/bin/cs/CsStaticRoutes.py |  6 +-
 systemvm/debian/opt/cloud/bin/cs_dhcp.py           |  4 +-
 systemvm/debian/opt/cloud/bin/cs_firewallrules.py  |  4 +-
 .../debian/opt/cloud/bin/cs_forwardingrules.py     |  8 +--
 systemvm/debian/opt/cloud/bin/cs_guestnetwork.py   |  4 +-
 systemvm/debian/opt/cloud/bin/cs_ip.py             | 12 ++--
 systemvm/debian/opt/cloud/bin/cs_monitorservice.py |  2 +-
 systemvm/debian/opt/cloud/bin/cs_network_acl.py    |  2 +-
 .../debian/opt/cloud/bin/cs_remoteaccessvpn.py     |  2 +-
 systemvm/debian/opt/cloud/bin/cs_site2sitevpn.py   |  2 +-
 systemvm/debian/opt/cloud/bin/cs_vmp.py            |  2 +-
 systemvm/debian/opt/cloud/bin/cs_vpnusers.py       | 10 ++--
 systemvm/debian/opt/cloud/bin/diagnostics.py       |  2 +-
 .../debian/opt/cloud/bin/get_diagnostics_files.py  |  4 +-
 systemvm/debian/opt/cloud/bin/merge.py             |  6 +-
 systemvm/debian/opt/cloud/bin/passwd_server_ip.py  | 16 ++---
 systemvm/debian/opt/cloud/bin/update_config.py     |  4 +-
 systemvm/debian/opt/cloud/bin/vmdata.py            | 22 +++----
 .../debian/root/health_checks/cpu_usage_check.py   | 16 ++---
 systemvm/debian/root/health_checks/dhcp_check.py   | 10 ++--
 .../debian/root/health_checks/disk_space_check.py  | 10 ++--
 systemvm/debian/root/health_checks/dns_check.py    | 10 ++--
 .../debian/root/health_checks/gateways_check.py    | 12 ++--
 .../debian/root/health_checks/haproxy_check.py     | 26 ++++----
 .../debian/root/health_checks/iptables_check.py    | 10 ++--
 .../root/health_checks/memory_usage_check.py       | 18 +++---
 .../root/health_checks/router_version_check.py     | 25 ++++----
 .../debian/root/health_checks/utility/__init__.py  |  4 +-
 systemvm/debian/root/monitorServices.py            | 12 ++--
 systemvm/test/runtests.sh                          |  4 +-
 46 files changed, 245 insertions(+), 239 deletions(-)