Change in vdsm[master]: vdscli: make _ADDRESS and _PORT public

ibarkan at redhat.com ibarkan at redhat.com
Mon Mar 23 14:22:23 UTC 2015


Ido Barkan has uploaded a new change for review.

Change subject: vdscli: make _ADDRESS and _PORT public
......................................................................

vdscli: make _ADDRESS and _PORT public

Change-Id: I1f5d9f627e572df11f01600fd4ebc5e19f85fc5e
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
---
M lib/vdsm/tool/vdsm_dump_chains.py
M lib/vdsm/vdscli.py
2 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/39055/1

diff --git a/lib/vdsm/tool/vdsm_dump_chains.py b/lib/vdsm/tool/vdsm_dump_chains.py
index 9e69b5d..e45ee4e 100644
--- a/lib/vdsm/tool/vdsm_dump_chains.py
+++ b/lib/vdsm/tool/vdsm_dump_chains.py
@@ -130,8 +130,8 @@
     parser.add_option('-u', '--unsecured', action='store_false',
                       dest='use_ssl', default=True,
                       help="use unsecured connection")
-    parser.add_option('-H', '--host', default=vdscli._ADDRESS)
-    parser.add_option('-p', '--port', default=vdscli._PORT)
+    parser.add_option('-H', '--host', default=vdscli.ADDRESS)
+    parser.add_option('-p', '--port', default=vdscli.PORT)
 
     args = sys.argv[2:] if 'vdsm-tool' in sys.argv[0] else sys.argv[1:]
     options, args = parser.parse_args(args=args)
diff --git a/lib/vdsm/vdscli.py b/lib/vdsm/vdscli.py
index 2908775..de37a6a 100644
--- a/lib/vdsm/vdscli.py
+++ b/lib/vdsm/vdscli.py
@@ -29,8 +29,8 @@
 
 _USE_SSL = False
 _TRUSTED_STORE_PATH = '/etc/pki/vdsm'
-_ADDRESS = '0'
-_PORT = 54321
+ADDRESS = '0'
+PORT = 54321
 
 
 def wrap_transport(transport):
@@ -60,15 +60,15 @@
 
 
 def __guessDefaults():
-    global _USE_SSL, _TRUSTED_STORE_PATH, _ADDRESS, _PORT
+    global _USE_SSL, _TRUSTED_STORE_PATH, ADDRESS, PORT
     VDSM_CONF = '/etc/vdsm/vdsm.conf'
     try:
         from .config import config
         config.read(VDSM_CONF)
         _USE_SSL = config.getboolean('vars', 'ssl')
         _TRUSTED_STORE_PATH = config.get('vars', 'trust_store_path')
-        _PORT = config.getint('addresses', 'management_port')
-        _ADDRESS = config.get('addresses', 'management_ip')
+        PORT = config.getint('addresses', 'management_port')
+        ADDRESS = config.get('addresses', 'management_ip')
     except:
         pass
 
@@ -76,9 +76,9 @@
 __guessDefaults()
 
 
-def cannonizeHostPort(hostPort=None, port=_PORT):
+def cannonizeHostPort(hostPort=None, port=PORT):
     if hostPort is None or hostPort == '0':
-        addr = _ADDRESS
+        addr = ADDRESS
         if ':' in addr:
             # __guessDefaults() might set an IPv6 address, cannonize it
             addr = '[%s]' % addr
@@ -119,6 +119,6 @@
 
 if __name__ == '__main__':
     print('connecting to %s:%s ssl %s ts %s' % (
-        _ADDRESS, _PORT, _USE_SSL, _TRUSTED_STORE_PATH))
+        ADDRESS, PORT, _USE_SSL, _TRUSTED_STORE_PATH))
     server = connect()
     print(server.getVdsCapabilities())


-- 
To view, visit https://gerrit.ovirt.org/39055
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f5d9f627e572df11f01600fd4ebc5e19f85fc5e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>


More information about the vdsm-patches mailing list