Change in vdsm[master]: register: general improvements

dougsland at redhat.com dougsland at redhat.com
Tue Aug 4 16:54:06 UTC 2015


Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: register: general improvements
......................................................................

register: general improvements

- replace --node-fqdn to --node-address for a better naming fit
- remove unused socket library
- improvement in docstring

Change-Id: I5182c32e927e45da18e15e6a0f8fb2c6632de370
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M lib/vdsm/tool/register.py
1 file changed, 11 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/69/44369/1

diff --git a/lib/vdsm/tool/register.py b/lib/vdsm/tool/register.py
index b5c2654..c170316 100644
--- a/lib/vdsm/tool/register.py
+++ b/lib/vdsm/tool/register.py
@@ -21,7 +21,6 @@
 import logging
 import os
 import pwd
-import socket
 import ssl
 import sys
 import tempfile
@@ -40,13 +39,13 @@
     def __init__(self, engine_fqdn, engine_https_port=None,
                  fingerprint=None, ssh_port=None,
                  ssh_user=None, check_fqdn=True,
-                 vdsm_port=None, node_fqdn=None,
+                 vdsm_port=None, node_address=None,
                  node_name=None):
         """
         Attributes:
 
-        engine_fqdn       - Engine FQDN
-        engine_https_port - Engine http port
+        engine_fqdn       - Engine FQDN or IP address
+        engine_https_port - Engine https port
         fingeprint        - Fingerprint to be validated
         ssh_user          - SSH user that will establish the connection
                             from Engine
@@ -54,7 +53,7 @@
         check_fqdn        - Validate Engine FQDN against CA (True or False)
                             Default is TRUE
         vdsm_port         - VDSM listen port
-        node_fqdn         - Specify node FQDN
+        node_address      - Specify node address or FQDN
         node_name         - Specify node name
         """
         self.logger = self._set_logger()
@@ -87,8 +86,8 @@
         self.fprint = fingerprint
         self.logger.debug("Fingerprint: {fp}".format(fp=self.fprint))
 
-        self.node_fqdn = node_fqdn
-        self.logger.debug("Node FQDN: {nf}".format(nf=self.node_fqdn))
+        self.node_address = node_address
+        self.logger.debug("Node address: {nf}".format(nf=self.node_address))
 
         self.node_name = node_name
         self.logger.debug("Node name: {na}".format(na=self.node_name))
@@ -151,8 +150,8 @@
         if self.node_name is not None:
             ureg += "&name={name}".format(name=self.node_name)
 
-        if self.node_fqdn is not None:
-            ureg += "&address={fqdn}".format(fqdn=self.node_fqdn)
+        if self.node_address is not None:
+            ureg += "&address={fqdn}".format(fqdn=self.node_address)
 
         self.url_reg = "{e}{u}".format(e=self.engine_url, u=ureg)
 
@@ -378,7 +377,7 @@
     )
 
     parser.add_argument(
-        '--node-fqdn',
+        '--node-address',
         help="Define node FQDN or IP address."
              " If not provided, will be used system host name",
     )
@@ -392,7 +391,7 @@
 
     parser.add_argument(
         '--engine-fqdn',
-        help="Engine FQDN (See also: --check-fqdn)",
+        help="Engine FQDN or IP address (See also: --check-fqdn)",
         required=True
     )
 
@@ -441,7 +440,7 @@
     reg = Register(engine_fqdn=args.engine_fqdn,
                    engine_https_port=args.engine_https_port,
                    vdsm_port=args.vdsm_port,
-                   node_fqdn=args.node_fqdn,
+                   node_address=args.node_address,
                    node_name=args.node_name,
                    ssh_user=args.ssh_user,
                    ssh_port=args.ssh_port,


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5182c32e927e45da18e15e6a0f8fb2c6632de370
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>


More information about the vdsm-patches mailing list