Merge pull request dnaeon#1 from dnaeon/master

Pull in new changes

Author: sigkill

README.rst

@@ -1,6 +1,10 @@
 Python vSphere Client with a dialog(1) interface
 ================================================
 
+.. image:: https://badges.gitter.im/Join%20Chat.svg
+   :alt: Join the chat at https://gitter.im/dnaeon/pvc
+   :target: https://gitter.im/dnaeon/pvc?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
 PVC is an interactive text-mode VMware vSphere Client with a
 `dialog(1)`_ interface for GNU/Linux systems built on top of the
 `pyVmomi`_ VMware vSphere API Python bindings.

docs/conf.py

@@ -14,6 +14,8 @@
 
 import sys, os
 
+import pvc
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -49,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.0'
+version = pvc.__version__
 # The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = pvc.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/installation.rst

@@ -15,7 +15,7 @@ Requirements
 
 The following list provides information about the PVC dependencies.
 
-* `Python 3.2.x or later`_
+* `Python 2.7.x, 3.2.x or later`_
 * `humanize`_
 * `pythondialog`_
 * `pyVmomi`_
@@ -81,7 +81,7 @@ as well.
 
 .. _`pip`: https://pypi.python.org/pypi/pip
 .. _`Github`: https://github.com/dnaeon/pvc
-.. _`Python 3.2.x or later`: http://python.org/
+.. _`Python 2.7.x, 3.2.x or later`: http://python.org/
 .. _`humanize`: https://github.com/jmoiron/humanize
 .. _`pythondialog`: http://pythondialog.sourceforge.net/
 .. _`pyVmomi`: https://github.com/vmware/pyvmomi

setup.py

@@ -1,5 +1,8 @@
+from __future__ import print_function
+
 import re
 import ast
+import sys
 
 from setuptools import setup, find_packages
 
@@ -11,10 +14,18 @@
         f.read().decode('utf-8')).group(1))
     )
 
+if (2, 7) <= sys.version_info < (3, 0):
+    dialog_package = 'python2-pythondialog'
+elif sys.version_info >= (3, 0):
+    dialog_package = 'pythondialog'
+else:
+    print('Unsupported Python version')
+    sys.exit(1)
+
 setup(
     name='pvc',
     version=version,
-    description='Python vSphere Client',
+    description='Python vSphere Client with a dialog(1) interface',
     long_description=open('README.rst').read(),
     author='Marin Atanasov Nikolov',
     author_email='[email protected]',
@@ -27,8 +38,8 @@
         'src/pvc-tui',
     ],
     install_requires=[
+        '{} >= 3.2.1'.format(dialog_package),
         'humanize >= 0.5.1',
-        'pythondialog >= 3.2.1',
         'pyvmomi >= 5.5.0-2014.1.1',
         'requests >= 2.6.0',
         'vconnector >= 0.3.7',

src/pvc/__init__.py

@@ -1 +1 @@
-__version__ = '0.1.1'
+__version__ = '0.1.3'

src/pvc/core.py

@@ -27,6 +27,8 @@
 
 """
 
+import pyVmomi
+
 import requests
 requests.packages.urllib3.disable_warnings()
 
@@ -129,24 +131,42 @@ def login(self):
                 self.dialog.set_background_title(background_title)
                 return True
             except Exception as e:
+                if isinstance(e, pyVmomi.vim.MethodFault):
+                    msg = e.msg
+                else:
+                    msg = e
+
                 self.dialog.msgbox(
                     title='Login failed',
-                    text='Failed to login to {}\n\n{}\n'.format(self.agent.host, e.msg)
+                    text='Failed to login to {}\n\n{}\n'.format(self.agent.host, msg)
                 )
 
-    def run(self):
-        self.about()
-        if not self.login():
-            return
+    def disconnect(self):
+        """
+        Disconnect from the remote vSphere host
 
-        home = pvc.widget.home.HomeWidget(
-            agent=self.agent,
-            dialog=self.dialog
-        )
-        home.display()
+        """
+        if not self.agent:
+            return
 
         self.dialog.infobox(
             title='Disconnecting Connection',
             text='Disconnecting from {} ...'.format(self.agent.host)
         )
         self.agent.disconnect()
+
+    def run(self):
+        try:
+            self.about()
+            if not self.login():
+                return
+
+            home = pvc.widget.home.HomeWidget(
+                agent=self.agent,
+                dialog=self.dialog
+            )
+            home.display()
+        except KeyboardInterrupt:
+            pass
+        finally:
+            self.disconnect()

src/pvc/widget/common.py

@@ -48,6 +48,7 @@
     'choose_datacenter', 'choose_cluster', 'choose_datastore',
     'inventory_search_by_dns', 'inventory_search_by_ip',
     'inventory_search_by_uuid', 'datacenter_menu', 'remove',
+    'choose_network',
 ]
 
 
@@ -913,6 +914,67 @@ def choose_datastore(agent, dialog, obj):
     return [ds['obj'] for ds in properties if ds['name'] == tag].pop()
 
 
+def choose_network(agent, dialog, obj):
+    """
+    Prompts the user to choose a network
+
+    Args:
+        agent         (VConnector): A VConnector instance
+        dialog     (dialog.Dailog): A Dialog instance
+        obj    (vim.ManagedEntity): A Managed Entity
+
+    Returns:
+        A vim.Network managed entity if a network has been
+        chosen
+
+        Return None if no network has been selected or
+        there are no networks existing
+
+    """
+    title = '{} ({})'.format(obj.name, obj.__class__.__name__)
+
+    dialog.infobox(
+        title=title,
+        text='Retrieving information ...'
+    )
+
+    if not hasattr(obj, 'network'):
+        return
+
+    view = agent.get_list_view(obj.network)
+    properties = agent.collect_properties(
+        view_ref=view,
+        obj_type=pyVmomi.vim.Network,
+        path_set=['name', 'summary.accessible'],
+        include_mors=True
+    )
+    view.DestroyView()
+
+    if not properties:
+        return
+
+    items = [
+        pvc.widget.radiolist.RadioListItem(
+            tag=network['name'],
+            description='Accessible' if network['summary.accessible'] else 'Not Accessible',
+        ) for network in properties
+    ]
+
+    radiolist = pvc.widget.radiolist.RadioList(
+        items=items,
+        dialog=dialog,
+        title='Choose Network',
+        text='Choose a network from the list below'
+    )
+
+    code, tag = radiolist.display()
+
+    if code in (dialog.CANCEL, dialog.ESC) or not tag:
+        return
+
+    return [network['obj'] for network in properties if network['name'] == tag].pop()
+
+
 def inventory_search_by_dns(agent, dialog, vm_search):
     """
     Search inventory for managed objects by their DNS name

src/pvc/widget/datacenter.py

@@ -291,7 +291,7 @@ def create_cluster(self):
                 name=name,
                 spec=pyVmomi.vim.cluster.ConfigSpecEx()
             )
-        except Exception as e:
+        except pyVmomi.vim.MethodFault as e:
             self.dialog.msgbox(
                 title=self.title,
                 text=e.msg

src/pvc/widget/debug.py

@@ -28,6 +28,7 @@
 """
 
 import code
+import readline
 
 __all__ = ['DebugWidget']