Repository navigation
Refactor provider options #503
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Cristi1324
wants to merge
3
commits into
cloudbase:main
Choose a base branch
from
Cristi1324:refactor-target-options
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,301 @@ | ||
| # Copyright 2026 Cloudbase Solutions Srl | ||
| # All Rights Reserved. | ||
|
|
||
| """Provider-agnostic destination options registered with oslo.config. | ||
|
|
||
| Core dest-options are a list of wizard rows. The worker merges the | ||
| provider list onto that catalog with jsonmerge arrayMergeById on name. | ||
| The provider overwrites matching fields. Core rows always stay. | ||
| Provider-written schema properties are kept. | ||
| Destination environment values take precedence over provider values. | ||
| Provider values take precedence over coriolis.conf. | ||
| The oslo options are in the common_target_option group. | ||
| """ | ||
|
|
||
| import copy | ||
|
|
||
| from jsonmerge import Merger | ||
| from oslo_config import cfg | ||
| from oslo_log import log as logging | ||
|
|
||
| from coriolis.osmorphing import windows | ||
|
|
||
| COMMON_TARGET_OPTION_GROUP = "common_target_option" | ||
|
|
||
| CORE_SCHEMA_PROPERTIES = { | ||
| "cloudbase_init_plugins": { | ||
| "type": "array", | ||
| "items": {"type": "string"}, | ||
| "title": "Cloudbase-Init Plugins", | ||
| "description": ( | ||
| "Cloudbase-Init plugin class names for Windows guests. " | ||
| "When set, this list is written into the guest. " | ||
| "When omitted, coriolis.conf is used, " | ||
| "then the provider plugin list, " | ||
| "then the built-in list in Coriolis Windows OS morphing." | ||
| ), | ||
| }, | ||
| "data_transfer_mechanism": { | ||
| "type": "string", | ||
| "title": "Data Transfer Mechanism", | ||
| "enum": ["SSH", "HTTPS"], | ||
| "description": ( | ||
| "What mechanism to use when sending disk data from the " | ||
| "Coriolis installation to the temporary VMs on the " | ||
| "destination to be written to their respective disk. " | ||
| "The HTTPS-based transfer mechanism (TCP/5566) is faster " | ||
| "but might not work if there are firewalls in the way. " | ||
| "The SSH-based transfer mechanism (TCP/22) is more costly " | ||
| "but will be allowed by most firewalls since SSH access " | ||
| "from the Coriolis installation to the temporary worker " | ||
| "VM is always required. Default is HTTPS." | ||
| ), | ||
| }, | ||
| "set_dhcp": { | ||
| "type": "boolean", | ||
| "title": "Set DHCP", | ||
| "description": ( | ||
| "Sets whether or not to configure the VM to use DHCP " | ||
| "during the OSMorphing stage. " | ||
| "When disabled, guest static IPs will be preserved " | ||
| "after the migration." | ||
| ), | ||
| }, | ||
| "retain_user_credentials": { | ||
| "type": "boolean", | ||
| "title": "Retain User Credentials", | ||
| "description": ( | ||
| "Prevents the destination cloud provisioning from resetting " | ||
| "the pre-existing credentials. " | ||
| "When disabled, the destination platform may also create " | ||
| "a provisioned cloud guest user." | ||
| ), | ||
| }, | ||
| } | ||
|
|
||
| CORE_DESTINATION_OPTIONS = { | ||
| "cloudbase_init_plugins": windows.CLOUDBASE_INIT_PLUGINS_DESTINATION_OPTION, | ||
| "data_transfer_mechanism": { | ||
| "name": "data_transfer_mechanism", | ||
| "values": ["SSH", "HTTPS"], | ||
| "config_default": "HTTPS", | ||
| }, | ||
| "set_dhcp": { | ||
| "name": "set_dhcp", | ||
| "values": [], | ||
| "config_default": True, | ||
| }, | ||
| "retain_user_credentials": { | ||
| "name": "retain_user_credentials", | ||
| "values": [], | ||
| "config_default": False, | ||
| }, | ||
| } | ||
|
|
||
| # option: name in the destination environment and in coriolis.conf. | ||
| # field: stored name. It can differ from option. | ||
| # target "parameters": write the field on osmorphing_parameters. | ||
| # target "info": write the field on osmorphing_info. | ||
| OSMORPHING_OVERRIDES = ( | ||
| { | ||
| "option": "cloudbase_init_plugins", | ||
| "field": "cloudbase_init_plugins", | ||
| "target": "parameters", | ||
| }, | ||
| { | ||
| "option": "set_dhcp", | ||
| "field": "nics_set_dhcp", | ||
| "target": "info", | ||
| }, | ||
| { | ||
| "option": "retain_user_credentials", | ||
| "field": "retain_user_credentials", | ||
| "target": "parameters", | ||
| }, | ||
| ) | ||
|
|
||
| _DEST_OPTIONS_MERGER = Merger( | ||
| { | ||
| "mergeStrategy": "arrayMergeById", | ||
| "mergeOptions": {"idRef": "/name"}, | ||
| "items": { | ||
| "type": "object", | ||
| "mergeStrategy": "objectMerge", | ||
| }, | ||
| } | ||
| ) | ||
|
|
||
| opts = [ | ||
| cfg.ListOpt( | ||
| "cloudbase_init_plugins", | ||
| default=None, | ||
| help=CORE_SCHEMA_PROPERTIES["cloudbase_init_plugins"]["description"], | ||
| ), | ||
| cfg.BoolOpt( | ||
| "set_dhcp", | ||
| default=CORE_DESTINATION_OPTIONS["set_dhcp"]["config_default"], | ||
| help=CORE_SCHEMA_PROPERTIES["set_dhcp"]["description"], | ||
| ), | ||
| cfg.BoolOpt( | ||
| "retain_user_credentials", | ||
| default=CORE_DESTINATION_OPTIONS["retain_user_credentials"]["config_default"], | ||
| help=CORE_SCHEMA_PROPERTIES["retain_user_credentials"]["description"], | ||
| ), | ||
| ] | ||
|
|
||
| CONF = cfg.CONF | ||
| CONF.register_opts(opts, COMMON_TARGET_OPTION_GROUP) | ||
|
|
||
| LOG = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| def merge_core_destination_options( | ||
| provider_options: list | tuple | None, | ||
| option_names: list | tuple | set | None = None, | ||
| ) -> list: | ||
| """Merge provider dest-options onto the core list. | ||
|
|
||
| Use jsonmerge arrayMergeById on name. Core is the base. The | ||
| provider list is the head. Matching rows merge field by field. | ||
| Provider-only rows are appended. Core rows always stay. | ||
| Treat ``None`` and ``{}`` as a request for all destination options. | ||
| Skip a core option when a non-empty name list does not include it. | ||
| """ | ||
| if isinstance(option_names, (list, tuple, set)): | ||
| requested = set(option_names) if option_names else None | ||
| else: | ||
| requested = None | ||
| core = [ | ||
| copy.deepcopy(row) | ||
| for name, row in CORE_DESTINATION_OPTIONS.items() | ||
| if requested is None or name in requested | ||
| ] | ||
| if not isinstance(provider_options, (list, tuple)): | ||
| provider_options = [] | ||
| provider_options = list(provider_options) | ||
| LOG.info( | ||
| "Destination options before merge: core=%s provider=%s", core, provider_options | ||
| ) | ||
| merged = _DEST_OPTIONS_MERGER.merge(core, provider_options) | ||
| LOG.info("Destination options after merge: %s", merged) | ||
| return merged | ||
|
|
||
|
|
||
| def _inject_core_schema_property( | ||
| object_schema: dict, name: str, schema_fragment: dict | ||
| ) -> None: | ||
| props = object_schema.get("properties") | ||
| if not isinstance(props, dict): | ||
| return | ||
| if name in props: | ||
| return | ||
| props[name] = copy.deepcopy(schema_fragment) | ||
|
|
||
|
|
||
| def inject_core_target_environment_schema(schema: dict | None) -> dict | None: | ||
| """Write core destination fields onto a provider schema. | ||
|
|
||
| Skip a property when the provider already declared it. | ||
| """ | ||
| if not isinstance(schema, dict): | ||
| return schema | ||
| schema = copy.deepcopy(schema) | ||
| for name, fragment in CORE_SCHEMA_PROPERTIES.items(): | ||
| _inject_core_schema_property(schema, name, fragment) | ||
| for key in ("oneOf", "anyOf"): | ||
| for alt in schema.get(key) or []: | ||
| if isinstance(alt, dict): | ||
| _inject_core_schema_property(alt, name, fragment) | ||
| return schema | ||
|
|
||
|
|
||
| def filter_core_option_names( | ||
| option_names: list | tuple | set | None, | ||
| ) -> list | tuple | set | None: | ||
| """Remove injected options so destination providers do not reject them.""" | ||
| if not isinstance(option_names, (list, tuple, set)): | ||
| return option_names | ||
| return [name for name in option_names if name not in CORE_DESTINATION_OPTIONS] | ||
|
|
||
|
|
||
| def _current_values(spec: dict, osmorphing_info: dict, params: dict) -> dict: | ||
| if spec["target"] == "parameters": | ||
| return params | ||
| return osmorphing_info | ||
|
|
||
|
|
||
| def _resolve_destination_option( | ||
| spec: dict, dest_env: dict, current: dict | ||
| ) -> bool | list | None: | ||
| """Return the stored value for one destination option. | ||
|
|
||
| Resolved in this order: | ||
|
|
||
| 1. The destination environment value when it is not None. | ||
| 2. The current stored value when the destination environment | ||
| omits the key. | ||
| 3. The common_target_option value in coriolis.conf. | ||
|
|
||
| False and [] are stored. None means the option stays unset. | ||
| """ | ||
| option = spec["option"] | ||
| field = spec["field"] | ||
| if option in dest_env and dest_env[option] is not None: | ||
| return dest_env[option] | ||
| if field in current and current[field] is not None: | ||
| return current[field] | ||
| group = getattr(CONF, COMMON_TARGET_OPTION_GROUP) | ||
| return getattr(group, option, None) | ||
|
|
||
|
|
||
| def apply_core_destination_overrides( | ||
| osmorphing_info: dict | None, | ||
| target_environment: dict | None, | ||
| ) -> dict: | ||
| """Copy destination environment options onto osmorphing info. | ||
|
|
||
| Each entry in ``OSMORPHING_OVERRIDES`` uses | ||
| ``_resolve_destination_option``. | ||
| """ | ||
| if not isinstance(osmorphing_info, dict): | ||
| osmorphing_info = osmorphing_info or {} | ||
| if isinstance(target_environment, dict): | ||
| dest_env = target_environment | ||
| else: | ||
| dest_env = {} | ||
|
|
||
| osmorphing_info = dict(osmorphing_info) | ||
| params = dict(osmorphing_info.get("osmorphing_parameters") or {}) | ||
| option_names = [spec["option"] for spec in OSMORPHING_OVERRIDES] | ||
| LOG.info( | ||
| "Destination options before apply: dest-env=%s params=%s info=%s", | ||
| {name: dest_env[name] for name in option_names if name in dest_env}, | ||
| {name: params[name] for name in option_names if name in params}, | ||
| { | ||
| spec["field"]: osmorphing_info[spec["field"]] | ||
| for spec in OSMORPHING_OVERRIDES | ||
| if spec["target"] == "info" and spec["field"] in osmorphing_info | ||
| }, | ||
| ) | ||
|
|
||
| for spec in OSMORPHING_OVERRIDES: | ||
| if spec["target"] != "parameters": | ||
| params.pop(spec["option"], None) | ||
| current = _current_values(spec, osmorphing_info, params) | ||
| value = _resolve_destination_option(spec, dest_env, current) | ||
| if value is None: | ||
| continue | ||
| current[spec["field"]] = value | ||
| LOG.info("Applying destination option '%s': %s", spec["field"], value) | ||
|
|
||
| osmorphing_info["osmorphing_parameters"] = params | ||
| LOG.info( | ||
| "Destination options after apply: params=%s info=%s", | ||
| {name: params[name] for name in option_names if name in params}, | ||
| { | ||
| spec["field"]: osmorphing_info[spec["field"]] | ||
| for spec in OSMORPHING_OVERRIDES | ||
| if spec["target"] == "info" and spec["field"] in osmorphing_info | ||
| }, | ||
| ) | ||
| return osmorphing_info | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why don't you use the
config_defaultsfromCORE_DESTINATION_OPTIONSas well?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we set a default for
cloudbase_init_plugins, it will be applied over the provider default because the provider default is not handled inapply_core_destination_overrides. Maybe we should passenabled_pluginsinosmorphing_parametersascloudbase_init_plugins, but that means that this will no longer be a drop in replacement.I can still set defaults from
CORE_DESTINATION_OPTIONSfor the other options.