[PATCH v3 1/9] pool-wizard: Add new line in error message of _create_dir method

[Jiri Prochazka]

New line was missing in print of an error message of _create_dir method

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 lnst/Controller/Wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnst/Controller/Wizard.py b/lnst/Controller/Wizard.py
index f2c645c..51856e8 100644
--- a/lnst/Controller/Wizard.py
+++ b/lnst/Controller/Wizard.py
@@ -186,7 +186,7 @@ class Wizard:
             print("Dir '%s' has been created" % pool_dir)
             return pool_dir
         except:
-            sys.stderr.write("Failed creating dir")
+            sys.stderr.write("Failed creating dir\n")
             return None
 
     def _create_xml(self, machine_interfaces, hostname,
-- 
2.4.3

[PATCH v3 2/9] pool-wizard: Rework and rename method _query_pool_dir to _check_and_query_pool_dir

[Jiri Prochazka]

This patch introduces several changes to the _query_pool_dir method in
lnst.Controller.Wizard:
- Method was renamed to _check_and_query_pool_dir to better express nature of the method
- Method now uses 1 optional argument - pool_dir - if set to something else than None,
  it checks if it's valid path to existing or creatable dir, if it is, uses it,
  else queries user for a new path (which is also checked)

This method was reworked to prevent code duplication which would occur when mode for
virtual
machines would be introduced

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 lnst/Controller/Wizard.py | 80 ++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 46 deletions(-)

diff --git a/lnst/Controller/Wizard.py b/lnst/Controller/Wizard.py
index 51856e8..f579e5d 100644
--- a/lnst/Controller/Wizard.py
+++ b/lnst/Controller/Wizard.py
@@ -32,22 +32,7 @@ class Wizard:
         """ Starts Wizard in an interactive mode
         @param pool_dir Path to pool directory (optional)
         """
-        if pool_dir is None:
-            pool_dir = self._query_pool_dir()
-        else:
-            rv = self._check_path(pool_dir)
-            if rv == PATH_IS_DIR_ACCESSIBLE:
-                print("Pool directory set to '%s'" % pool_dir)
-            elif rv == PATH_DOES_NOT_EXIST:
-                sys.stderr.write("Path '%s' does not exist\n" %
pool_dir)
-                pool_dir = self._query_pool_dir()
-            elif rv == PATH_NOT_DIR:
-                sys.stderr.write("Path '%s' exists but is not a
directory\n"
-                                 % pool_dir)
-                pool_dir = self._query_pool_dir()
-            elif rv == PATH_IS_DIR_NOT_ACCESSIBLE:
-                sys.stderr.write("Directory '%s' is not writable\n" %
pool_dir)
-                pool_dir = self._query_pool_dir()
+        pool_dir = self._check_and_query_pool_dir(pool_dir)
 
         while True:
             hostname = self._query_hostname()
@@ -161,6 +146,39 @@ class Wizard:
         except:
             return False
 
+    def _check_and_query_pool_dir(self, pool_dir):
+        """ Queries user for pool directory
+        @param pool_dir Optional pool_dir which will be checked and used if OK
+        @return Valid (is writable by user) path to directory
+        """
+        while True:
+            if pool_dir is None:
+                pool_dir = raw_input("Enter path to a pool directory "
+                                     "(default: '%s'): " %
DefaultPoolDir)
+            if pool_dir == "":
+                pool_dir = DefaultPoolDir
+
+            pool_dir = os.path.expanduser(pool_dir)
+            rv = self._check_path(pool_dir)
+            if rv == PATH_IS_DIR_ACCESSIBLE:
+                print("Pool directory set to '%s'" % pool_dir)
+                return pool_dir
+            elif rv == PATH_DOES_NOT_EXIST:
+                sys.stderr.write("Path '%s' does not exist\n"
+                                 % pool_dir)
+                if self._query_dir_creation(pool_dir):
+                    created_dir = self._create_dir(pool_dir)
+                    if created_dir is not None:
+                        return created_dir
+
+            elif rv == PATH_NOT_DIR:
+                sys.stderr.write("Path '%s' exists but is not a
directory\n"
+                                 % pool_dir)
+            elif rv == PATH_IS_DIR_NOT_ACCESSIBLE:
+                sys.stderr.write("Directory '%s' is not writable\n"
+                                 % pool_dir)
+            pool_dir = None
+
     def _check_path(self, pool_dir):
         """ Checks if path exists, is dir and is accessible by user
         @param pool_dir Path to checked directory
@@ -330,36 +348,6 @@ class Wizard:
                 sys.stderr.write("Hostname '%s' is not translatable into a
"
                                  "valid IP address\n" % hostname)
 
-    def _query_pool_dir(self):
-        """ Queries user for pool directory
-        @return Valid (is writable by user) path to directory
-        """
-        while True:
-            pool_dir = raw_input("Enter path to a pool directory "
-                                 "(default: '%s'): " % DefaultPoolDir)
-            if pool_dir == "":
-                pool_dir = DefaultPoolDir
-
-            pool_dir = os.path.expanduser(pool_dir)
-            rv = self._check_path(pool_dir)
-            if rv == PATH_IS_DIR_ACCESSIBLE:
-                print("Pool directory set to '%s'" % pool_dir)
-                return pool_dir
-            elif rv == PATH_DOES_NOT_EXIST:
-                sys.stderr.write("Path '%s' does not exist\n"
-                                 % pool_dir)
-                if self._query_dir_creation(pool_dir):
-                    created_dir = self._create_dir(pool_dir)
-                    if created_dir is not None:
-                        return created_dir
-
-            elif rv == PATH_NOT_DIR:
-                sys.stderr.write("Path '%s' exists but is not a
directory\n"
-                                 % pool_dir)
-            elif rv == PATH_IS_DIR_NOT_ACCESSIBLE:
-                sys.stderr.write("Directory '%s' is not writable\n"
-                                 % pool_dir)
-
     def _query_port(self):
         """ Queries user for port
         @return Integer representing port
-- 
2.4.3

[PATCH v3 3/9] pool-wizard: Add default value for argument pool_dir in noninteractive method

[Jiri Prochazka]

Default value is set to DefaultPoolDir

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 lnst/Controller/Wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnst/Controller/Wizard.py b/lnst/Controller/Wizard.py
index f579e5d..c235353 100644
--- a/lnst/Controller/Wizard.py
+++ b/lnst/Controller/Wizard.py
@@ -60,7 +60,7 @@ class Wizard:
             else:
                 break
 
-    def noninteractive(self, hostlist, pool_dir):
+    def noninteractive(self, hostlist, pool_dir=DefaultPoolDir):
         """ Starts Wizard in noninteractive mode
         @param hostlist List of hosts (mandatory)
         @param pool_dir Path to pool_directory (optional)
-- 
2.4.3

[PATCH v3 4/9] pool-wizard: Add _write_to_file method, rework _create_xml method

[Jiri Prochazka]

_write_to_file:
  The method tries to create a file and write in it contents of result XML,
  if it success, returns True, else it returns False

  This method was created to improve readability and modularity of the pool
  wizard code.

_create_xml:
  This patch introduces several minor changes to _create_xml method:
    - Attribute "rpc_port" is now added for nonvirtual hosts
    - Adds new argument "libvirt_domain" which will be used in virtual mode
    - Updated documentation for the method
    - Added default values (None) to all arguments
    - Calls of the functions in interactive and noninteractive methods were
      adjusted to be up-to-date with the changes
    - Added support for virtual mode, which will write only hostname and
      libvirt domain to the output XML file
    - Changed the method so it uses newly created _write_to_xml method

  Changes were made as preparation for implementing virtual mode, because
  new virtual method will use _create_xml method differently than existing ones

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 lnst/Controller/Wizard.py | 118 +++++++++++++++++++++++++++-------------------
 1 file changed, 69 insertions(+), 49 deletions(-)

diff --git a/lnst/Controller/Wizard.py b/lnst/Controller/Wizard.py
index c235353..f6a6e42 100644
--- a/lnst/Controller/Wizard.py
+++ b/lnst/Controller/Wizard.py
@@ -53,8 +53,10 @@ class Wizard:
                                  "'%s:%s'\n" % (hostname, port))
             elif machine_interfaces is not None:
                 filename = self._query_filename(hostname)
-                self._create_xml(machine_interfaces, hostname,
-                                 port, pool_dir, filename, "interactive")
+                self._create_xml(machine_interfaces=machine_interfaces,
+                                 hostname=hostname, pool_dir=pool_dir,
+                                 filename=filename, port=port,
+                                 mode="interactive")
             if self._query_continuation():
                 continue
             else:
@@ -131,8 +133,10 @@ class Wizard:
                 continue
             else:
                 filename = hostname + ".xml"
-                self._create_xml(machine_interfaces, hostname,
-                                 port, pool_dir, filename, "noninteractive")
+                self._create_xml(machine_interfaces=machine_interfaces,
+                                 hostname=hostname, pool_dir=pool_dir,
+                                 filename=filename, port=port,
+                                 mode="noninteractive")
 
     def _check_hostname(self, hostname):
         """ Checks hostnames translatibility
@@ -207,15 +211,16 @@ class Wizard:
             sys.stderr.write("Failed creating dir\n")
             return None
 
-    def _create_xml(self, machine_interfaces, hostname,
-                    port, pool_dir, filename, mode):
+    def _create_xml(self, machine_interfaces=None, hostname=None,
+                    pool_dir=None, filename=None, mode=None,
+                    port=None, libvirt_domain=None):
         """ Creates slave machine XML file
         @param machine_interfaces Dictionary with machine's interfaces
         @param hostname Hostname of the machine
-        @param port Port on which LNST listens on the machine
         @param pool_dir Path to directory where XML file will be created
         @param filename Name of the XML file
         @param mode Mode in which wizard was started
+        @param libvirt_domain Libvirt domain of virtual host
         """
 
         impl = getDOMImplementation()
@@ -227,49 +232,49 @@ class Wizard:
         param_el.setAttribute("name", "hostname")
         param_el.setAttribute("value", hostname)
         params_el.appendChild(param_el)
-        interfaces_el = doc.createElement("interfaces")
-        top_el.appendChild(interfaces_el)
-
-        interfaces_added = 0
-        for iface in machine_interfaces.itervalues():
-            if mode == "interactive":
-                answer = raw_input("Do you want to add interface '%s' (%s)
"
-                                   "to the recipe? [Y/n]: " %
(iface["name"],
-                                                              
iface["hwaddr"]))
-            if mode == "noninteractive" or answer.lower() == "y"\
-               or answer == "":
-                interfaces_added += 1
-                eth_el = doc.createElement("eth")
-                eth_el.setAttribute("id", iface["name"])
-                eth_el.setAttribute("label", "default_network")
-                interfaces_el.appendChild(eth_el)
-                params_el = doc.createElement("params")
-                eth_el.appendChild(params_el)
-                param_el = doc.createElement("param")
-                param_el.setAttribute("name", "hwaddr")
-                param_el.setAttribute("value", iface["hwaddr"])
-                params_el.appendChild(param_el)
-                param_el = doc.createElement("param")
-                param_el.setAttribute("name", "driver")
-                param_el.setAttribute("value", iface["driver"])
-                params_el.appendChild(param_el)
-        if interfaces_added == 0:
-            sys.stderr.write("You didn't add any interface, no file "
-                             "'%s' will be created\n" % filename)
-            return
-
-
-        try:
-            f = open(pool_dir + "/" + filename, "w")
-            f.write(doc.toprettyxml())
-            f.close()
-        except:
-            msg = "File '%s/%s' could not be opened or data
written\n"\
-                  % (pool_dir, filename)
-            sys.stderr.write(msg)
-            return
+        if port is not None:
+            param_el = doc.createElement("param")
+            param_el.setAttribute("name", "rpc_port")
+            param_el.setAttribute("value", str(port))
+            params_el.appendChild(param_el)
+        if mode == "virtual":
+            param_el = doc.createElement("param")
+            param_el.setAttribute("name", "libvirt_domain")
+            param_el.setAttribute("value", libvirt_domain)
+            params_el.appendChild(param_el)
+        else:
+            interfaces_el = doc.createElement("interfaces")
+            top_el.appendChild(interfaces_el)
+
+            interfaces_added = 0
+            for iface in machine_interfaces.itervalues():
+                if mode == "interactive":
+                    msg = "Do you want to add interface '%s' (%s) to the
"\
+                          "recipe? [Y/n]: " % (iface["name"],
iface["hwaddr"])
+                    answer = raw_input(msg)
+                if mode == "noninteractive" or answer.lower() ==
"y"\
+                   or answer == "":
+                    interfaces_added += 1
+                    eth_el = doc.createElement("eth")
+                    eth_el.setAttribute("id", iface["name"])
+                    eth_el.setAttribute("label", "default_network")
+                    interfaces_el.appendChild(eth_el)
+                    params_el = doc.createElement("params")
+                    eth_el.appendChild(params_el)
+                    param_el = doc.createElement("param")
+                    param_el.setAttribute("name", "hwaddr")
+                    param_el.setAttribute("value", iface["hwaddr"])
+                    params_el.appendChild(param_el)
+            if interfaces_added == 0:
+                sys.stderr.write("You didn't add any interface, no file "
+                                 "'%s' will be created\n" % filename)
+                return
 
