From 9389b782a9860fc0d28cc13ac4b041fd3fd79e87 Mon Sep 17 00:00:00 2001
From: Carl Baldwin <carl.baldwin@hp.com>
Date: Thu, 13 Jun 2013 22:11:34 -0600
Subject: [PATCH] Make --version option print a more detailed client version.

The python quantum client was printing "quantum 2.0" regardless of
the version of the client.  This seems to be the version of the
API but people expect the version of the client to be printed.

I looked at the implementation of --version in nova and keystone.
The one in keystone worked and was fairly straight-forward
utilizing code from the pbr package.  I added this code to version.py
rather than __init__.py.

Change-Id: I53264b454eb16d5c294ad40ab6494387637950db
Fixes: Bug #1190652
---
 quantumclient/shell.py   |  3 ++-
 quantumclient/version.py | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 quantumclient/version.py

diff --git a/quantumclient/shell.py b/quantumclient/shell.py
index afcabb7a0..53b5c93e7 100644
--- a/quantumclient/shell.py
+++ b/quantumclient/shell.py
@@ -32,6 +32,7 @@ from quantumclient.common import clientmanager
 from quantumclient.common import exceptions as exc
 from quantumclient.common import utils
 from quantumclient.openstack.common import strutils
+from quantumclient.version import __version__
 
 
 VERSION = '2.0'
@@ -324,7 +325,7 @@ class QuantumShell(App):
         parser.add_argument(
             '--version',
             action='version',
-            version='%(prog)s {0}'.format(version), )
+            version=__version__, )
         parser.add_argument(
             '-v', '--verbose',
             action='count',
diff --git a/quantumclient/version.py b/quantumclient/version.py
new file mode 100644
index 000000000..937548452
--- /dev/null
+++ b/quantumclient/version.py
@@ -0,0 +1,22 @@
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+# All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+#
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# @author: Carl Baldwin, Hewlett-Packard
+
+import pbr.version
+
+
+__version__ = pbr.version.VersionInfo('python-quantumclient').version_string()