Merge lp:~ken-pepple/nova/add-version-to-nova-manage into lp:~hudson-openstack/nova/trunk

[Ken Pepple]

added nova version to usage output of bin/nova-manage for easy identification of installed codebase

[Devin Carlen (devcamcar)]

This is good but can you add the same output for "nova-manage version"?

[Ken Pepple (ken-pepple)]

soooo ... because of how the nova-manage logic works ($ nova-manage command subcommand), we need to actually have `$ nova-manage version show` ... which is ugly :)

i've added it into the changeset with an eye of expanding it to identify/fix the "i've upgraded my nova-api but not my nova-compute/nova-network/nova-volume" db version mismatch later.

the command is now:

   $ bin/nova-manage version list
   2011.3-dev (2011.3-LOCALBRANCH:LOCALREVISION)

but i've also left it in plain nova-manage:

    $ bin/nova-manage

    OpenStack Nova version: 2011.3-dev (2011.3-LOCALBRANCH:LOCALREVISION)

    bin/nova-manage category action [<args>]
    Available categories:
 user
 account
 project
 role
 shell
 vpn
 fixed
 floating
 network
 vm
 service
 db
 volume
 instance_type
 image
 flavor
 version

[justinsb (justin-fathomdb)]

Looks useful, but can you fix the comment so it doesn't talk about the database please - I thought this was showing the db migration version at first...

I can see that we'll want to show a bunch of versions in future, so I like the fact that this is a top level command (DB, API, extensions, etc)

review: Needs Fixing

[Ken Pepple (ken-pepple)]

jsb: you caught me cut-n-pasting :( fixed.

[justinsb (justin-fathomdb)]

Thanks for fixing!

review: Approve

[Todd Willey (xtoddx)]

review: Approve

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-04-22 07:14:11 +0000
+++ bin/nova-manage	2011-04-28 19:51:19 +0000
@@ -82,6 +82,7 @@
 from nova import quota
 from nova import rpc
 from nova import utils
+from nova import version
 from nova.api.ec2 import ec2utils
 from nova.auth import manager
 from nova.cloudpipe import pipelib
@@ -758,6 +759,17 @@
         print migration.db_version()
 
 
+class VersionCommands(object):
+    """Class for exposing the codebase version."""
+
+    def __init__(self):
+        pass
+
+    def list(self):
+        print _("%s (%s)") %\
+                (version.version_string(), version.version_string_with_vcs())
+
+
 class VolumeCommands(object):
     """Methods for dealing with a cloud in an odd state"""
 
@@ -1049,7 +1061,8 @@
     ('volume', VolumeCommands),
     ('instance_type', InstanceTypeCommands),
     ('image', ImageCommands),
-    ('flavor', InstanceTypeCommands)]
+    ('flavor', InstanceTypeCommands),
+    ('version', VersionCommands)]
 
 
 def lazy_match(name, key_value_tuples):
@@ -1091,6 +1104,8 @@
 
     script_name = argv.pop(0)
     if len(argv) < 1:
+        print _("\nOpenStack Nova version: %s (%s)\n") %\
+                (version.version_string(), version.version_string_with_vcs())
         print script_name + " category action [<args>]"
         print _("Available categories:")
         for k, _v in CATEGORIES: