diff options
| -rwxr-xr-x | bin/nova-manage | 4 | ||||
| -rw-r--r-- | nova/service.py | 6 | ||||
| -rw-r--r-- | nova/tests/test_versions.py | 12 | ||||
| -rw-r--r-- | nova/version.py | 11 | ||||
| -rw-r--r-- | nova/vnc/xvp_proxy.py | 2 |
5 files changed, 14 insertions, 21 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index c761ff6cc..2ff96f50d 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -1100,9 +1100,7 @@ def main(): sys.exit(2) if CONF.category.name == "version": - print (_("%(version)s (%(vcs)s)") % - {'version': version.version_string(), - 'vcs': version.version_string_with_vcs()}) + print version.version_string_with_package() sys.exit(0) if CONF.category.name == "bash-completion": diff --git a/nova/service.py b/nova/service.py index fb21c3e0c..4c93fefa8 100644 --- a/nova/service.py +++ b/nova/service.py @@ -388,9 +388,9 @@ class Service(object): self.servicegroup_api = servicegroup.API() def start(self): - vcs_string = version.version_string_with_vcs() - LOG.audit(_('Starting %(topic)s node (version %(vcs_string)s)'), - {'topic': self.topic, 'vcs_string': vcs_string}) + verstr = version.version_string_with_package() + LOG.audit(_('Starting %(topic)s node (version %(version)s)'), + {'topic': self.topic, 'version': verstr}) self.manager.init_host() self.model_disconnected = False ctxt = context.get_admin_context() diff --git a/nova/tests/test_versions.py b/nova/tests/test_versions.py index cec418aee..68e77ff9e 100644 --- a/nova/tests/test_versions.py +++ b/nova/tests/test_versions.py @@ -31,6 +31,7 @@ class VersionTestCase(test.TestCase): self.version.version_info = {'branch_nick': u'LOCALBRANCH', 'revision_id': 'LOCALREVISION', 'revno': 0} + self.version.NOVA_PACKAGE = "g9ec3421" def test_version_string_is_good(self): """Ensure version string works""" @@ -48,12 +49,7 @@ class VersionTestCase(test.TestCase): self.assertEqual(self.version.canonical_version_string(), self.version.version_string()) - def test_vcs_version_string_is_good(self): - """Ensure uninstalled code generates local """ - self.assertEqual("LOCALBRANCH:LOCALREVISION", - self.version.vcs_version_string()) - - def test_version_string_with_vcs_is_good(self): + def test_version_string_with_package_is_good(self): """Ensure uninstalled code get version string""" - self.assertEqual("2012.10-LOCALBRANCH:LOCALREVISION", - self.version.version_string_with_vcs()) + self.assertEqual("2012.10-g9ec3421", + self.version.version_string_with_package()) diff --git a/nova/version.py b/nova/version.py index eb05058f3..16b0d876a 100644 --- a/nova/version.py +++ b/nova/version.py @@ -45,9 +45,8 @@ def version_string(): return '%s-dev' % (canonical_version_string(),) -def vcs_version_string(): - return 'LOCALBRANCH:LOCALREVISION' - - -def version_string_with_vcs(): - return '%s-%s' % (canonical_version_string(), vcs_version_string()) +def version_string_with_package(): + if package_string() is None: + return canonical_version_string() + else: + return "%s-%s" % (canonical_version_string(), package_string()) diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index 59b80994b..9489b949a 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -174,7 +174,7 @@ class SafeHttpProtocol(eventlet.wsgi.HttpProtocol): def get_wsgi_server(): LOG.audit(_("Starting nova-xvpvncproxy node (version %s)"), - version.version_string_with_vcs()) + version.version_string_with_package()) return wsgi.Server("XCP VNC Proxy", XCPVNCProxy(), |