Merge "Autoremove container added to zun run client"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
bfe14b8000
@ -1,318 +1,319 @@
|
||||
#
|
||||
# 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.
|
||||
|
||||
import functools
|
||||
import logging
|
||||
import os
|
||||
import pkgutil
|
||||
import re
|
||||
import traceback
|
||||
|
||||
from oslo_utils import strutils
|
||||
|
||||
from zunclient import exceptions
|
||||
from zunclient.i18n import _
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
if not LOG.handlers:
|
||||
LOG.addHandler(logging.StreamHandler())
|
||||
|
||||
|
||||
HEADER_NAME = "OpenStack-API-Version"
|
||||
SERVICE_TYPE = "container"
|
||||
|
||||
_SUBSTITUTIONS = {}
|
||||
|
||||
|
||||
_type_error_msg = _("'%(other)s' should be an instance of '%(cls)s'")
|
||||
|
||||
|
||||
class APIVersion(object):
|
||||
"""This class represents an API Version Request.
|
||||
|
||||
This class provides convenience methods for manipulation
|
||||
and comparison of version numbers that we need to do to
|
||||
implement microversions.
|
||||
"""
|
||||
|
||||
def __init__(self, version_str=None):
|
||||
"""Create an API version object.
|
||||
|
||||
:param version_str: String representation of APIVersionRequest.
|
||||
Correct format is 'X.Y', where 'X' and 'Y'
|
||||
are int values. None value should be used
|
||||
to create Null APIVersionRequest, which is
|
||||
equal to 0.0
|
||||
"""
|
||||
self.ver_major = 0
|
||||
self.ver_minor = 0
|
||||
|
||||
if version_str is not None:
|
||||
match = re.match(r"^([1-9]\d*)\.([1-9]\d*|0|latest)$", version_str)
|
||||
if match:
|
||||
self.ver_major = int(match.group(1))
|
||||
if match.group(2) == "latest":
|
||||
# NOTE(andreykurilin): Infinity allows to easily determine
|
||||
# latest version and doesn't require any additional checks
|
||||
# in comparison methods.
|
||||
self.ver_minor = float("inf")
|
||||
else:
|
||||
self.ver_minor = int(match.group(2))
|
||||
else:
|
||||
msg = _("Invalid format of client version '%s'. "
|
||||
"Expected format 'X.Y', where X is a major part and Y "
|
||||
"is a minor part of version.") % version_str
|
||||
raise exceptions.UnsupportedVersion(msg)
|
||||
|
||||
def __str__(self):
|
||||
"""Debug/Logging representation of object."""
|
||||
if self.is_latest():
|
||||
return "Latest API Version Major: %s" % self.ver_major
|
||||
return ("API Version Major: %s, Minor: %s"
|
||||
% (self.ver_major, self.ver_minor))
|
||||
|
||||
def __repr__(self):
|
||||
if self.is_null():
|
||||
return "<APIVersion: null>"
|
||||
else:
|
||||
return "<APIVersion: %s>" % self.get_string()
|
||||
|
||||
def is_null(self):
|
||||
return self.ver_major == 0 and self.ver_minor == 0
|
||||
|
||||
def is_latest(self):
|
||||
return self.ver_minor == float("inf")
|
||||
|
||||
def __lt__(self, other):
|
||||
if not isinstance(other, APIVersion):
|
||||
raise TypeError(_type_error_msg % {"other": other,
|
||||
"cls": self.__class__})
|
||||
|
||||
return ((self.ver_major, self.ver_minor) <
|
||||
(other.ver_major, other.ver_minor))
|
||||
|
||||
def __eq__(self, other):
|
||||
if not isinstance(other, APIVersion):
|
||||
raise TypeError(_type_error_msg % {"other": other,
|
||||
"cls": self.__class__})
|
||||
|
||||
return ((self.ver_major, self.ver_minor) ==
|
||||
(other.ver_major, other.ver_minor))
|
||||
|
||||
def __gt__(self, other):
|
||||
if not isinstance(other, APIVersion):
|
||||
raise TypeError(_type_error_msg % {"other": other,
|
||||
"cls": self.__class__})
|
||||
|
||||
return ((self.ver_major, self.ver_minor) >
|
||||
(other.ver_major, other.ver_minor))
|
||||
|
||||
def __le__(self, other):
|
||||
return self < other or self == other
|
||||
|
||||
def __ne__(self, other):
|
||||
return not self.__eq__(other)
|
||||
|
||||
def __ge__(self, other):
|
||||
return self > other or self == other
|
||||
|
||||
def matches(self, min_version, max_version):
|
||||
"""Matches the version object.
|
||||
|
||||
Returns whether the version object represents a version
|
||||
greater than or equal to the minimum version and less than
|
||||
or equal to the maximum version.
|
||||
|
||||
:param min_version: Minimum acceptable version.
|
||||
:param max_version: Maximum acceptable version.
|
||||
:returns: boolean
|
||||
|
||||
If min_version is null then there is no minimum limit.
|
||||
If max_version is null then there is no maximum limit.
|
||||
If self is null then raise ValueError
|
||||
"""
|
||||
|
||||
if self.is_null():
|
||||
raise ValueError(_("Null APIVersion doesn't support 'matches'."))
|
||||
if max_version.is_null() and min_version.is_null():
|
||||
return True
|
||||
elif max_version.is_null():
|
||||
return min_version <= self
|
||||
elif min_version.is_null():
|
||||
return self <= max_version
|
||||
else:
|
||||
return min_version <= self <= max_version
|
||||
|
||||
def get_string(self):
|
||||
"""Version string representation.
|
||||
|
||||
Converts object to string representation which if used to create
|
||||
an APIVersion object results in the same version.
|
||||
"""
|
||||
if self.is_null():
|
||||
raise ValueError(
|
||||
_("Null APIVersion cannot be converted to string."))
|
||||
elif self.is_latest():
|
||||
return "%s.%s" % (self.ver_major, "latest")
|
||||
return "%s.%s" % (self.ver_major, self.ver_minor)
|
||||
|
||||
|
||||
class VersionedMethod(object):
|
||||
|
||||
def __init__(self, name, start_version, end_version, func):
|
||||
"""Versioning information for a single method
|
||||
|
||||
:param name: Name of the method
|
||||
:param start_version: Minimum acceptable version
|
||||
:param end_version: Maximum acceptable_version
|
||||
:param func: Method to call
|
||||
|
||||
Minimum and maximums are inclusive
|
||||
"""
|
||||
self.name = name
|
||||
self.start_version = start_version
|
||||
self.end_version = end_version
|
||||
self.func = func
|
||||
|
||||
def __str__(self):
|
||||
return ("Version Method %s: min: %s, max: %s"
|
||||
% (self.name, self.start_version, self.end_version))
|
||||
|
||||
def __repr__(self):
|
||||
return "<VersionedMethod %s>" % self.name
|
||||
|
||||
|
||||
def get_available_major_versions():
|
||||
# NOTE(andreykurilin): available clients version should not be
|
||||
# hardcoded, so let's discover them.
|
||||
matcher = re.compile(r"v[0-9]*$")
|
||||
submodules = pkgutil.iter_modules([os.path.dirname(__file__)])
|
||||
available_versions = [name[1:] for loader, name, ispkg in submodules
|
||||
if matcher.search(name)]
|
||||
|
||||
return available_versions
|
||||
|
||||
|
||||
def check_major_version(api_version):
|
||||
"""Checks major part of ``APIVersion`` obj is supported.
|
||||
|
||||
:raises exceptions.UnsupportedVersion: if major part is not supported
|
||||
"""
|
||||
available_versions = get_available_major_versions()
|
||||
if (not api_version.is_null() and
|
||||
str(api_version.ver_major) not in available_versions):
|
||||
if len(available_versions) == 1:
|
||||
msg = _("Invalid client version '%(version)s'. "
|
||||
"Major part should be '%(major)s'") % {
|
||||
"version": api_version.get_string(),
|
||||
"major": available_versions[0]}
|
||||
else:
|
||||
msg = _("Invalid client version '%(version)s'. "
|
||||
"Major part must be one of: '%(major)s'") % {
|
||||
"version": api_version.get_string(),
|
||||
"major": ", ".join(available_versions)}
|
||||
raise exceptions.UnsupportedVersion(msg)
|
||||
|
||||
|
||||
def get_api_version(version_string):
|
||||
"""Returns checked APIVersion object"""
|
||||
version_string = str(version_string)
|
||||
if strutils.is_int_like(version_string):
|
||||
version_string = "%s.0" % version_string
|
||||
|
||||
api_version = APIVersion(version_string)
|
||||
check_major_version(api_version)
|
||||
return api_version
|
||||
|
||||
|
||||
def update_headers(headers, api_version):
|
||||
"""Set microversion headers if api_version is not null"""
|
||||
|
||||
if not api_version.is_null() and api_version.ver_minor != 0:
|
||||
version_string = api_version.get_string()
|
||||
headers[HEADER_NAME] = '%s %s' % (SERVICE_TYPE, version_string)
|
||||
|
||||
|
||||
def _add_substitution(versioned_method):
|
||||
_SUBSTITUTIONS.setdefault(versioned_method.name, [])
|
||||
_SUBSTITUTIONS[versioned_method.name].append(versioned_method)
|
||||
|
||||
|
||||
def _get_function_name(func):
|
||||
# NOTE(andreykurilin): Based on the facts:
|
||||
# - Python 2 does not have __qualname__ property as Python 3 has;
|
||||
# - we cannot use im_class here, since we need to obtain name of
|
||||
# function in `wraps` decorator during class initialization
|
||||
# ("im_class" property does not exist at that moment)
|
||||
# we need to write own logic to obtain the full function name which
|
||||
# include module name, owner name(optional) and just function name.
|
||||
filename, _lineno, _name, line = traceback.extract_stack()[-4]
|
||||
module, _file_extension = os.path.splitext(filename)
|
||||
module = module.replace("/", ".")
|
||||
if module.endswith(func.__module__):
|
||||
return "%s.[%s].%s" % (func.__module__, line, func.__name__)
|
||||
else:
|
||||
return "%s.%s" % (func.__module__, func.__name__)
|
||||
|
||||
|
||||
def get_substitutions(func_name, api_version=None):
|
||||
if hasattr(func_name, "__id__"):
|
||||
func_name = func_name.__id__
|
||||
|
||||
substitutions = _SUBSTITUTIONS.get(func_name, [])
|
||||
if api_version and not api_version.is_null():
|
||||
return [m for m in substitutions
|
||||
if api_version.matches(m.start_version, m.end_version)]
|
||||
return sorted(substitutions, key=lambda m: m.start_version)
|
||||
|
||||
|
||||
def wraps(start_version, end_version=None):
|
||||
start_version = APIVersion(start_version)
|
||||
if end_version:
|
||||
end_version = APIVersion(end_version)
|
||||
else:
|
||||
end_version = APIVersion("%s.latest" % start_version.ver_major)
|
||||
|
||||
def decor(func):
|
||||
func.versioned = True
|
||||
name = _get_function_name(func)
|
||||
|
||||
versioned_method = VersionedMethod(name, start_version,
|
||||
end_version, func)
|
||||
_add_substitution(versioned_method)
|
||||
|
||||
@functools.wraps(func)
|
||||
def substitution(obj, *args, **kwargs):
|
||||
methods = get_substitutions(name, obj.api_version)
|
||||
|
||||
if not methods:
|
||||
raise exceptions.VersionNotFoundForAPIMethod(
|
||||
obj.api_version.get_string(), name)
|
||||
return methods[-1].func(obj, *args, **kwargs)
|
||||
|
||||
# Let's share "arguments" with original method and substitution to
|
||||
# allow put cliutils.arg and wraps decorators in any order
|
||||
if not hasattr(func, 'arguments'):
|
||||
func.arguments = []
|
||||
substitution.arguments = func.arguments
|
||||
|
||||
# NOTE(andreykurilin): The way to obtain function's name in Python 2
|
||||
# bases on traceback(see _get_function_name for details). Since the
|
||||
# right versioned method method is used in several places, one object
|
||||
# can have different names. Let's generate name of function one time
|
||||
# and use __id__ property in all other places.
|
||||
substitution.__id__ = name
|
||||
|
||||
return substitution
|
||||
|
||||
return decor
|
||||
#
|
||||
# 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.
|
||||
|
||||
import functools
|
||||
import logging
|
||||
import os
|
||||
import pkgutil
|
||||
import re
|
||||
import traceback
|
||||
|
||||
from oslo_utils import strutils
|
||||
|
||||
from zunclient import exceptions
|
||||
from zunclient.i18n import _
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
if not LOG.handlers:
|
||||
LOG.addHandler(logging.StreamHandler())
|
||||
|
||||
|
||||
HEADER_NAME = "OpenStack-API-Version"
|
||||
SERVICE_TYPE = "container"
|
||||
DEFAULT_API_VERSION = '1.3'
|
||||
|
||||
_SUBSTITUTIONS = {}
|
||||
|
||||
|
||||
_type_error_msg = _("'%(other)s' should be an instance of '%(cls)s'")
|
||||
|
||||
|
||||
class APIVersion(object):
|
||||
"""This class represents an API Version Request.
|
||||
|
||||
This class provides convenience methods for manipulation
|
||||
and comparison of version numbers that we need to do to
|
||||
implement microversions.
|
||||
"""
|
||||
|
||||
def __init__(self, version_str=None):
|
||||
"""Create an API version object.
|
||||
|
||||
:param version_str: String representation of APIVersionRequest.
|
||||
Correct format is 'X.Y', where 'X' and 'Y'
|
||||
are int values. None value should be used
|
||||
to create Null APIVersionRequest, which is
|
||||
equal to 0.0
|
||||
"""
|
||||
self.ver_major = 0
|
||||
self.ver_minor = 0
|
||||
|
||||
if version_str is not None:
|
||||
match = re.match(r"^([1-9]\d*)\.([1-9]\d*|0|latest)$", version_str)
|
||||
if match:
|
||||
self.ver_major = int(match.group(1))
|
||||
if match.group(2) == "latest":
|
||||
# NOTE(andreykurilin): Infinity allows to easily determine
|
||||
# latest version and doesn't require any additional checks
|
||||
# in comparison methods.
|
||||
self.ver_minor = float("inf")
|
||||
else:
|
||||
self.ver_minor = int(match.group(2))
|
||||
else:
|
||||
msg = _("Invalid format of client version '%s'. "
|
||||
"Expected format 'X.Y', where X is a major part and Y "
|
||||
"is a minor part of version.") % version_str
|
||||
raise exceptions.UnsupportedVersion(msg)
|
||||
|
||||
def __str__(self):
|
||||
"""Debug/Logging representation of object."""
|
||||
if self.is_latest():
|
||||
return "Latest API Version Major: %s" % self.ver_major
|
||||
return ("API Version Major: %s, Minor: %s"
|
||||
% (self.ver_major, self.ver_minor))
|
||||
|
||||
def __repr__(self):
|
||||
if self.is_null():
|
||||
return "<APIVersion: null>"
|
||||
else:
|
||||
return "<APIVersion: %s>" % self.get_string()
|
||||
|
||||
def is_null(self):
|
||||
return self.ver_major == 0 and self.ver_minor == 0
|
||||
|
||||
def is_latest(self):
|
||||
return self.ver_minor == float("inf")
|
||||
|
||||
def __lt__(self, other):
|
||||
if not isinstance(other, APIVersion):
|
||||
raise TypeError(_type_error_msg % {"other": other,
|
||||
"cls": self.__class__})
|
||||
|
||||
return ((self.ver_major, self.ver_minor) <
|
||||
(other.ver_major, other.ver_minor))
|
||||
|
||||
def __eq__(self, other):
|
||||
if not isinstance(other, APIVersion):
|
||||
raise TypeError(_type_error_msg % {"other": other,
|
||||
"cls": self.__class__})
|
||||
|
||||
return ((self.ver_major, self.ver_minor) ==
|
||||
(other.ver_major, other.ver_minor))
|
||||
|
||||
def __gt__(self, other):
|
||||
if not isinstance(other, APIVersion):
|
||||
raise TypeError(_type_error_msg % {"other": other,
|
||||
"cls": self.__class__})
|
||||
|
||||
return ((self.ver_major, self.ver_minor) >
|
||||
(other.ver_major, other.ver_minor))
|
||||
|
||||
def __le__(self, other):
|
||||
return self < other or self == other
|
||||
|
||||
def __ne__(self, other):
|
||||
return not self.__eq__(other)
|
||||
|
||||
def __ge__(self, other):
|
||||
return self > other or self == other
|
||||
|
||||
def matches(self, min_version, max_version):
|
||||
"""Matches the version object.
|
||||
|
||||
Returns whether the version object represents a version
|
||||
greater than or equal to the minimum version and less than
|
||||
or equal to the maximum version.
|
||||
|
||||
:param min_version: Minimum acceptable version.
|
||||
:param max_version: Maximum acceptable version.
|
||||
:returns: boolean
|
||||
|
||||
If min_version is null then there is no minimum limit.
|
||||
If max_version is null then there is no maximum limit.
|
||||
If self is null then raise ValueError
|
||||
"""
|
||||
|
||||
if self.is_null():
|
||||
raise ValueError(_("Null APIVersion doesn't support 'matches'."))
|
||||
if max_version.is_null() and min_version.is_null():
|
||||
return True
|
||||
elif max_version.is_null():
|
||||
return min_version <= self
|
||||
elif min_version.is_null():
|
||||
return self <= max_version
|
||||
else:
|
||||
return min_version <= self <= max_version
|
||||
|
||||
def get_string(self):
|
||||
"""Version string representation.
|
||||
|
||||
Converts object to string representation which if used to create
|
||||
an APIVersion object results in the same version.
|
||||
"""
|
||||
if self.is_null():
|
||||
raise ValueError(
|
||||
_("Null APIVersion cannot be converted to string."))
|
||||
elif self.is_latest():
|
||||
return "%s.%s" % (self.ver_major, "latest")
|
||||
return "%s.%s" % (self.ver_major, self.ver_minor)
|
||||
|
||||
|
||||
class VersionedMethod(object):
|
||||
|
||||
def __init__(self, name, start_version, end_version, func):
|
||||
"""Versioning information for a single method
|
||||
|
||||
:param name: Name of the method
|
||||
:param start_version: Minimum acceptable version
|
||||
:param end_version: Maximum acceptable_version
|
||||
:param func: Method to call
|
||||
|
||||
Minimum and maximums are inclusive
|
||||
"""
|
||||
self.name = name
|
||||
self.start_version = start_version
|
||||
self.end_version = end_version
|
||||
self.func = func
|
||||
|
||||
def __str__(self):
|
||||
return ("Version Method %s: min: %s, max: %s"
|
||||
% (self.name, self.start_version, self.end_version))
|
||||
|
||||
def __repr__(self):
|
||||
return "<VersionedMethod %s>" % self.name
|
||||
|
||||
|
||||
def get_available_major_versions():
|
||||
# NOTE(andreykurilin): available clients version should not be
|
||||
# hardcoded, so let's discover them.
|
||||
matcher = re.compile(r"v[0-9]*$")
|
||||
submodules = pkgutil.iter_modules([os.path.dirname(__file__)])
|
||||
available_versions = [name[1:] for loader, name, ispkg in submodules
|
||||
if matcher.search(name)]
|
||||
|
||||
return available_versions
|
||||
|
||||
|
||||
def check_major_version(api_version):
|
||||
"""Checks major part of ``APIVersion`` obj is supported.
|
||||
|
||||
:raises exceptions.UnsupportedVersion: if major part is not supported
|
||||
"""
|
||||
available_versions = get_available_major_versions()
|
||||
if (not api_version.is_null() and
|
||||
str(api_version.ver_major) not in available_versions):
|
||||
if len(available_versions) == 1:
|
||||
msg = _("Invalid client version '%(version)s'. "
|
||||
"Major part should be '%(major)s'") % {
|
||||
"version": api_version.get_string(),
|
||||
"major": available_versions[0]}
|
||||
else:
|
||||
msg = _("Invalid client version '%(version)s'. "
|
||||
"Major part must be one of: '%(major)s'") % {
|
||||
"version": api_version.get_string(),
|
||||
"major": ", ".join(available_versions)}
|
||||
raise exceptions.UnsupportedVersion(msg)
|
||||
|
||||
|
||||
def get_api_version(version_string):
|
||||
"""Returns checked APIVersion object"""
|
||||
version_string = str(version_string)
|
||||
if strutils.is_int_like(version_string):
|
||||
version_string = "%s.0" % version_string
|
||||
|
||||
api_version = APIVersion(version_string)
|
||||
check_major_version(api_version)
|
||||
return api_version
|
||||
|
||||
|
||||
def update_headers(headers, api_version):
|
||||
"""Set microversion headers if api_version is not null"""
|
||||
|
||||
if not api_version.is_null() and api_version.ver_minor != 0:
|
||||
version_string = api_version.get_string()
|
||||
headers[HEADER_NAME] = '%s %s' % (SERVICE_TYPE, version_string)
|
||||
|
||||
|
||||
def _add_substitution(versioned_method):
|
||||
_SUBSTITUTIONS.setdefault(versioned_method.name, [])
|
||||
_SUBSTITUTIONS[versioned_method.name].append(versioned_method)
|
||||
|
||||
|
||||
def _get_function_name(func):
|
||||
# NOTE(andreykurilin): Based on the facts:
|
||||
# - Python 2 does not have __qualname__ property as Python 3 has;
|
||||
# - we cannot use im_class here, since we need to obtain name of
|
||||
# function in `wraps` decorator during class initialization
|
||||
# ("im_class" property does not exist at that moment)
|
||||
# we need to write own logic to obtain the full function name which
|
||||
# include module name, owner name(optional) and just function name.
|
||||
filename, _lineno, _name, line = traceback.extract_stack()[-4]
|
||||
module, _file_extension = os.path.splitext(filename)
|
||||
module = module.replace("/", ".")
|
||||
if module.endswith(func.__module__):
|
||||
return "%s.[%s].%s" % (func.__module__, line, func.__name__)
|
||||
else:
|
||||
return "%s.%s" % (func.__module__, func.__name__)
|
||||
|
||||
|
||||
def get_substitutions(func_name, api_version=None):
|
||||
if hasattr(func_name, "__id__"):
|
||||
func_name = func_name.__id__
|
||||
|
||||
substitutions = _SUBSTITUTIONS.get(func_name, [])
|
||||
if api_version and not api_version.is_null():
|
||||
return [m for m in substitutions
|
||||
if api_version.matches(m.start_version, m.end_version)]
|
||||
return sorted(substitutions, key=lambda m: m.start_version)
|
||||
|
||||
|
||||
def wraps(start_version, end_version=None):
|
||||
start_version = APIVersion(start_version)
|
||||
if end_version:
|
||||
end_version = APIVersion(end_version)
|
||||
else:
|
||||
end_version = APIVersion("%s.latest" % start_version.ver_major)
|
||||
|
||||
def decor(func):
|
||||
func.versioned = True
|
||||
name = _get_function_name(func)
|
||||
|
||||
versioned_method = VersionedMethod(name, start_version,
|
||||
end_version, func)
|
||||
_add_substitution(versioned_method)
|
||||
|
||||
@functools.wraps(func)
|
||||
def substitution(obj, *args, **kwargs):
|
||||
methods = get_substitutions(name, obj.api_version)
|
||||
|
||||
if not methods:
|
||||
raise exceptions.VersionNotFoundForAPIMethod(
|
||||
obj.api_version.get_string(), name)
|
||||
return methods[-1].func(obj, *args, **kwargs)
|
||||
|
||||
# Let's share "arguments" with original method and substitution to
|
||||
# allow put cliutils.arg and wraps decorators in any order
|
||||
if not hasattr(func, 'arguments'):
|
||||
func.arguments = []
|
||||
substitution.arguments = func.arguments
|
||||
|
||||
# NOTE(andreykurilin): The way to obtain function's name in Python 2
|
||||
# bases on traceback(see _get_function_name for details). Since the
|
||||
# right versioned method method is used in several places, one object
|
||||
# can have different names. Let's generate name of function one time
|
||||
# and use __id__ property in all other places.
|
||||
substitution.__id__ = name
|
||||
|
||||
return substitution
|
||||
|
||||
return decor
|
||||
|
||||
@ -17,13 +17,12 @@ from osc_lib import utils
|
||||
|
||||
from zunclient import api_versions
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
DEFAULT_CONTAINER_API_VERSION = "1.2"
|
||||
DEFAULT_CONTAINER_API_VERSION = api_versions.DEFAULT_API_VERSION
|
||||
API_VERSION_OPTION = "os_container_api_version"
|
||||
API_NAME = "container"
|
||||
LAST_KNOWN_API_VERSION = 2
|
||||
LAST_KNOWN_API_VERSION = 3
|
||||
API_VERSIONS = {
|
||||
'1.%d' % i: 'zunclient.v1.client.Client'
|
||||
for i in range(1, LAST_KNOWN_API_VERSION + 1)
|
||||
@ -40,12 +39,14 @@ def make_client(instance):
|
||||
LOG.debug("Instantiating zun client: {0}".format(
|
||||
zun_client))
|
||||
|
||||
# TODO(hongbin): Instead of hard-coding api-version to 'latest', it is
|
||||
# better to read micro-version from CLI (bug #1701939).
|
||||
api_version = api_versions.get_api_version(instance._api_version[API_NAME])
|
||||
client = zun_client(
|
||||
api_version=api_version,
|
||||
region_name=instance._region_name,
|
||||
session=instance.session,
|
||||
service_type='container',
|
||||
api_version=api_version,
|
||||
)
|
||||
return client
|
||||
|
||||
@ -70,6 +71,7 @@ def build_option_parser(parser):
|
||||
|
||||
class ReplaceLatestVersion(argparse.Action):
|
||||
"""Replaces `latest` keyword by last known version."""
|
||||
|
||||
def __call__(self, parser, namespace, values, option_string=None):
|
||||
latest = values == 'latest'
|
||||
if latest:
|
||||
|
||||
@ -138,6 +138,12 @@ class CreateContainer(command.ShowOne):
|
||||
' port: attach container to the neutron port with this UUID. '
|
||||
'v4-fixed-ip: IPv4 fixed address for container. '
|
||||
'v6-fixed-ip: IPv6 fixed address for container.')
|
||||
parser.add_argument(
|
||||
'--rm',
|
||||
dest='auto_remove',
|
||||
action='store_true',
|
||||
default=False,
|
||||
help='Automatically remove the container when it exits')
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
@ -152,6 +158,7 @@ class CreateContainer(command.ShowOne):
|
||||
opts['labels'] = zun_utils.format_args(parsed_args.label)
|
||||
opts['image_pull_policy'] = parsed_args.image_pull_policy
|
||||
opts['image_driver'] = parsed_args.image_driver
|
||||
opts['auto_remove'] = parsed_args.auto_remove
|
||||
if parsed_args.security_group:
|
||||
opts['security_groups'] = parsed_args.security_group
|
||||
if parsed_args.command:
|
||||
@ -661,6 +668,12 @@ class RunContainer(command.ShowOne):
|
||||
' port: attach container to the neutron port with this UUID. '
|
||||
'v4-fixed-ip: IPv4 fixed address for container. '
|
||||
'v6-fixed-ip: IPv6 fixed address for container.')
|
||||
parser.add_argument(
|
||||
'--rm',
|
||||
dest='auto_remove',
|
||||
action='store_true',
|
||||
default=False,
|
||||
help='Automatically remove the container when it exits')
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
@ -675,6 +688,7 @@ class RunContainer(command.ShowOne):
|
||||
opts['labels'] = zun_utils.format_args(parsed_args.label)
|
||||
opts['image_pull_policy'] = parsed_args.image_pull_policy
|
||||
opts['image_driver'] = parsed_args.image_driver
|
||||
opts['auto_remove'] = parsed_args.auto_remove
|
||||
if parsed_args.security_group:
|
||||
opts['security_groups'] = parsed_args.security_group
|
||||
if parsed_args.command:
|
||||
|
||||
@ -61,7 +61,7 @@ from zunclient.v1 import client as client_v1
|
||||
from zunclient.v1 import shell as shell_v1
|
||||
from zunclient import version
|
||||
|
||||
DEFAULT_API_VERSION = '1.2'
|
||||
DEFAULT_API_VERSION = api_versions.DEFAULT_API_VERSION
|
||||
DEFAULT_ENDPOINT_TYPE = 'publicURL'
|
||||
DEFAULT_SERVICE_TYPE = 'container'
|
||||
|
||||
|
||||
@ -249,7 +249,7 @@ class ShellTest(utils.TestCase):
|
||||
project_domain_id='', project_domain_name='',
|
||||
user_domain_id='', user_domain_name='', profile=None,
|
||||
zun_url=None, insecure=False,
|
||||
api_version=api_versions.APIVersion('1.2'))
|
||||
api_version=api_versions.APIVersion('1.3'))
|
||||
|
||||
def test_main_option_region(self):
|
||||
self.make_env()
|
||||
@ -277,7 +277,7 @@ class ShellTest(utils.TestCase):
|
||||
project_domain_id='', project_domain_name='',
|
||||
user_domain_id='', user_domain_name='', profile=None,
|
||||
zun_url=None, insecure=False,
|
||||
api_version=api_versions.APIVersion('1.2'))
|
||||
api_version=api_versions.APIVersion('1.3'))
|
||||
|
||||
@mock.patch('zunclient.v1.client.Client')
|
||||
def test_main_endpoint_internal(self, mock_client):
|
||||
@ -291,7 +291,7 @@ class ShellTest(utils.TestCase):
|
||||
project_domain_id='', project_domain_name='',
|
||||
user_domain_id='', user_domain_name='', profile=None,
|
||||
zun_url=None, insecure=False,
|
||||
api_version=api_versions.APIVersion('1.2'))
|
||||
api_version=api_versions.APIVersion('1.3'))
|
||||
|
||||
|
||||
class ShellTestKeystoneV3(ShellTest):
|
||||
@ -322,4 +322,4 @@ class ShellTestKeystoneV3(ShellTest):
|
||||
project_domain_id='', project_domain_name='Default',
|
||||
user_domain_id='', user_domain_name='Default',
|
||||
zun_url=None, insecure=False, profile=None,
|
||||
api_version=api_versions.APIVersion('1.2'))
|
||||
api_version=api_versions.APIVersion('1.3'))
|
||||
|
||||
@ -32,6 +32,7 @@ CONTAINER1 = {'id': '1234',
|
||||
'hints': {'hint1': 'bar'},
|
||||
'restart_policy': 'no',
|
||||
'security_groups': ['test'],
|
||||
'auto_remove': True,
|
||||
}
|
||||
|
||||
CONTAINER2 = {'id': '1235',
|
||||
@ -48,6 +49,7 @@ CONTAINER2 = {'id': '1235',
|
||||
'hints': {'hint2': 'bar'},
|
||||
'restart_policy': 'on-failure:5',
|
||||
'security_groups': ['test'],
|
||||
'auto_remove': False,
|
||||
}
|
||||
|
||||
CREATE_CONTAINER1 = copy.deepcopy(CONTAINER1)
|
||||
|
||||
@ -22,7 +22,7 @@ from zunclient import exceptions
|
||||
CREATION_ATTRIBUTES = ['name', 'image', 'command', 'cpu', 'memory',
|
||||
'environment', 'workdir', 'labels', 'image_pull_policy',
|
||||
'restart_policy', 'interactive', 'image_driver',
|
||||
'security_groups', 'hints', 'nets']
|
||||
'security_groups', 'hints', 'nets', 'auto_remove']
|
||||
|
||||
|
||||
class Container(base.Resource):
|
||||
|
||||
@ -49,6 +49,9 @@ def _show_container(container):
|
||||
@utils.arg('--workdir',
|
||||
metavar='<workdir>',
|
||||
help='The working directory for commands to run in')
|
||||
@utils.arg('--rm',
|
||||
action='store_true',
|
||||
help='Automatically remove the container when it exits')
|
||||
@utils.arg('--label',
|
||||
metavar='<KEY=VALUE>',
|
||||
action='append', default=[],
|
||||
@ -117,6 +120,7 @@ def do_create(cs, args):
|
||||
opts['memory'] = args.memory
|
||||
opts['cpu'] = args.cpu
|
||||
opts['environment'] = zun_utils.format_args(args.environment)
|
||||
opts['auto_remove'] = args.rm
|
||||
opts['workdir'] = args.workdir
|
||||
opts['labels'] = zun_utils.format_args(args.label)
|
||||
opts['image_pull_policy'] = args.image_pull_policy
|
||||
@ -425,6 +429,9 @@ def do_kill(cs, args):
|
||||
@utils.arg('--workdir',
|
||||
metavar='<workdir>',
|
||||
help='The working directory for commands to run in')
|
||||
@utils.arg('--rm',
|
||||
action='store_true',
|
||||
help='Automatically remove the container when it exits')
|
||||
@utils.arg('--label',
|
||||
metavar='<KEY=VALUE>',
|
||||
action='append', default=[],
|
||||
@ -494,6 +501,7 @@ def do_run(cs, args):
|
||||
opts['cpu'] = args.cpu
|
||||
opts['environment'] = zun_utils.format_args(args.environment)
|
||||
opts['workdir'] = args.workdir
|
||||
opts['auto_remove'] = args.rm
|
||||
opts['labels'] = zun_utils.format_args(args.label)
|
||||
opts['image_pull_policy'] = args.image_pull_policy
|
||||
opts['image_driver'] = args.image_driver
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user