From c9fd35a49675027eea430b72e1c1f756da093b21 Mon Sep 17 00:00:00 2001
From: qtang <qtang@vmware.com>
Date: Wed, 28 Sep 2016 16:49:59 +0800
Subject: [PATCH] Update default nova api version to 2.1
Ref:https://review.openstack.org/#/c/311653/
We should use 2.1 as the default nova version now
The API_MIN_VERSION of novaclient has already changed to 2.1
Change-Id: I9ff16cf052556e5d3756f81e02a8e76e8f315df5
Closes-bug: #1588171
---
openstackclient/compute/client.py | 3 ++-
openstackclient/tests/unit/fakes.py | 2 +-
releasenotes/notes/bug-1588171-61214d0ea482988c.yaml | 5 +++++
3 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 releasenotes/notes/bug-1588171-61214d0ea482988c.yaml
diff --git a/openstackclient/compute/client.py b/openstackclient/compute/client.py
index 4cc3be9855..c5b364b238 100644
--- a/openstackclient/compute/client.py
+++ b/openstackclient/compute/client.py
@@ -23,11 +23,12 @@ from openstackclient.i18n import _
LOG = logging.getLogger(__name__)
-DEFAULT_API_VERSION = '2'
+DEFAULT_API_VERSION = '2.1'
API_VERSION_OPTION = 'os_compute_api_version'
API_NAME = 'compute'
API_VERSIONS = {
"2": "novaclient.client",
+ "2.1": "novaclient.client",
}
# Save the microversion if in use
diff --git a/openstackclient/tests/unit/fakes.py b/openstackclient/tests/unit/fakes.py
index f259836627..f7cb567644 100644
--- a/openstackclient/tests/unit/fakes.py
+++ b/openstackclient/tests/unit/fakes.py
@@ -38,7 +38,7 @@ _s.add_endpoint(AUTH_URL + ':5000/v2.0')
_s = TEST_RESPONSE_DICT.add_service('network', name='neutron')
_s.add_endpoint(AUTH_URL + ':9696')
_s = TEST_RESPONSE_DICT.add_service('compute', name='nova')
-_s.add_endpoint(AUTH_URL + ':8774/v2')
+_s.add_endpoint(AUTH_URL + ':8774/v2.1')
_s = TEST_RESPONSE_DICT.add_service('image', name='glance')
_s.add_endpoint(AUTH_URL + ':9292')
_s = TEST_RESPONSE_DICT.add_service('object', name='swift')
diff --git a/releasenotes/notes/bug-1588171-61214d0ea482988c.yaml b/releasenotes/notes/bug-1588171-61214d0ea482988c.yaml
new file mode 100644
index 0000000000..29b9168cca
--- /dev/null
+++ b/releasenotes/notes/bug-1588171-61214d0ea482988c.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Update novaclient DEFAULT_API_VERSION to 2.1 from 2.0
+ [Bug `1588171 <https://bugs.launchpad.net/bugs/1588171>`_]
\ No newline at end of file