-        print("File '%s' successfuly created" % filename)
+        if self._write_to_file(pool_dir, filename, doc):
+            print("File '%s/%s' successfuly created." % (pool_dir,
filename))
+        else:
+            sys.stderr.write("File '%s/%s' could not be opened "
+                             "or data written.\n" % (pool_dir, filename))
 
     def _get_connection(self, hostname, port):
         """ Connects to machine
@@ -362,3 +367,18 @@ class Wizard:
                     return port
                 except:
                     sys.stderr.write("Invalid port entered\n")
+
+    def _write_to_file(self, pool_dir, filename, doc):
+        """ Writes contents of XML to a file
+        @param pool_dir Path to directory where the file will be created
+        @param filename Name of the created file
+        @param doc Contents of XML file
+        @return True if file was successfuly written, False otherwise
+        """
+        try:
+            f = open(pool_dir + "/" + filename, "w")
+            f.write(doc.toprettyxml())
+            f.close()
+            return True
+        except:
+            return False
-- 
2.4.3

[PATCH v3 5/9] pool-wizard: Add import libvirt and _query_libvirt_domain method

[Jiri Prochazka]

This patch adds import of libvirt library
This patch adds new method _query_libvirt_domain:
  - This method needs imported libvirt library to work
  - Method takes opened libvirt connection to hypervisor as an argument
  - It checks if guest with entered name exists and tries to recover it's IP
    from DHCP lease in "default" network. If it fails, it queries
    user for new libvirt domain, otherwise it returns the string with
    the domain

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 lnst/Controller/Wizard.py | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/lnst/Controller/Wizard.py b/lnst/Controller/Wizard.py
index f6a6e42..5e21efa 100644
--- a/lnst/Controller/Wizard.py
+++ b/lnst/Controller/Wizard.py
@@ -10,6 +10,11 @@ __author__ = """
 jprochaz(a)redhat.com (Jiri Prochazka)
 """
 
+try:
+    import libvirt
+    LIBVIRT_SUPPORT = True
+except ImportError:
+    LIBVIRT_SUPPORT = False
 import socket
 import sys
 import time
@@ -382,3 +387,36 @@ class Wizard:
             return True
         except:
             return False
+
+    def _query_libvirt_domain(self, conn):
+        """ Queries user for libvirt_domain
+        @note Virtual host must be running under libvirt
+              and has to have an IP from "default" network
+              DHCP server
+        @param conn libvirt connection to hypervisor
+        @return Tuple of string representing libvirt_domain of the hosthost and
+                string representing hostname of the host
+        """
+        while True:
+            libvirt_domain = raw_input("Enter libvirt domain "
+                                       "of virtual host: ")
+            if libvirt_domain == "":
+                sys.stderr.write("No domain entered\n")
+                continue
+            try:
+                conn.lookupByName(libvirt_domain)
+            except:
+                continue
+
+            # when libvirtd is old
+            try:
+                for lease in conn.networkLookupByName("default").DHCPLeases():
+                    if lease["hostname"] == libvirt_domain:
+                        return (libvirt_domain, lease["ipaddr"])
+            except:
+                sys.stderr.write("Failed getting DHCPLeases from hypervisor")
+
+            sys.stderr.write("Couldn't find any IP associated with "
+                             "libvirt_domain '%s'\n" % libvirt_domain)
+            hostname = self._query_hostname()
+            return libvirt_domain, hostname
-- 
2.4.3

[PATCH v3 6/9] pool-wizard: Add virtual method

[Jiri Prochazka]

This patch adds method for adding virtual machines via pool wizard:
- Method queries user for pool_dir and libvirt_domain, if valid ones are entered and
  successfuly checked, it creates XML file containing hostname and libvirt_domain
  needed for valid slave virtual machine config

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 lnst/Controller/Wizard.py | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/lnst/Controller/Wizard.py b/lnst/Controller/Wizard.py
index 5e21efa..5ec48da 100644
--- a/lnst/Controller/Wizard.py
+++ b/lnst/Controller/Wizard.py
@@ -19,7 +19,7 @@ import socket
 import sys
 import time
 import os
-from lnst.Common.Utils import mkdir_p
+from lnst.Common.Utils import mkdir_p, check_process_running
 from lnst.Common.Config import DefaultRPCPort
 from lnst.Common.ConnectionHandler import send_data, recv_data
 from xml.dom.minidom import getDOMImplementation
@@ -143,6 +143,50 @@ class Wizard:
                                  filename=filename, port=port,
                                  mode="noninteractive")
 
+    def virtual(self, pool_dir=None):
+        """ Starts Wizard in a virtual mode
+        @param pool_dir Path to pool directory (optional)
+        """
+
+        print("WARNING: For LNST Pool Wizard to work with virtual guests, "
+              "several conditions have to be met: \n"
+              "\t1) Guests must be running under libvirt and QEMU\n"
+              "\t2) Guests must be in \"default\" network and have an IP
"
+              "address from DHCP in that network")
+
+        if not LIBVIRT_SUPPORT:
+            sys.stderr.write("Missing package libvirt-python, "
+                             "aborting wizard\n")
+            return
+
+        if not check_process_running("libvirtd"):
+            sys.stderr.write("libvirtd is not running, aborting wizard\n")
+            return
+
+        pool_dir = self._check_and_query_pool_dir(pool_dir)
+
+        conn = libvirt.openReadOnly("qemu:///system")
+
+        if conn is None:
+            sys.stderr.write("Failed to open connection to hypervisor, "
+                             "aborting wizard\n")
+            return
+
+        while True:
+            libvirt_domain, hostname = self._query_libvirt_domain(conn)
+            if hostname is None or libvirt_domain is None:
+                return
+            filename = self._query_filename(libvirt_domain)
+
+            self._create_xml(hostname=hostname, pool_dir=pool_dir,
+                             filename=filename, mode="virtual",
+                             libvirt_domain=libvirt_domain)
+
+            if self._query_continuation():
+                continue
+            else:
+                break
+
     def _check_hostname(self, hostname):
         """ Checks hostnames translatibility
         @param hostname Hostname which is checked whether it's valid
