Commit b41b3516 authored by Iustin Pop's avatar Iustin Pop
Browse files

Add os api v20 and related fields to the OS object


Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 4463ae96
...@@ -30,7 +30,8 @@ PROTOCOL_VERSION = 40 ...@@ -30,7 +30,8 @@ PROTOCOL_VERSION = 40
RELEASE_VERSION = _autoconf.PACKAGE_VERSION RELEASE_VERSION = _autoconf.PACKAGE_VERSION
OS_API_V10 = 10 OS_API_V10 = 10
OS_API_V15 = 15 OS_API_V15 = 15
OS_API_VERSIONS = frozenset([OS_API_V10, OS_API_V15]) OS_API_V20 = 20
OS_API_VERSIONS = frozenset([OS_API_V10, OS_API_V15, OS_API_V20])
EXPORT_VERSION = 0 EXPORT_VERSION = 0
RAPI_VERSION = 2 RAPI_VERSION = 2
...@@ -448,11 +449,16 @@ OS_SCRIPT_CREATE = 'create' ...@@ -448,11 +449,16 @@ OS_SCRIPT_CREATE = 'create'
OS_SCRIPT_IMPORT = 'import' OS_SCRIPT_IMPORT = 'import'
OS_SCRIPT_EXPORT = 'export' OS_SCRIPT_EXPORT = 'export'
OS_SCRIPT_RENAME = 'rename' OS_SCRIPT_RENAME = 'rename'
OS_SCRIPT_VERIFY = 'verify'
OS_SCRIPTS = frozenset([OS_SCRIPT_CREATE, OS_SCRIPT_IMPORT, OS_SCRIPTS = frozenset([OS_SCRIPT_CREATE, OS_SCRIPT_IMPORT,
OS_SCRIPT_EXPORT, OS_SCRIPT_RENAME]) OS_SCRIPT_EXPORT, OS_SCRIPT_RENAME,
OS_SCRIPT_VERIFY])
OS_API_FILE = 'ganeti_api_version' OS_API_FILE = 'ganeti_api_version'
OS_VARIANTS_FILE = 'variants.list' OS_VARIANTS_FILE = 'variants.list'
OS_PARAMETERS_FILE = 'parameters.list'
OS_VALIDATE_PARAMETERS = 'parameters'
# ssh constants # ssh constants
SSH_CONFIG_DIR = _autoconf.SSH_CONFIG_DIR SSH_CONFIG_DIR = _autoconf.SSH_CONFIG_DIR
......
...@@ -815,7 +815,13 @@ class Instance(TaggableObject): ...@@ -815,7 +815,13 @@ class Instance(TaggableObject):
class OS(ConfigObject): class OS(ConfigObject):
"""Config object representing an operating system.""" """Config object representing an operating system.
@type supported_parameters: list
@ivar supported_parameters: a list of tuples, name and description,
containing the supported parameters by this OS
"""
__slots__ = [ __slots__ = [
"name", "name",
"path", "path",
...@@ -824,7 +830,9 @@ class OS(ConfigObject): ...@@ -824,7 +830,9 @@ class OS(ConfigObject):
"export_script", "export_script",
"import_script", "import_script",
"rename_script", "rename_script",
"verify_script",
"supported_variants", "supported_variants",
"supported_parameters",
] ]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment