Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-10-08 22:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(oci): complete Monitor modify wrapper contract

Browse Source
This commit is contained in:
VAIO73
2026-10-06 18:22:42 +02:00
parent ebb25e5a70
commit f464b62190
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/scripts/tests/test_oci_monitor_modify_contract.py
+13 -1
View File
@@ -11,6 +11,9 @@ ROOT = Path(__file__).resolve().parents[3]
MENU = ROOT / 'oci/src/proxmenux_oci/management.py'
CLI = ROOT / 'oci/src/proxmenux_oci/cli.py'
MONITOR = ROOT / 'AppImage/components/virtual-machines.tsx'
WRAPPER = ROOT / 'scripts/oci/manage_instance.sh'
EXTRA_DEVICES = ROOT / 'oci/src/proxmenux_oci/extra_devices.py'
STACK_RECREATION = ROOT / 'oci/src/proxmenux_oci/stack_recreation.py'
def extracted_stack_manager(scope):
@@ -29,8 +32,17 @@ class MonitorModifyContractTests(TestCase):
self.assertIn('action: "update" | "modify" | "recreate" | "recover"', source)
self.assertIn('action: ociInstance.stack ? "modify" : "recreate"', source)
def test_cli_accepts_the_monitor_modify_action(self):
def test_cli_and_monitor_wrapper_accept_the_modify_action(self):
self.assertIn('choices=("update", "modify", "recreate")', CLI.read_text(encoding='utf-8'))
self.assertIn('${ACTION:-} != "modify"', WRAPPER.read_text(encoding='utf-8'))
def test_modify_device_filter_matches_the_device_prompt_contract(self):
caller = STACK_RECREATION.read_text(encoding='utf-8')
device_prompt = EXTRA_DEVICES.read_text(encoding='utf-8')
prompt = next(node for node in ast.parse(device_prompt).body
if isinstance(node, ast.FunctionDef) and node.name == 'ask_extra_devices')
self.assertIn('kinds', [argument.arg for argument in prompt.args.args])
self.assertIn("ask_extra_devices(ui, attached, True, kinds=", caller)
def test_modify_action_opens_the_stack_editor_without_running_lifecycle(self):
primary = {'stack': {'members': [{'vmid': 101}]}}
scripts/oci/manage_instance.sh
+4 -4
View File
@@ -1,6 +1,6 @@
#!/bin/bash
# ==========================================================
# ProxMenux - Update, recreate or recover OCI instances
# ProxMenux - Update, modify, recreate or recover OCI instances
# ==========================================================
# Author : MacRimi
# Copyright : (c) 2024 MacRimi
@@ -13,8 +13,8 @@
# OCI manager Apps -> Manage installed OCI applications for one
# container, without the list:
#
# VMID - the container (required for update and recreate)
# ACTION - "update", "recreate" or "recover" (required);
# VMID - the container (required for update, modify and recreate)
# ACTION - "update", "modify", "recreate" or "recover" (required);
# "recover" registers again the applications
# restored from a backup
# KEEP_BACKUP - storage where the backup taken before the
@@ -38,7 +38,7 @@ if [[ ! ${VMID:-} =~ ^[0-9]{1,9}$ ]]; then
msg_error "$(translate "Invalid VMID")"
exit 1
fi
if [[ ${ACTION:-} != "update" && ${ACTION:-} != "recreate" ]]; then
if [[ ${ACTION:-} != "update" && ${ACTION:-} != "modify" && ${ACTION:-} != "recreate" ]]; then
msg_error "$(translate "Invalid action")"
exit 1
fi