diff --git a/manilaclient/api_versions.py b/manilaclient/api_versions.py index f4b4bbdcb..9c944373f 100644 --- a/manilaclient/api_versions.py +++ b/manilaclient/api_versions.py @@ -18,6 +18,8 @@ import logging import re import warnings +from oslo_utils import strutils + import manilaclient from manilaclient.common._i18n import _ from manilaclient.common import cliutils @@ -231,6 +233,8 @@ def check_version_deprecated(api_version): def get_api_version(version_string): """Returns checked APIVersion object.""" version_string = str(version_string) + if strutils.is_int_like(version_string): + version_string = f"{version_string}.0" api_version = APIVersion(version_string) check_version_supported(api_version) diff --git a/manilaclient/osc/plugin.py b/manilaclient/osc/plugin.py index 65acb7618..63495ded5 100644 --- a/manilaclient/osc/plugin.py +++ b/manilaclient/osc/plugin.py @@ -121,7 +121,7 @@ def build_option_parser(parser): ), help='Shared File System API version, default=' + default_api_version - + 'version supported by both the client and the server). ' + + ' (version supported by both the client and the server) ' '(Env: OS_SHARE_API_VERSION)', ) parser.add_argument( diff --git a/manilaclient/tests/unit/test_api_versions.py b/manilaclient/tests/unit/test_api_versions.py index f71cfaa2b..2a1ce4bcb 100644 --- a/manilaclient/tests/unit/test_api_versions.py +++ b/manilaclient/tests/unit/test_api_versions.py @@ -144,11 +144,6 @@ class GetAPIVersionTestCase(utils.TestCase): "something_wrong", ) - def test_wrong_major_version(self): - self.assertRaises( - exceptions.UnsupportedVersion, api_versions.get_api_version, "1" - ) - @mock.patch("manilaclient.api_versions.APIVersion") def test_major_and_minor_parts_is_presented(self, mock_apiversion): version = "2.7"