-- 
2.4.3

[PATCH v3 7/9] pool-wizard: Add support for virtual mode in LNST Pool Wizard

[Jiri Prochazka]

Users now can use the pool wizard for adding virtual machines running
under libvirt and QEMU.

To use wizard in the VM mode, use option -v or --virtual. The option is
compatible with -p and --pool-dir option

This patch also makes the code more pep8 and pylint compliant

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 lnst-pool-wizard | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lnst-pool-wizard b/lnst-pool-wizard
index 9da8911..a2f1275 100755
--- a/lnst-pool-wizard
+++ b/lnst-pool-wizard
@@ -29,6 +29,7 @@ def help(retval=0):
           " -i, --interactive          start wizard in interactive mode (this
"\
           "is default mode)\n"\
           " -n, --noninteractive       start wizard in noninteractive mode\n"\
+          " -v, --virtual              start wizard in mode for VMs\n"\
           "Examples:\n"\
           " lnst-pool-wizard --interactive\n"\
           " lnst-pool-wizard --noninteractive 192.168.122.2\n"\
@@ -41,14 +42,14 @@ def main():
     try:
         opts, args = getopt.getopt(
             sys.argv[1:],
-            "hinp:",
-            ["help", "interactive", "noninteractive",
"pool_dir="]
+            "hinvp:",
+            ["help", "interactive", "noninteractive",
"virtual", "pool_dir="]
         )
     except getopt.GetoptError as err:
         sys.stderr.write(str(err))
         help(RETVAL_ERR)
 
