Added vms list

MANIFEST.in

@@ -1,5 +1,3 @@
 include *.txt
 include *.md
-include doc
-recursive-include docs *.txt
-recursive-include docs *.md
+recursive-include doc *.1

Makefile

@@ -1,8 +1,9 @@
-LAST_VER=0.1.24
-NEXT_VER=0.1.25
+LAST_VER=0.1.26
+NEXT_VER=0.1.27
 .phony: package clean
 
 package:
+	-rm doc/*~
 	python setup.py sdist
 
 clean:

bin/fifo

@@ -71,7 +71,7 @@ parser.add_argument("--user", '-u', help="The user to log in with.")
 parser.add_argument("--password", '-P', help="The password to log in with.")
 parser.add_argument("--verbose", "-v", action='store_true', default=False, help="Turn on verbose mode")
 parser.add_argument("--curl", action='store_true', default=False, help="Turn on print curl synopsis")
-parser.add_argument('--version', '-V', action='version', version='%(prog)s 0.1.25')
+parser.add_argument('--version', '-V', action='version', version='%(prog)s 0.1.27')
 
 subparsers = parser.add_subparsers(help='sub commands')
 

doc/fifo-datasets.1

@@ -1,4 +1,4 @@
-.TH fifo-datasets 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-datasets 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-datasets \- datasets related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo-dtrace.1

@@ -1,4 +1,4 @@
-.TH fifo-dtrace 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-dtrace 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-dtrace \- Dtrace related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo-groupings.1

@@ -1,4 +1,4 @@
-.TH fifo-groupings 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-groupings 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-groupings \- Grouping related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo-hypervisors.1

@@ -1,4 +1,4 @@
-.TH fifo-hypervisors 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-hypervisors 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-hypervisors \- Hypervisor related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo-ipranges.1

@@ -1,4 +1,4 @@
-.TH fifo-ipranges 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-ipranges 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-ipranges \- IP Range related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo-networks.1

@@ -1,4 +1,4 @@
-.TH fifo-networks 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-networks 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-networks \- Network related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo-orgs.1

@@ -1,4 +1,4 @@
-.TH fifo-orgs 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-orgs 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-orgs \- Organisation related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo-packages.1

@@ -1,4 +1,4 @@
-.TH fifo-packages 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-packages 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-packages \- Package related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo-roles.1

@@ -1,4 +1,4 @@
-.TH fifo-roles 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-roles 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-roles \- Role related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo-users.1

@@ -1,4 +1,4 @@
-.TH fifo-users 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-users 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-users \- User related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo-vms.1

@@ -1,4 +1,4 @@
-.TH fifo-vms 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo-vms 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo-vms \- VM related commnads for the FiFo API
 .SH SYNOPSIS

doc/fifo.1

@@ -1,4 +1,4 @@
-.TH fifo 1  "Jan 1, 2014" "version 0.1.25" "USER COMMANDS"
+.TH fifo 1  "Jan 1, 2014" "version 0.1.27" "USER COMMANDS"
 .SH NAME
 fifo \- Project FiFo console API client
 .SH SYNOPSIS

fifo/api/vm.py

@@ -96,6 +96,10 @@ def vm_ip(e):
     {'title': 'state', 'len': 15, 'fmt': '%-15s', 'get': lambda e: d(e, ['state'])},
     'hypervisor':
     {'title': 'hypervisor', 'len': 20, 'fmt': '%-20s', 'get': lambda e: d(e, ['hypervisor'])},
+    'package':
+    {'title': 'package', 'len': 36, 'fmt': '%36s', 'get': lambda e: d(e, ['package'])},
+    'dataset':
+    {'title': 'dataset', 'len': 36, 'fmt': '%36s', 'get': lambda e: d(e, ['dataset'])},
 }
 
 snapshot_fmt = {
@@ -419,7 +423,7 @@ def make_parser(self, subparsers):
         parser_snapshots_list = subparsers_snapshots.add_parser('list', help='lists snapshots')
         parser_snapshots_list.add_argument('--fmt', action=ListAction,
                                            default=['uuid', 'timestamp', 'comment'],
-                                           help='Fields to show in the list, valid chances are: uuid, timestamp, comment')
+                                           help='Fields to show in the list, valid chances are: uuid, timestamp, comment, hypervisor, dataset and package')
         parser_snapshots_list.add_argument('-H', action='store_false',
                                            help='Supress the header.')
         parser_snapshots_list.add_argument('-p', action='store_true',

setup.py

@@ -31,7 +31,7 @@ def run(self):
 
 setup(
     name='PyFi',
-    version='0.1.25',
+    version='0.1.27',
     author='Heinz N. Gies',
     author_email='[email protected]',
     packages=['fifo', 'fifo.api'],