diff options
| author | TerryHowe <terrylhowe@gmail.com> | 2015-04-13 16:21:50 -0600 |
|---|---|---|
| committer | TerryHowe <terrylhowe@gmail.com> | 2015-04-13 16:21:50 -0600 |
| commit | a0fe37e189948b74ee8c2f8ec529ca175efc8449 (patch) | |
| tree | eb1a258a517c4f085ab5ba5a55380698559bf5f9 | |
| parent | d5f2c50c0f2de6d741f86113fc5260bdb7895102 (diff) | |
| download | python-openstackclient-a0fe37e189948b74ee8c2f8ec529ca175efc8449.tar.gz | |
Add warning message if unknown version supplied
Print a warning message if an unknown api version is supplied.
An attempt will be made to run the command anyway.
Change-Id: Idec8e88fe9621f10ec4b7eecd90708fb3730f56f
| -rw-r--r-- | openstackclient/compute/client.py | 3 | ||||
| -rw-r--r-- | openstackclient/shell.py | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/openstackclient/compute/client.py b/openstackclient/compute/client.py index 7ca08a4f..bdba4dca 100644 --- a/openstackclient/compute/client.py +++ b/openstackclient/compute/client.py @@ -30,6 +30,9 @@ LOG = logging.getLogger(__name__) DEFAULT_COMPUTE_API_VERSION = '2' API_VERSION_OPTION = 'os_compute_api_version' API_NAME = 'compute' +API_VERSIONS = { + "2": "novaclient.client", +} def make_client(instance): diff --git a/openstackclient/shell.py b/openstackclient/shell.py index 3cfd7312..ebc80c2a 100644 --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -247,6 +247,11 @@ class OpenStackShell(app.App): if version_opt: api = mod.API_NAME self.api_version[api] = version_opt + if version_opt not in mod.API_VERSIONS: + self.log.warning( + "The %s version <%s> is not in supported versions <%s>" + % (api, version_opt, + ', '.join(mod.API_VERSIONS.keys()))) # Command groups deal only with major versions version = '.v' + version_opt.replace('.', '_').split('_')[0] cmd_group = 'openstack.' + api.replace('-', '_') + version |