-    pool_dir= None
+    pool_dir = None
     mode = "interactive"
 
     for opt, arg  in opts:
@@ -63,6 +64,8 @@ def main():
             else:
                 hostlist = args
             mode = "noninteractive"
+        elif opt in ("-v", "--virtual"):
+            mode = "virtual"
         elif opt in ("-p", "--pool_dir"):
             if not arg:
                 sys.stderr.write("No pool directory specified\n")
@@ -71,12 +74,14 @@ def main():
         else:
             help(RETVAL_ERR)
 
-    w = Wizard()
+    wizard = Wizard()
 
     if mode == "noninteractive":
-        w.noninteractive(hostlist, pool_dir)
+        wizard.noninteractive(hostlist, pool_dir)
+    elif mode == "virtual":
+        wizard.virtual(pool_dir)
     else:
-        w.interactive(pool_dir)
+        wizard.interactive(pool_dir)
 
     sys.exit(RETVAL_PASS)
 
-- 
2.4.3

[PATCH v3 8/9] pool-wizard: Remove redundant import, remove one redundant new line

[Jiri Prochazka]

Module 'time' is not used anywhere in code, so we can safely remove it

Also remove one empty line in noninteractive method

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 lnst/Controller/Wizard.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lnst/Controller/Wizard.py b/lnst/Controller/Wizard.py
index 5ec48da..a25561e 100644
--- a/lnst/Controller/Wizard.py
+++ b/lnst/Controller/Wizard.py
@@ -17,7 +17,6 @@ except ImportError:
     LIBVIRT_SUPPORT = False
 import socket
 import sys
-import time
 import os
 from lnst.Common.Utils import mkdir_p, check_process_running
 from lnst.Common.Config import DefaultRPCPort
@@ -94,7 +93,6 @@ class Wizard:
             sys.stderr.write("Pool wizard aborted\n")
             return
 
-
         for host in hostlist:
             print("Processing host '%s'" % host)
             # Check if port was entered along with hostname
-- 
2.4.3

[PATCH v3 9/9] pool-wizard: Move _query_port and _write_to_xml methods

[Jiri Prochazka]

So the methods are sorted alphabetically

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 lnst/Controller/Wizard.py | 60 +++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/lnst/Controller/Wizard.py b/lnst/Controller/Wizard.py
index a25561e..74f2691 100644
--- a/lnst/Controller/Wizard.py
+++ b/lnst/Controller/Wizard.py
@@ -400,36 +400,6 @@ class Wizard:
                 sys.stderr.write("Hostname '%s' is not translatable into a
"
                                  "valid IP address\n" % hostname)
 
-    def _query_port(self):
-        """ Queries user for port
-        @return Integer representing port
-        """
-        while True:
-            port = raw_input("Enter port (default: %d): " % DefaultRPCPort)
-            if port == "":
-                return DefaultRPCPort
-            else:
-                try:
-                    port = int(port)
-                    return port
-                except:
-                    sys.stderr.write("Invalid port entered\n")
-
-    def _write_to_file(self, pool_dir, filename, doc):
-        """ Writes contents of XML to a file
-        @param pool_dir Path to directory where the file will be created
-        @param filename Name of the created file
-        @param doc Contents of XML file
-        @return True if file was successfuly written, False otherwise
-        """
-        try:
-            f = open(pool_dir + "/" + filename, "w")
-            f.write(doc.toprettyxml())
-            f.close()
-            return True
-        except:
-            return False
-
     def _query_libvirt_domain(self, conn):
         """ Queries user for libvirt_domain
         @note Virtual host must be running under libvirt
@@ -462,3 +432,33 @@ class Wizard:
                              "libvirt_domain '%s'\n" % libvirt_domain)
             hostname = self._query_hostname()
             return libvirt_domain, hostname
+
+    def _query_port(self):
+        """ Queries user for port
+        @return Integer representing port
+        """
+        while True:
+            port = raw_input("Enter port (default: %d): " % DefaultRPCPort)
+            if port == "":
+                return DefaultRPCPort
+            else:
+                try:
+                    port = int(port)
+                    return port
+                except:
+                    sys.stderr.write("Invalid port entered\n")
+
+    def _write_to_file(self, pool_dir, filename, doc):
+        """ Writes contents of XML to a file
+        @param pool_dir Path to directory where the file will be created
+        @param filename Name of the created file
+        @param doc Contents of XML file
+        @return True if file was successfuly written, False otherwise
+        """
+        try:
+            f = open(pool_dir + "/" + filename, "w")
+            f.write(doc.toprettyxml())
+            f.close()
+            return True
+        except:
+            return False
-- 
2.4.3

[Ondrej Lichtner]

On Thu, Sep 03, 2015 at 04:04:09PM +0200, Jiri Prochazka wrote:
>  New line was missing in print of an error message of _create_dir
> method
>  
>  Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt; 
Ack to set
Acked-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;

[Ondrej Lichtner]

On Thu, Sep 10, 2015 at 11:23:22AM +0200, Ondrej Lichtner wrote:
>  On Thu, Sep 03, 2015 at 04:04:09PM +0200, Jiri Prochazka wrote:
>  > New line was missing in print of an error message of _create_dir method
>  > 
>  > Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
>  
>  Ack to set
>  Acked-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; 
pushed