Skip to content

slapos
slapos
Commit 03b02d63 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

software/kvm: Drop default image and replace it with boot-image-url-select 

boot-image-url-select is used instead of default image being downloaded by the
software release.

If nothing is selected, the default boot-image-url-select is used, but not if
other way to obatin boot image is enabled.
parent 0c1630f5
Pipeline #37471 canceled with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 367 additions and 397 deletions
    software/kvm/buildout.hash.cfg
    View file @ 03b02d63
    ...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
    [template] [template]
    filename = instance.cfg.in filename = instance.cfg.in
    md5sum = 07d0e2445a858a8cfe6821ac9f83ed3e md5sum = 9ae66fb63a3cdd8072582622aa1bb36c
    [template-kvm] [template-kvm]
    filename = instance-kvm.cfg.jinja2 filename = instance-kvm.cfg.jinja2
    md5sum = fd774f38347abde5dfd677e16762af2b md5sum = bd3a7229e4fdfa9372ee61b6054acf78
    [template-kvm-cluster] [template-kvm-cluster]
    filename = instance-kvm-cluster.cfg.jinja2.in filename = instance-kvm-cluster.cfg.jinja2.in
    ...@@ -55,7 +55,7 @@ md5sum = 6328f99728284847b8dd1146aadeae1b ...@@ -55,7 +55,7 @@ md5sum = 6328f99728284847b8dd1146aadeae1b
    [template-kvm-run] [template-kvm-run]
    filename = template/template-kvm-run.in filename = template/template-kvm-run.in
    md5sum = 497f5b78a360b994ab2ab607339003e0 md5sum = 729bc484c8c1a82b827cc4bcdff87f95
    [template-kvm-controller] [template-kvm-controller]
    filename = template/kvm-controller-run.in filename = template/kvm-controller-run.in
    ...@@ -92,3 +92,7 @@ md5sum = b4f6ffef08685bace1b9c01a3bd2620d ...@@ -92,3 +92,7 @@ md5sum = b4f6ffef08685bace1b9c01a3bd2620d
    [whitelist-domains-default] [whitelist-domains-default]
    filename = template/whitelist-domains-default filename = template/whitelist-domains-default
    md5sum = e9d40162ba77472775256637a2617d14 md5sum = e9d40162ba77472775256637a2617d14
    [boot-image-select-source-config]
    filename = template/boot-image-select-source-config.json.in
    md5sum = 5dc0cbb8f8dccfdd5c52d0af4a2b2c48
    software/kvm/instance-kvm-cluster-input-schema.json
    View file @ 03b02d63
    ...@@ -432,85 +432,31 @@ ...@@ -432,85 +432,31 @@
    "type": "boolean", "type": "boolean",
    "default": false "default": false
    }, },
    "boot-image-url-list": {
    "title": "Boot image list",
    "description": "The list shall be list of direct URLs to images, followed by hash (#), then by image MD5SUM. Each image shall appear on newline, like: \"https://example.com/image.iso#06226c7fac5bacfa385872a19bb99684<newline>https://example.com/another-image.iso#31b40d58b18e038498ddb46caea1361c\". They will be provided in KVM image list according to the order on the list. After updating the list, the instance has to be restarted to refresh it. Amount of images is limited to 4, and one image can be maximum 20GB. Image will be downloaded and checked against its MD5SUM 4 times, then it will be considered as impossible to download with given MD5SUM. Each image has to be downloaded in time shorter than 4 hours, so in case of very slow images to access, it can take up to 16 hours to download all of them. Note: The instance has to be restarted in order to update the list of available images in the VM. Note: Maximum 3 ISOs are supported.",
    "type": "string",
    "textarea": true
    },
    "boot-image-url-select": { "boot-image-url-select": {
    "title": "Boot image", "title": "Boot image",
    "type": "string",
    "description": "Selectable list of provided ISO images.", "description": "Selectable list of provided ISO images.",
    "type": "array", "default": "Debian Bookworm 12 netinst x86_64",
    "oneOf": [ "enum": [
    { "Debian Bookworm 12 netinst x86_64",
    "const": [ "Debian Bullseye 11 netinst x86_64",
    "https://shacache.nxdcdn.com/33c08e56c83d13007e4a5511b9bf2c4926c4aa12fd5dd56d493c0653aecbab380988c5bf1671dbaea75c582827797d98c4a611f7fb2b131fbde2c677d5258ec9#326b7737c4262e8eb09cd26773f3356a" "Centos 8.2004 Minimal x86_64",
    ], "Ubuntu Noble 24.04 Live Server x86_64",
    "title": "Debian Bookworm 12 netinst x86_64" "Ubuntu Jammy 22.04 Live Server x86_64",
    }, "Ubuntu Focal 20.04 Live Server x86_64",
    { "openSUSE Leap 15 NET x86_64",
    "const": [ "Arch Linux 2020.09.01 x86_64",
    "https://shacache.nxdcdn.com/02257c3ec27e45d9f022c181a69b59da67e5c72871cdb4f9a69db323a1fad58093f2e69702d29aa98f5f65e920e0b970d816475a5a936e1f3bf33832257b7e92#b710c178eb434d79ce40ce703d30a5f0" "Fedora Server 32 netinst x86_64",
    ], "FreeBSD 12.1 RELEASE bootonly x86_64",
    "title": "Debian Bullseye 11 netinst x86_64" "SUSE Linux Enterprise Server 15 SP6 x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/ce5ddfdbdaccdf929b7fe321212356347d82a02f6b7733427282b416f113d91e587682b003e9d376ac189c3b731595c50c236962aadf2720c16d9f36913577c0#23bf2a2d60271e553e63525e794415f1"
    ],
    "title": "Centos 8.2004 Minimal x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/3d518612aabbdb77fd6b49cb55b824fed11e40540e4af52f5f26174257715c93740f83079ea618b4d933081f0b1bc69d32b7885b7c75bc90da5ad3fe1814cfd4#c53b2d7c3269c3b91a2d941ceaa8ab9b"
    ],
    "title": "Ubuntu Jammy 24.04.1 Live Server x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/8017c532ed74586b718662d8b11cf8c34fa638b0affd0413ed38623989b8f98ffd0bcb475246e279ea2f3c194a3e33c55e0f376a9727de13e4bfd87e75e47b5d#e8d2a77c51b599c10651608a5d8c286f"
    ],
    "title": "Ubuntu Jammy 22.04.1 Live Server x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/302c990c6d69575ff24c96566e5c7e26bf36908abb0cd546e22687c46fb07bf8dba595bf77a9d4fd9ab63e75c0437c133f35462fd41ea77f6f616140cd0e5e6a#f3a306f40e4a313fb5a584d73b3dee8f"
    ],
    "title": "Ubuntu Focal 20.04.1 Live Server x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/6635269a7eb6fbd6b85fda40cd94f14a27bf53cb1fc82ffcce9fe386a025a43e1ab681db7e8cec50416bfbfc90262f0d95273686a101c74b3f17646f0a34c85b#3708a59af6cf820a95cafe0ae73ac399"
    ],
    "title": "openSUSE Leap 15.2 NET x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/fc17e8c6ae0790162f4beb8fa6226d945cff638429588999b3a08493ff27b280dc2939fba825ae04be1d9082ea8d7c3c002c5e4c39fbbcf88b8ab5104619e28a#ebcdb2223a77f098af3923fe1fa180aa"
    ],
    "title": "Arch Linux 2020.09.01 x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/c5a511f349a1146b615e6fab9c24f9be4362046adcf24f0ff82c470d361fac5f6628895e2110ebf8ff87db49d4c413a0a332699da6b1bec64275e0c17a15b999#ca7a1e555c04b4d9a549065fa2ddf713"
    ],
    "title": "Fedora Server 32-1.6 netinst x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/6c355def68b3c0427f21598cb054ffc893568902f205601ac60f192854769b31bc9cff8eeb6ce99ef975a8fb887d8d3e56fc6cd5ea5cb4b3bba1175c520047cb#57088b77f795ca44b00971e44782ee23"
    ],
    "title": "FreeBSD 12.1 RELEASE bootonly x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/e72e03bbcc4c54ce4b8d5f360b47dab9ee514d754e8d78c403626cf000d6ae98d808b3bcff2201e3cf49c1be1b0f308f1cb5ed81676adcb1837dfc811d2451ac"
    ],
    "title": "SUSE Linux Enterprise Server 15 SP6 x86_64"
    }
    ] ]
    }, },
    "boot-image-url-list": {
    "title": "[EXPERT] Boot image list",
    "description": "The list shall be list of direct URLs to images, followed by hash (#), then by image MD5SUM. Each image shall appear on newline, like: \"https://example.com/image.iso#06226c7fac5bacfa385872a19bb99684<newline>https://example.com/another-image.iso#31b40d58b18e038498ddb46caea1361c\". They will be provided in KVM image list according to the order on the list. Maximum images: 4. Maximum image size: 20GB. Download tires: 4. Maximum download time: 4h.",
    "type": "string",
    "textarea": true
    },
    "whitelist-domains": { "whitelist-domains": {
    "title": "Whitelist domains", "title": "Whitelist domains",
    "description": "List of whitelisted domain names to be accessed from the VM. They will be resolved to IPs depending on where the VM end up. IPs can be used too.", "description": "List of whitelisted domain names to be accessed from the VM. They will be resolved to IPs depending on where the VM end up. IPs can be used too.",
    ......
    software/kvm/instance-kvm-input-schema.json
    View file @ 03b02d63
    ...@@ -285,85 +285,31 @@ ...@@ -285,85 +285,31 @@
    "format": "uri", "format": "uri",
    "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg" "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
    }, },
    "boot-image-url-list": {
    "title": "Boot image list",
    "description": "The list shall be list of direct URLs to images, followed by hash (#), then by image MD5SUM. Each image shall appear on newline, like: \"https://example.com/image.iso#06226c7fac5bacfa385872a19bb99684<newline>https://example.com/another-image.iso#31b40d58b18e038498ddb46caea1361c\". They will be provided in KVM image list according to the order on the list. After updating the list, the instance has to be restarted to refresh it. Amount of images is limited to 4, and one image can be maximum 20GB. Image will be downloaded and checked against its MD5SUM 4 times, then it will be considered as impossible to download with given MD5SUM. Each image has to be downloaded in time shorter than 4 hours, so in case of very slow images to access, it can take up to 16 hours to download all of them. Note: The instance has to be restarted in order to update the list of available images in the VM. Note: Maximum 3 ISOs are supported.",
    "type": "string",
    "textarea": true
    },
    "boot-image-url-select": { "boot-image-url-select": {
    "title": "Boot image", "title": "Boot image",
    "description": "Selectable list of provided ISO images.", "description": "Selectable list of provided ISO images.",
    "type": "array", "type": "string",
    "oneOf": [ "default": "Debian Bookworm 12 netinst x86_64",
    { "enum": [
    "const": [ "Debian Bookworm 12 netinst x86_64",
    "https://shacache.nxdcdn.com/33c08e56c83d13007e4a5511b9bf2c4926c4aa12fd5dd56d493c0653aecbab380988c5bf1671dbaea75c582827797d98c4a611f7fb2b131fbde2c677d5258ec9#326b7737c4262e8eb09cd26773f3356a" "Debian Bullseye 11 netinst x86_64",
    ], "Centos 8.2004 Minimal x86_64",
    "title": "Debian Bookworm 12 netinst x86_64" "Ubuntu Noble 24.04 Live Server x86_64",
    }, "Ubuntu Jammy 22.04 Live Server x86_64",
    { "Ubuntu Focal 20.04 Live Server x86_64",
    "const": [ "openSUSE Leap 15 NET x86_64",
    "https://shacache.nxdcdn.com/02257c3ec27e45d9f022c181a69b59da67e5c72871cdb4f9a69db323a1fad58093f2e69702d29aa98f5f65e920e0b970d816475a5a936e1f3bf33832257b7e92#b710c178eb434d79ce40ce703d30a5f0" "Arch Linux 2020.09.01 x86_64",
    ], "Fedora Server 32 netinst x86_64",
    "title": "Debian Bullseye 11 netinst x86_64" "FreeBSD 12.1 RELEASE bootonly x86_64",
    }, "SUSE Linux Enterprise Server 15 SP6 x86_64"
    {
    "const": [
    "https://shacache.nxdcdn.com/ce5ddfdbdaccdf929b7fe321212356347d82a02f6b7733427282b416f113d91e587682b003e9d376ac189c3b731595c50c236962aadf2720c16d9f36913577c0#23bf2a2d60271e553e63525e794415f1"
    ],
    "title": "Centos 8.2004 Minimal x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/3d518612aabbdb77fd6b49cb55b824fed11e40540e4af52f5f26174257715c93740f83079ea618b4d933081f0b1bc69d32b7885b7c75bc90da5ad3fe1814cfd4#c53b2d7c3269c3b91a2d941ceaa8ab9b"
    ],
    "title": "Ubuntu Jammy 24.04.1 Live Server x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/8017c532ed74586b718662d8b11cf8c34fa638b0affd0413ed38623989b8f98ffd0bcb475246e279ea2f3c194a3e33c55e0f376a9727de13e4bfd87e75e47b5d#e8d2a77c51b599c10651608a5d8c286f"
    ],
    "title": "Ubuntu Jammy 22.04.1 Live Server x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/302c990c6d69575ff24c96566e5c7e26bf36908abb0cd546e22687c46fb07bf8dba595bf77a9d4fd9ab63e75c0437c133f35462fd41ea77f6f616140cd0e5e6a#f3a306f40e4a313fb5a584d73b3dee8f"
    ],
    "title": "Ubuntu Focal 20.04.1 Live Server x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/6635269a7eb6fbd6b85fda40cd94f14a27bf53cb1fc82ffcce9fe386a025a43e1ab681db7e8cec50416bfbfc90262f0d95273686a101c74b3f17646f0a34c85b#3708a59af6cf820a95cafe0ae73ac399"
    ],
    "title": "openSUSE Leap 15.2 NET x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/fc17e8c6ae0790162f4beb8fa6226d945cff638429588999b3a08493ff27b280dc2939fba825ae04be1d9082ea8d7c3c002c5e4c39fbbcf88b8ab5104619e28a#ebcdb2223a77f098af3923fe1fa180aa"
    ],
    "title": "Arch Linux 2020.09.01 x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/c5a511f349a1146b615e6fab9c24f9be4362046adcf24f0ff82c470d361fac5f6628895e2110ebf8ff87db49d4c413a0a332699da6b1bec64275e0c17a15b999#ca7a1e555c04b4d9a549065fa2ddf713"
    ],
    "title": "Fedora Server 32-1.6 netinst x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/6c355def68b3c0427f21598cb054ffc893568902f205601ac60f192854769b31bc9cff8eeb6ce99ef975a8fb887d8d3e56fc6cd5ea5cb4b3bba1175c520047cb#57088b77f795ca44b00971e44782ee23"
    ],
    "title": "FreeBSD 12.1 RELEASE bootonly x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/e72e03bbcc4c54ce4b8d5f360b47dab9ee514d754e8d78c403626cf000d6ae98d808b3bcff2201e3cf49c1be1b0f308f1cb5ed81676adcb1837dfc811d2451ac"
    ],
    "title": "SUSE Linux Enterprise Server 15 SP6 x86_64"
    }
    ] ]
    }, },
    "boot-image-url-list": {
    "title": "[EXPERT] Boot image list",
    "description": "The list shall be list of direct URLs to images, followed by hash (#), then by image MD5SUM. Each image shall appear on newline, like: \"https://example.com/image.iso#06226c7fac5bacfa385872a19bb99684<newline>https://example.com/another-image.iso#31b40d58b18e038498ddb46caea1361c\". They will be provided in KVM image list according to the order on the list. Maximum images: 4. Maximum image size: 20GB. Download tires: 4. Maximum ownload time: 4h.",
    "type": "string",
    "textarea": true
    },
    "whitelist-domains": { "whitelist-domains": {
    "title": "Whitelist domains", "title": "Whitelist domains",
    "description": "List of whitelisted domain names to be accessed from the VM. They will be resolved to IPs depending on where the VM end up. IPs can be used too.", "description": "List of whitelisted domain names to be accessed from the VM. They will be resolved to IPs depending on where the VM end up. IPs can be used too.",
    ......
    software/kvm/instance-kvm.cfg.jinja2
    View file @ 03b02d63
    ...@@ -19,8 +19,11 @@ ...@@ -19,8 +19,11 @@
    {% set whitelist_domains = slapparameter_dict.get('whitelist-domains', '') -%} {% set whitelist_domains = slapparameter_dict.get('whitelist-domains', '') -%}
    {% set virtual_hard_drive_url_enabled = 'virtual-hard-drive-url' in slapparameter_dict %} {% set virtual_hard_drive_url_enabled = 'virtual-hard-drive-url' in slapparameter_dict %}
    {% set virtual_hard_drive_url_gzipped = slapparameter_dict.get('virtual-hard-drive-gzipped', False) %} {% set virtual_hard_drive_url_gzipped = slapparameter_dict.get('virtual-hard-drive-gzipped', False) %}
    {% set boot_image_url_list_enabled = 'boot-image-url-list' in slapparameter_dict %} {% if 'boot-image-url-select' not in slapparameter_dict and ('boot-image-url-list' in slapparameter_dict or 'nbd-host' in slapparameter_dict or 'nbd2-host' in slapparameter_dict or virtual_hard_drive_url_enabled)%}
    {% set boot_image_url_select_enabled = 'boot-image-url-select' in slapparameter_dict %} {% set boot_image_url_select_default = '' %}
    {% else %}
    {% set boot_image_url_select_default = 'Debian Bookworm 12 netinst x86_64' %}
    {% endif %}
    {% set bootstrap_script_url = slapparameter_dict.get('bootstrap-script-url') -%} {% set bootstrap_script_url = slapparameter_dict.get('bootstrap-script-url') -%}
    {% set cpu_max_count = dumps(slapparameter_dict.get('cpu-max-count', int(slapparameter_dict.get('cpu-count', 2)) + 1)) %} {% set cpu_max_count = dumps(slapparameter_dict.get('cpu-max-count', int(slapparameter_dict.get('cpu-count', 2)) + 1)) %}
    {% set ram_max_size = dumps(slapparameter_dict.get('ram-max-size', int(slapparameter_dict.get('ram-size', 4096)) + 512)) %} {% set ram_max_size = dumps(slapparameter_dict.get('ram-max-size', int(slapparameter_dict.get('ram-size', 4096)) + 512)) %}
    ...@@ -63,16 +66,12 @@ virtual-hard-drive-url-repository = ${:srv}/virtual-hard-drive-url-repository ...@@ -63,16 +66,12 @@ virtual-hard-drive-url-repository = ${:srv}/virtual-hard-drive-url-repository
    virtual-hard-drive-url-var = ${:var}/virtual-hard-drive-url virtual-hard-drive-url-var = ${:var}/virtual-hard-drive-url
    virtual-hard-drive-url-expose = ${monitor-directory:private}/virtual-hard-drive-url virtual-hard-drive-url-expose = ${monitor-directory:private}/virtual-hard-drive-url
    {%- endif %} {%- endif %}
    {%- if boot_image_url_list_enabled %}
    boot-image-url-list-repository = ${:srv}/boot-image-url-list-repository boot-image-url-list-repository = ${:srv}/boot-image-url-list-repository
    boot-image-url-list-var = ${:var}/boot-image-url-list boot-image-url-list-var = ${:var}/boot-image-url-list
    boot-image-url-list-expose = ${monitor-directory:private}/boot-image-url-list boot-image-url-list-expose = ${monitor-directory:private}/boot-image-url-list
    {%- endif %}
    {%- if boot_image_url_select_enabled %}
    boot-image-url-select-repository = ${:srv}/boot-image-url-select-repository boot-image-url-select-repository = ${:srv}/boot-image-url-select-repository
    boot-image-url-select-var = ${:var}/boot-image-url-select boot-image-url-select-var = ${:var}/boot-image-url-select
    boot-image-url-select-expose = ${monitor-directory:private}/boot-image-url-select boot-image-url-select-expose = ${monitor-directory:private}/boot-image-url-select
    {%- endif %}
    [create-mac] [create-mac]
    recipe = slapos.cookbook:generate.mac recipe = slapos.cookbook:generate.mac
    ...@@ -88,7 +87,6 @@ storage-path = ${directory:srv}/.passwd ...@@ -88,7 +87,6 @@ storage-path = ${directory:srv}/.passwd
    # VNC protocol supports passwords of 8 characters max # VNC protocol supports passwords of 8 characters max
    bytes = 8 bytes = 8
    {% if boot_image_url_select_enabled %}
    ## boot-image-url-select support BEGIN ## boot-image-url-select support BEGIN
    [empty-file-state-base-select-promise] [empty-file-state-base-select-promise]
    <= monitor-promise-base <= monitor-promise-base
    ...@@ -99,13 +97,12 @@ config-url = ${monitor-base:base-url}/private/boot-image-url-select/${:filename} ...@@ -99,13 +97,12 @@ config-url = ${monitor-base:base-url}/private/boot-image-url-select/${:filename}
    [boot-image-url-select-source-config] [boot-image-url-select-source-config]
    recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
    inline = url = {{ boot_image_select_source_config }}
    {%- raw %} boot-image-url-select = {{ dumps(slapparameter_dict.get('boot-image-url-select', '')) }}
    {{ boot_image_url_select }} boot-image-url-select-default = {{ dumps(boot_image_url_select_default) }}
    {% endraw -%}
    boot-image-url-select = {{ dumps(slapparameter_dict['boot-image-url-select']) }}
    context = context =
    key boot_image_url_select :boot-image-url-select key boot_image_url_select :boot-image-url-select
    key boot_image_url_select_default :boot-image-url-select-default
    output = ${directory:etc}/boot-image-url-select.json output = ${directory:etc}/boot-image-url-select.json
    [boot-image-url-select-processed-config] [boot-image-url-select-processed-config]
    ...@@ -183,9 +180,7 @@ config-filename = ${boot-image-url-select-download-wrapper:md5sum-state-file} ...@@ -183,9 +180,7 @@ config-filename = ${boot-image-url-select-download-wrapper:md5sum-state-file}
    filename = ${boot-image-url-select-download-wrapper:error-state-filename} filename = ${boot-image-url-select-download-wrapper:error-state-filename}
    config-filename = ${boot-image-url-select-download-wrapper:error-state-file} config-filename = ${boot-image-url-select-download-wrapper:error-state-file}
    ## boot-image-url-select support END ## boot-image-url-select support END
    {% endif %} {# if boot_image_url_select_enabled #}
    {% if boot_image_url_list_enabled %}
    ## boot-image-url-list support BEGIN ## boot-image-url-list support BEGIN
    [empty-file-state-base-list-promise] [empty-file-state-base-list-promise]
    <= monitor-promise-base <= monitor-promise-base
    ...@@ -200,7 +195,7 @@ inline = ...@@ -200,7 +195,7 @@ inline =
    {%- raw %} {%- raw %}
    {{ boot_image_url_list }} {{ boot_image_url_list }}
    {% endraw -%} {% endraw -%}
    boot-image-url-list = {{ dumps(slapparameter_dict['boot-image-url-list']) }} boot-image-url-list = {{ dumps(slapparameter_dict.get('boot-image-url-list', '')) }}
    context = context =
    key boot_image_url_list :boot-image-url-list key boot_image_url_list :boot-image-url-list
    output = ${directory:etc}/boot-image-url-list.conf output = ${directory:etc}/boot-image-url-list.conf
    ...@@ -280,7 +275,6 @@ config-filename = ${boot-image-url-list-download-wrapper:md5sum-state-file} ...@@ -280,7 +275,6 @@ config-filename = ${boot-image-url-list-download-wrapper:md5sum-state-file}
    filename = ${boot-image-url-list-download-wrapper:error-state-filename} filename = ${boot-image-url-list-download-wrapper:error-state-filename}
    config-filename = ${boot-image-url-list-download-wrapper:error-state-file} config-filename = ${boot-image-url-list-download-wrapper:error-state-file}
    ## boot-image-url-list support END ## boot-image-url-list support END
    {% endif %} {# if boot_image_url_list_enabled #}
    {% if virtual_hard_drive_url_enabled %} {% if virtual_hard_drive_url_enabled %}
    ## virtual-hard-drive-url support BEGIN ## virtual-hard-drive-url support BEGIN
    ...@@ -399,22 +393,13 @@ ipv6 = ${slap-network-information:global-ipv6} ...@@ -399,22 +393,13 @@ ipv6 = ${slap-network-information:global-ipv6}
    vnc-ip = ${:ipv4} vnc-ip = ${:ipv4}
    vnc-websocket-port = 5701 vnc-websocket-port = 5701
    default-cdrom-iso = {{ debian_amd64_netinst_location }}
    {% if virtual_hard_drive_url_enabled %} {% if virtual_hard_drive_url_enabled %}
    virtual-hard-drive-url-json-config = ${virtual-hard-drive-url-json-config:output} virtual-hard-drive-url-json-config = ${virtual-hard-drive-url-json-config:output}
    {% else %} {% else %}
    virtual-hard-drive-url-json-config = virtual-hard-drive-url-json-config =
    {% endif %} {% endif %}
    {% if boot_image_url_list_enabled %}
    boot-image-url-list-json-config = ${boot-image-url-list-json-config:output} boot-image-url-list-json-config = ${boot-image-url-list-json-config:output}
    {% else %}
    boot-image-url-list-json-config =
    {% endif %}
    {% if boot_image_url_select_enabled %}
    boot-image-url-select-json-config = ${boot-image-url-select-json-config:output} boot-image-url-select-json-config = ${boot-image-url-select-json-config:output}
    {% else %}
    boot-image-url-select-json-config =
    {% endif %}
    tap-interface = {{ slap_configuration.get('tap-name', '') }} tap-interface = {{ slap_configuration.get('tap-name', '') }}
    tap-ipv6-addr = {{ slap_configuration.get('tap-ipv6-addr', '') }} tap-ipv6-addr = {{ slap_configuration.get('tap-ipv6-addr', '') }}
    ...@@ -545,12 +530,8 @@ update-command = ${:command} ...@@ -545,12 +530,8 @@ update-command = ${:command}
    command = [ ! -f {{ '${' + key + '}' }} ] && touch {{ '${' + key + '}' }} command = [ ! -f {{ '${' + key + '}' }} ] && touch {{ '${' + key + '}' }}
    {%- endmacro %} {%- endmacro %}
    {#- Create depending sections, as state files appear late, so it's better to have empty file which will impact the hash anyway #} {#- Create depending sections, as state files appear late, so it's better to have empty file which will impact the hash anyway #}
    {%- if boot_image_url_list_enabled %}
    {{ generate_depend_section('boot-image-url-list-depend', 'boot-image-url-list-download-wrapper:config') }} {{ generate_depend_section('boot-image-url-list-depend', 'boot-image-url-list-download-wrapper:config') }}
    {%- endif %}
    {%- if boot_image_url_select_enabled %}
    {{ generate_depend_section('boot-image-url-select-depend', 'boot-image-url-select-download-wrapper:config') }} {{ generate_depend_section('boot-image-url-select-depend', 'boot-image-url-select-download-wrapper:config') }}
    {%- endif %}
    {%- if virtual_hard_drive_url_enabled %} {%- if virtual_hard_drive_url_enabled %}
    {{ generate_depend_section('virtual-hard-drive-url-depend', 'virtual-hard-drive-url-download-wrapper:config') }} {{ generate_depend_section('virtual-hard-drive-url-depend', 'virtual-hard-drive-url-download-wrapper:config') }}
    {%- endif %} {%- endif %}
    ...@@ -1277,20 +1258,16 @@ parts = ...@@ -1277,20 +1258,16 @@ parts =
    virtual-hard-drive-url-download-state-promise virtual-hard-drive-url-download-state-promise
    virtual-hard-drive-url-processed-config-promise virtual-hard-drive-url-processed-config-promise
    {% endif %} {% endif %}
    {% if boot_image_url_list_enabled %}
    boot-image-url-list-download-wrapper boot-image-url-list-download-wrapper
    boot-image-url-list-config-state-promise boot-image-url-list-config-state-promise
    boot-image-url-list-download-md5sum-promise boot-image-url-list-download-md5sum-promise
    boot-image-url-list-download-state-promise boot-image-url-list-download-state-promise
    boot-image-url-list-processed-config-promise boot-image-url-list-processed-config-promise
    {% endif %}
    {% if boot_image_url_select_enabled %}
    boot-image-url-select-download-wrapper boot-image-url-select-download-wrapper
    boot-image-url-select-config-state-promise boot-image-url-select-config-state-promise
    boot-image-url-select-download-md5sum-promise boot-image-url-select-download-md5sum-promise
    boot-image-url-select-download-state-promise boot-image-url-select-download-state-promise
    boot-image-url-select-processed-config-promise boot-image-url-select-processed-config-promise
    {% endif %}
    {% if additional_frontend %} {% if additional_frontend %}
    frontend-additional-promise frontend-additional-promise
    {% endif %} {% endif %}
    ......
    software/kvm/instance.cfg.in
    View file @ 03b02d63
    ...@@ -77,7 +77,7 @@ extra-context = ...@@ -77,7 +77,7 @@ extra-context =
    raw dash_executable_location ${dash:location}/bin/dash raw dash_executable_location ${dash:location}/bin/dash
    raw dnsresolver_executable ${buildout:bin-directory}/dnsresolver raw dnsresolver_executable ${buildout:bin-directory}/dnsresolver
    raw dcron_executable_location ${dcron:location}/sbin/crond raw dcron_executable_location ${dcron:location}/sbin/crond
    raw debian_amd64_netinst_location ${debian-amd64-bullseye-netinst.iso:target} raw boot_image_select_source_config ${boot-image-select-source-config:target}
    raw whitelist_domains_default ${whitelist-domains-default:target} raw whitelist_domains_default ${whitelist-domains-default:target}
    raw whitelist_firewall_download_controller ${whitelist-firewall-download-controller:output} raw whitelist_firewall_download_controller ${whitelist-firewall-download-controller:output}
    raw image_download_controller ${image-download-controller:output} raw image_download_controller ${image-download-controller:output}
    ......
    software/kvm/software.cfg
    View file @ 03b02d63
    ...@@ -126,3 +126,6 @@ context = ...@@ -126,3 +126,6 @@ context =
    [whitelist-domains-default] [whitelist-domains-default]
    <= download-base <= download-base
    [boot-image-select-source-config]
    <= download-base
    software/kvm/template/boot-image-select-source-config.json.in 0 → 100644
    View file @ 03b02d63
    {%- set IMAGE_URL_MAPPING = {
    "Debian Bookworm 12 netinst x86_64" : "https://shacache.nxdcdn.com/33c08e56c83d13007e4a5511b9bf2c4926c4aa12fd5dd56d493c0653aecbab380988c5bf1671dbaea75c582827797d98c4a611f7fb2b131fbde2c677d5258ec9#326b7737c4262e8eb09cd26773f3356a",
    "Debian Bullseye 11 netinst x86_64" : "https://shacache.nxdcdn.com/02257c3ec27e45d9f022c181a69b59da67e5c72871cdb4f9a69db323a1fad58093f2e69702d29aa98f5f65e920e0b970d816475a5a936e1f3bf33832257b7e92#b710c178eb434d79ce40ce703d30a5f0",
    "Centos 8.2004 Minimal x86_64" : "https://shacache.nxdcdn.com/ce5ddfdbdaccdf929b7fe321212356347d82a02f6b7733427282b416f113d91e587682b003e9d376ac189c3b731595c50c236962aadf2720c16d9f36913577c0#23bf2a2d60271e553e63525e794415f1",
    "Ubuntu Noble 24.04 Live Server x86_64" : "https://shacache.nxdcdn.com/3d518612aabbdb77fd6b49cb55b824fed11e40540e4af52f5f26174257715c93740f83079ea618b4d933081f0b1bc69d32b7885b7c75bc90da5ad3fe1814cfd4#c53b2d7c3269c3b91a2d941ceaa8ab9b",
    "Ubuntu Jammy 22.04 Live Server x86_64" : "https://shacache.nxdcdn.com/8017c532ed74586b718662d8b11cf8c34fa638b0affd0413ed38623989b8f98ffd0bcb475246e279ea2f3c194a3e33c55e0f376a9727de13e4bfd87e75e47b5d#e8d2a77c51b599c10651608a5d8c286f",
    "Ubuntu Focal 20.04 Live Server x86_64": "https://shacache.nxdcdn.com/302c990c6d69575ff24c96566e5c7e26bf36908abb0cd546e22687c46fb07bf8dba595bf77a9d4fd9ab63e75c0437c133f35462fd41ea77f6f616140cd0e5e6a#f3a306f40e4a313fb5a584d73b3dee8f",
    "openSUSE Leap 15 NET x86_64" : "https://shacache.nxdcdn.com/6635269a7eb6fbd6b85fda40cd94f14a27bf53cb1fc82ffcce9fe386a025a43e1ab681db7e8cec50416bfbfc90262f0d95273686a101c74b3f17646f0a34c85b#3708a59af6cf820a95cafe0ae73ac399",
    "Arch Linux 2020.09.01 x86_64" : "https://shacache.nxdcdn.com/fc17e8c6ae0790162f4beb8fa6226d945cff638429588999b3a08493ff27b280dc2939fba825ae04be1d9082ea8d7c3c002c5e4c39fbbcf88b8ab5104619e28a#ebcdb2223a77f098af3923fe1fa180aa",
    "Fedora Server 32 netinst x86_64" : "https://shacache.nxdcdn.com/c5a511f349a1146b615e6fab9c24f9be4362046adcf24f0ff82c470d361fac5f6628895e2110ebf8ff87db49d4c413a0a332699da6b1bec64275e0c17a15b999#ca7a1e555c04b4d9a549065fa2ddf713",
    "FreeBSD 12.1 RELEASE bootonly x86_64" : "https://shacache.nxdcdn.com/6c355def68b3c0427f21598cb054ffc893568902f205601ac60f192854769b31bc9cff8eeb6ce99ef975a8fb887d8d3e56fc6cd5ea5cb4b3bba1175c520047cb#57088b77f795ca44b00971e44782ee23",
    "SUSE Linux Enterprise Server 15 SP6 x86_64": "https://shacache.nxdcdn.com/e72e03bbcc4c54ce4b8d5f360b47dab9ee514d754e8d78c403626cf000d6ae98d808b3bcff2201e3cf49c1be1b0f308f1cb5ed81676adcb1837dfc811d2451ac",
    } -%}
    {%- if boot_image_url_select %}
    {#- Fail in the promise if bad boot-image-url-select is set -#}
    {%- set boot_image = IMAGE_URL_MAPPING.get(boot_image_url_select, boot_image_url_select) %}
    {%- else %}
    {#- Use default ONLY if no boot-image-url-select is set -#}
    {%- set boot_image = IMAGE_URL_MAPPING.get(boot_image_url_select_default) %}
    {%- endif %}
    {%- if boot_image -%}
    ["{{ boot_image }}"]
    {%- else -%}
    []
    {%- endif -%}
    software/kvm/template/template-kvm-run.in
    View file @ 03b02d63
    ...@@ -23,7 +23,6 @@ disk_type = {{ repr(parameter_dict["disk-type"]) }} ...@@ -23,7 +23,6 @@ disk_type = {{ repr(parameter_dict["disk-type"]) }}
    network_adapter = {{ repr(parameter_dict["network-adapter"]) }} network_adapter = {{ repr(parameter_dict["network-adapter"]) }}
    socket_path = '{{ parameter_dict.get("socket-path") }}' socket_path = '{{ parameter_dict.get("socket-path") }}'
    default_cdrom_iso = '{{ parameter_dict.get("default-cdrom-iso") }}'
    nat_rules = '{{ parameter_dict.get("nat-rules") }}'.strip() nat_rules = '{{ parameter_dict.get("nat-rules") }}'.strip()
    use_tap = '{{ parameter_dict.get("use-tap") }}'.lower() use_tap = '{{ parameter_dict.get("use-tap") }}'.lower()
    ...@@ -387,17 +386,13 @@ def handle_image(config, name): ...@@ -387,17 +386,13 @@ def handle_image(config, name):
    # Note: Do not get tempted to use virtio-scsi-pci, as it does not work with # Note: Do not get tempted to use virtio-scsi-pci, as it does not work with
    # Debian installation CDs, rendering it uninstallable # Debian installation CDs, rendering it uninstallable
    if boot_image_url_select_json_config: # Note: boot-image-url-list has precedence over boot-image-url-select
    # Support boot-image-url-select
    handle_image(boot_image_url_select_json_config, 'boot-image-url-select')
    if boot_image_url_list_json_config: if boot_image_url_list_json_config:
    # Support boot-image-url-list # Support boot-image-url-list
    handle_image(boot_image_url_list_json_config, 'boot-image-url-list') handle_image(boot_image_url_list_json_config, 'boot-image-url-list')
    # Always add by default the default image if boot_image_url_select_json_config:
    kvm_argument_list.extend([ # Support boot-image-url-select
    '-drive', 'file=%s,media=cdrom' % default_cdrom_iso handle_image(boot_image_url_select_json_config, 'boot-image-url-select')
    ])
    print('Starting KVM: \n %s' % ' '.join(kvm_argument_list)) print('Starting KVM: \n %s' % ' '.join(kvm_argument_list))
    os.execv(qemu_path, kvm_argument_list) os.execv(qemu_path, kvm_argument_list)
    software/kvm/test/test.py
    View file @ 03b02d63
    ...@@ -134,10 +134,12 @@ class KVMTestCase(InstanceTestCase): ...@@ -134,10 +134,12 @@ class KVMTestCase(InstanceTestCase):
    assert (os.path.exists(cls.qemu_img)) assert (os.path.exists(cls.qemu_img))
    def getRunningImageList( def getRunningImageList(
    self, kvm_instance_partition, self,
    _match_cdrom=re.compile('file=(.+),media=cdrom$').match, _match_cdrom=re.compile('file=(.+),media=cdrom$').match,
    _sub_iso=re.compile(r'(/debian)(-[^-/]+)(-[^/]+-netinst\.iso)$').sub, _sub_iso=re.compile(r'(/debian)(-[^-/]+)(-[^/]+-netinst\.iso)$').sub,
    ): ):
    kvm_instance_partition = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference)
    with self.slap.instance_supervisor_rpc as instance_supervisor: with self.slap.instance_supervisor_rpc as instance_supervisor:
    kvm_pid = next(q for q in instance_supervisor.getAllProcessInfo() kvm_pid = next(q for q in instance_supervisor.getAllProcessInfo()
    if 'kvm-' in q['name'])['pid'] if 'kvm-' in q['name'])['pid']
    ...@@ -197,27 +199,46 @@ class KVMTestCase(InstanceTestCase): ...@@ -197,27 +199,46 @@ class KVMTestCase(InstanceTestCase):
    class KvmMixin: class KvmMixin:
    def assertPromiseFails(self, promise):
    partition_directory = os.path.join(
    self.slap.instance_directory,
    self.kvm_instance_partition_reference)
    monitor_run_promise = os.path.join(
    partition_directory, 'software_release', 'bin',
    'monitor.runpromise'
    )
    monitor_configuration = os.path.join(
    partition_directory, 'etc', 'monitor.conf')
    self.assertNotEqual(
    0,
    subprocess.call([
    monitor_run_promise, '-c', monitor_configuration, '-a', '-f',
    '--run-only', promise])
    )
    def getConnectionParameterDictJson(self): def getConnectionParameterDictJson(self):
    return json.loads( return json.loads(
    self.computer_partition.getConnectionParameterDict()['_']) self.computer_partition.getConnectionParameterDict()['_'])
    def getProcessInfo(self): def getProcessInfo(self, kvm_additional_hash_file_list=None):
    if kvm_additional_hash_file_list is None:
    kvm_additional_hash_file_list = []
    hash_value = generateHashFromFiles([ hash_value = generateHashFromFiles([
    os.path.join(self.computer_partition_root_path, hash_file) os.path.join(self.computer_partition_root_path, hash_file)
    for hash_file in [ for hash_file in [
    'software_release/buildout.cfg', 'software_release/buildout.cfg',
    ] ]
    ]) ])
    # find bin/kvm_raw kvm_partition = os.path.join(
    kvm_raw_list = glob.glob( self.slap.instance_directory, self.kvm_instance_partition_reference)
    os.path.join(self.slap.instance_directory, '*', 'bin', 'kvm_raw'))
    self.assertEqual(1, len(kvm_raw_list)) # allow to work only with one
    hash_file_list = [ hash_file_list = [
    kvm_raw_list[0], os.path.join(kvm_partition, 'bin', 'kvm_raw')
    'software_release/buildout.cfg', ] + kvm_additional_hash_file_list + [
    ] 'software_release/buildout.cfg']
    kvm_hash_value = generateHashFromFiles([ kvm_hash_value = generateHashFromFiles([
    os.path.join(self.computer_partition_root_path, hash_file) os.path.join(kvm_partition, hash_file)
    for hash_file in hash_file_list for hash_file in hash_file_list
    ]) ])
    with self.slap.instance_supervisor_rpc as supervisor: with self.slap.instance_supervisor_rpc as supervisor:
    ...@@ -232,7 +253,9 @@ class KvmMixin: ...@@ -232,7 +253,9 @@ class KvmMixin:
    with self.assertRaises(SlapOSNodeCommandError): with self.assertRaises(SlapOSNodeCommandError):
    self.slap.waitForInstance(max_retry=max_retry) self.slap.waitForInstance(max_retry=max_retry)
    def rerequestInstance(self, parameter_dict, state='started'): def rerequestInstance(self, parameter_dict=None, state='started'):
    if parameter_dict is None:
    parameter_dict = {}
    software_url = self.getSoftwareURL() software_url = self.getSoftwareURL()
    software_type = self.getInstanceSoftwareType() software_type = self.getInstanceSoftwareType()
    return self.slap.request( return self.slap.request(
    ...@@ -249,7 +272,9 @@ class KvmMixinJson: ...@@ -249,7 +272,9 @@ class KvmMixinJson:
    return { return {
    '_': json.dumps(super().getInstanceParameterDict())} '_': json.dumps(super().getInstanceParameterDict())}
    def rerequestInstance(self, parameter_dict, *args, **kwargs): def rerequestInstance(self, parameter_dict=None, *args, **kwargs):
    if parameter_dict is None:
    parameter_dict = {}
    return super().rerequestInstance( return super().rerequestInstance(
    parameter_dict={'_': json.dumps(parameter_dict)}, parameter_dict={'_': json.dumps(parameter_dict)},
    *args, **kwargs *args, **kwargs
    ...@@ -259,6 +284,7 @@ class KvmMixinJson: ...@@ -259,6 +284,7 @@ class KvmMixinJson:
    @skipUnlessKvm @skipUnlessKvm
    class TestInstance(KVMTestCase, KvmMixin): class TestInstance(KVMTestCase, KvmMixin):
    __partition_reference__ = 'i' __partition_reference__ = 'i'
    kvm_instance_partition_reference = 'i0'
    def test(self): def test(self):
    connection_parameter_dict = self.getConnectionParameterDictJson() connection_parameter_dict = self.getConnectionParameterDictJson()
    ...@@ -290,6 +316,8 @@ class TestInstance(KVMTestCase, KvmMixin): ...@@ -290,6 +316,8 @@ class TestInstance(KVMTestCase, KvmMixin):
    """i0:6tunnel-10022-{hash}-on-watch RUNNING """i0:6tunnel-10022-{hash}-on-watch RUNNING
    i0:6tunnel-10080-{hash}-on-watch RUNNING i0:6tunnel-10080-{hash}-on-watch RUNNING
    i0:6tunnel-10443-{hash}-on-watch RUNNING i0:6tunnel-10443-{hash}-on-watch RUNNING
    i0:boot-image-url-list-updater-{hash} EXITED
    i0:boot-image-url-select-updater-{hash} EXITED
    i0:bootstrap-monitor EXITED i0:bootstrap-monitor EXITED
    i0:certificate_authority-{hash}-on-watch RUNNING i0:certificate_authority-{hash}-on-watch RUNNING
    i0:crond-{hash}-on-watch RUNNING i0:crond-{hash}-on-watch RUNNING
    ...@@ -301,7 +329,19 @@ i0:nginx-graceful EXITED ...@@ -301,7 +329,19 @@ i0:nginx-graceful EXITED
    i0:nginx-on-watch RUNNING i0:nginx-on-watch RUNNING
    i0:whitelist-domains-download-{hash} RUNNING i0:whitelist-domains-download-{hash} RUNNING
    i0:whitelist-firewall-{hash} RUNNING""", i0:whitelist-firewall-{hash} RUNNING""",
    self.getProcessInfo() self.getProcessInfo([
    'var/boot-image-url-list/boot-image-url-list.json',
    'var/boot-image-url-select/boot-image-url-select.json'
    ])
    )
    # assure that the default image is used
    self.assertEqual(
    [
    '${inst}/srv/boot-image-url-select-repository/'
    '326b7737c4262e8eb09cd26773f3356a'
    ],
    self.getRunningImageList()
    ) )
    ...@@ -314,6 +354,7 @@ class TestInstanceJson( ...@@ -314,6 +354,7 @@ class TestInstanceJson(
    @skipUnlessKvm @skipUnlessKvm
    class TestMemoryManagement(KVMTestCase, KvmMixin): class TestMemoryManagement(KVMTestCase, KvmMixin):
    __partition_reference__ = 'i' __partition_reference__ = 'i'
    kvm_instance_partition_reference = 'i0'
    def getKvmProcessInfo(self, switch_list): def getKvmProcessInfo(self, switch_list):
    return_list = [] return_list = []
    ...@@ -351,7 +392,7 @@ class TestMemoryManagement(KVMTestCase, KvmMixin): ...@@ -351,7 +392,7 @@ class TestMemoryManagement(KVMTestCase, KvmMixin):
    self.assertNotEqual(kvm_pid_1, kvm_pid_2, "Unexpected: KVM not restarted") self.assertNotEqual(kvm_pid_1, kvm_pid_2, "Unexpected: KVM not restarted")
    def tearDown(self): def tearDown(self):
    self.rerequestInstance({}) self.rerequestInstance()
    self.slap.waitForInstance(max_retry=10) self.slap.waitForInstance(max_retry=10)
    def test_enable_device_hotplug(self): def test_enable_device_hotplug(self):
    ...@@ -482,6 +523,7 @@ class MonitorAccessMixin(KvmMixin): ...@@ -482,6 +523,7 @@ class MonitorAccessMixin(KvmMixin):
    @skipUnlessKvm @skipUnlessKvm
    class TestAccessDefault(MonitorAccessMixin, KVMTestCase): class TestAccessDefault(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'ad' __partition_reference__ = 'ad'
    kvm_instance_partition_reference = 'ad0'
    expected_partition_with_monitor_base_url_count = 1 expected_partition_with_monitor_base_url_count = 1
    def test(self): def test(self):
    ...@@ -503,6 +545,7 @@ class TestAccessDefaultJson(KvmMixinJson, TestAccessDefault): ...@@ -503,6 +545,7 @@ class TestAccessDefaultJson(KvmMixinJson, TestAccessDefault):
    @skipUnlessKvm @skipUnlessKvm
    class TestAccessDefaultAdditional(MonitorAccessMixin, KVMTestCase): class TestAccessDefaultAdditional(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'ada' __partition_reference__ = 'ada'
    kvm_instance_partition_reference = 'ada0'
    expected_partition_with_monitor_base_url_count = 1 expected_partition_with_monitor_base_url_count = 1
    @classmethod @classmethod
    ...@@ -539,6 +582,7 @@ class TestAccessDefaultAdditionalJson( ...@@ -539,6 +582,7 @@ class TestAccessDefaultAdditionalJson(
    @skipUnlessKvm @skipUnlessKvm
    class TestAccessDefaultBootstrap(MonitorAccessMixin, KVMTestCase): class TestAccessDefaultBootstrap(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'adb' __partition_reference__ = 'adb'
    kvm_instance_partition_reference = 'adb0'
    expected_partition_with_monitor_base_url_count = 1 expected_partition_with_monitor_base_url_count = 1
    @classmethod @classmethod
    ...@@ -587,6 +631,7 @@ class TestAccessDefaultBootstrap(MonitorAccessMixin, KVMTestCase): ...@@ -587,6 +631,7 @@ class TestAccessDefaultBootstrap(MonitorAccessMixin, KVMTestCase):
    @skipUnlessKvm @skipUnlessKvm
    class TestAccessKvmCluster(MonitorAccessMixin, KVMTestCase): class TestAccessKvmCluster(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'akc' __partition_reference__ = 'akc'
    kvm_instance_partition_reference = 'akc0'
    expected_partition_with_monitor_base_url_count = 2 expected_partition_with_monitor_base_url_count = 2
    @classmethod @classmethod
    ...@@ -617,6 +662,7 @@ class TestAccessKvmCluster(MonitorAccessMixin, KVMTestCase): ...@@ -617,6 +662,7 @@ class TestAccessKvmCluster(MonitorAccessMixin, KVMTestCase):
    @skipUnlessKvm @skipUnlessKvm
    class TestAccessKvmClusterAdditional(MonitorAccessMixin, KVMTestCase): class TestAccessKvmClusterAdditional(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'akca' __partition_reference__ = 'akca'
    kvm_instance_partition_reference = 'akca0'
    expected_partition_with_monitor_base_url_count = 2 expected_partition_with_monitor_base_url_count = 2
    @classmethod @classmethod
    ...@@ -657,6 +703,7 @@ class TestAccessKvmClusterAdditional(MonitorAccessMixin, KVMTestCase): ...@@ -657,6 +703,7 @@ class TestAccessKvmClusterAdditional(MonitorAccessMixin, KVMTestCase):
    @skipUnlessKvm @skipUnlessKvm
    class TestAccessKvmClusterBootstrap(MonitorAccessMixin, KVMTestCase): class TestAccessKvmClusterBootstrap(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'akcb' __partition_reference__ = 'akcb'
    kvm_instance_partition_reference = 'akcb0'
    expected_partition_with_monitor_base_url_count = 3 expected_partition_with_monitor_base_url_count = 3
    @classmethod @classmethod
    ...@@ -700,6 +747,7 @@ class TestAccessKvmClusterBootstrap(MonitorAccessMixin, KVMTestCase): ...@@ -700,6 +747,7 @@ class TestAccessKvmClusterBootstrap(MonitorAccessMixin, KVMTestCase):
    @skipUnlessKvm @skipUnlessKvm
    class TestInstanceResilient(KVMTestCase, KvmMixin): class TestInstanceResilient(KVMTestCase, KvmMixin):
    __partition_reference__ = 'ir' __partition_reference__ = 'ir'
    kvm_instance_partition_reference = 'ir0'
    instance_max_retry = 20 instance_max_retry = 20
    @classmethod @classmethod
    ...@@ -710,7 +758,8 @@ class TestInstanceResilient(KVMTestCase, KvmMixin): ...@@ -710,7 +758,8 @@ class TestInstanceResilient(KVMTestCase, KvmMixin):
    def setUpClass(cls): def setUpClass(cls):
    super().setUpClass() super().setUpClass()
    cls.pbs1_ipv6 = cls.getPartitionIPv6(cls.getPartitionId('PBS (kvm / 1)')) cls.pbs1_ipv6 = cls.getPartitionIPv6(cls.getPartitionId('PBS (kvm / 1)'))
    cls.kvm0_ipv6 = cls.getPartitionIPv6(cls.getPartitionId('kvm0')) cls.kvm_instance_partition_reference = cls.getPartitionId('kvm0')
    cls.kvm0_ipv6 = cls.getPartitionIPv6(cls.kvm_instance_partition_reference)
    cls.kvm1_ipv6 = cls.getPartitionIPv6(cls.getPartitionId('kvm1')) cls.kvm1_ipv6 = cls.getPartitionIPv6(cls.getPartitionId('kvm1'))
    def test_kvm_exporter(self): def test_kvm_exporter(self):
    ...@@ -783,6 +832,8 @@ ir1:pbs_sshkeys_authority-on-watch RUNNING ...@@ -783,6 +832,8 @@ ir1:pbs_sshkeys_authority-on-watch RUNNING
    ir2:6tunnel-10022-{hash}-on-watch RUNNING ir2:6tunnel-10022-{hash}-on-watch RUNNING
    ir2:6tunnel-10080-{hash}-on-watch RUNNING ir2:6tunnel-10080-{hash}-on-watch RUNNING
    ir2:6tunnel-10443-{hash}-on-watch RUNNING ir2:6tunnel-10443-{hash}-on-watch RUNNING
    ir2:boot-image-url-list-updater-{hash} EXITED
    ir2:boot-image-url-select-updater-{hash} EXITED
    ir2:bootstrap-monitor EXITED ir2:bootstrap-monitor EXITED
    ir2:certificate_authority-{hash}-on-watch RUNNING ir2:certificate_authority-{hash}-on-watch RUNNING
    ir2:crond-{hash}-on-watch RUNNING ir2:crond-{hash}-on-watch RUNNING
    ...@@ -810,7 +861,10 @@ ir3:resilient-web-takeover-httpd-on-watch RUNNING ...@@ -810,7 +861,10 @@ ir3:resilient-web-takeover-httpd-on-watch RUNNING
    ir3:resilient_sshkeys_authority-on-watch RUNNING ir3:resilient_sshkeys_authority-on-watch RUNNING
    ir3:sshd-graceful EXITED ir3:sshd-graceful EXITED
    ir3:sshd-on-watch RUNNING""", ir3:sshd-on-watch RUNNING""",
    self.getProcessInfo() self.getProcessInfo([
    'var/boot-image-url-list/boot-image-url-list.json',
    'var/boot-image-url-select/boot-image-url-select.json'
    ])
    ) )
    ...@@ -838,6 +892,7 @@ class TestInstanceResilientDiskTypeIdeJson( ...@@ -838,6 +892,7 @@ class TestInstanceResilientDiskTypeIdeJson(
    @skipUnlessKvm @skipUnlessKvm
    class TestAccessResilientAdditional(KVMTestCase): class TestAccessResilientAdditional(KVMTestCase):
    __partition_reference__ = 'ara' __partition_reference__ = 'ara'
    kvm_instance_partition_reference = 'ara0'
    expected_partition_with_monitor_base_url_count = 1 expected_partition_with_monitor_base_url_count = 1
    @classmethod @classmethod
    ...@@ -1018,90 +1073,6 @@ class TestVirtualHardDriveUrl(FakeImageServerMixin, KVMTestCase): ...@@ -1018,90 +1073,6 @@ class TestVirtualHardDriveUrl(FakeImageServerMixin, KVMTestCase):
    ) )
    @skipUnlessKvm
    class TestInstanceNbd(KVMTestCase):
    __partition_reference__ = 'in'
    kvm_instance_partition_reference = 'in0'
    @classmethod
    def startNbdServer(cls):
    cls.nbd_directory = tempfile.mkdtemp()
    img_1 = os.path.join(cls.nbd_directory, 'one.qcow')
    img_2 = os.path.join(cls.nbd_directory, 'two.qcow')
    subprocess.check_call([cls.qemu_img, "create", "-f", "qcow", img_1, "1M"])
    subprocess.check_call([cls.qemu_img, "create", "-f", "qcow", img_2, "1M"])
    nbd_list = [cls.qemu_nbd, '-r', '-t', '-e', '32767']
    cls.nbd_1_port = findFreeTCPPort(cls._ipv6_address)
    cls.nbd_1 = subprocess.Popen(
    nbd_list + ['-b', cls._ipv6_address, '-p', str(cls.nbd_1_port), img_1])
    cls.nbd_1_uri = '[%s]:%s' % (cls._ipv6_address, cls.nbd_1_port)
    cls.nbd_2_port = findFreeTCPPort(cls._ipv6_address)
    cls.nbd_2 = subprocess.Popen(
    nbd_list + ['-b', cls._ipv6_address, '-p', str(cls.nbd_2_port), img_2])
    cls.nbd_2_uri = '[%s]:%s' % (cls._ipv6_address, cls.nbd_2_port)
    @classmethod
    def stopNbdServer(cls):
    cls.nbd_1.terminate()
    cls.nbd_2.terminate()
    shutil.rmtree(cls.nbd_directory)
    @classmethod
    def setUpClass(cls):
    # we need qemu-nbd binary location
    # it's to hard to put qemu in software/slapos-sr-testing
    # so let's find it here
    # let's find our software .installed.cfg
    cls.findQemuTools()
    cls.startNbdServer()
    super().setUpClass()
    @classmethod
    def tearDownClass(cls):
    super().tearDownClass()
    cls.stopNbdServer()
    @classmethod
    def getInstanceParameterDict(cls):
    return {
    "nbd-host": cls._ipv6_address,
    "nbd-port": cls.nbd_1_port
    }
    def test(self):
    kvm_instance_partition = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference)
    self.assertEqual(
    [f'nbd:{self.nbd_1_uri}', '${shared}/debian-${ver}-amd64-netinst.iso'],
    self.getRunningImageList(kvm_instance_partition)
    )
    @skipUnlessKvm
    class TestInstanceNbdBoth(TestInstanceNbd):
    __partition_reference__ = 'inb'
    kvm_instance_partition_reference = 'inb0'
    @classmethod
    def getInstanceParameterDict(cls):
    return {
    "nbd-host": cls._ipv6_address,
    "nbd-port": cls.nbd_1_port,
    "nbd2-host": cls._ipv6_address,
    "nbd2-port": cls.nbd_2_port
    }
    def test(self):
    kvm_instance_partition = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference)
    self.assertEqual(
    [f'nbd:{self.nbd_1_uri}', f'nbd:{self.nbd_2_uri}',
    '${shared}/debian-${ver}-amd64-netinst.iso'],
    self.getRunningImageList(kvm_instance_partition)
    )
    @skipUnlessKvm @skipUnlessKvm
    class TestVirtualHardDriveUrlGzipped(TestVirtualHardDriveUrl): class TestVirtualHardDriveUrlGzipped(TestVirtualHardDriveUrl):
    __partition_reference__ = 'vhdug' __partition_reference__ = 'vhdug'
    ...@@ -1124,7 +1095,6 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase): ...@@ -1124,7 +1095,6 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase):
    # variations # variations
    key = 'boot-image-url-list' key = 'boot-image-url-list'
    test_input = "%s#%s\n%s#%s" test_input = "%s#%s\n%s#%s"
    empty_input = ""
    image_directory = 'boot-image-url-list-repository' image_directory = 'boot-image-url-list-repository'
    config_state_promise = 'boot-image-url-list-config-state-promise.py' config_state_promise = 'boot-image-url-list-config-state-promise.py'
    download_md5sum_promise = 'boot-image-url-list-download-md5sum-promise.py' download_md5sum_promise = 'boot-image-url-list-download-md5sum-promise.py'
    ...@@ -1158,12 +1128,9 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase): ...@@ -1158,12 +1128,9 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase):
    def tearDown(self): def tearDown(self):
    # clean up the instance for other tests # clean up the instance for other tests
    # 1st remove all images... # move instance to "default" state
    self.rerequestInstance({self.key: ''}) self.rerequestInstance()
    self.slap.waitForInstance(max_retry=10) self.slap.waitForInstance(max_retry=20)
    # 2nd ...move instance to "default" state
    self.rerequestInstance({})
    self.slap.waitForInstance(max_retry=10)
    super().tearDown() super().tearDown()
    def test(self): def test(self):
    ...@@ -1188,9 +1155,8 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase): ...@@ -1188,9 +1155,8 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase):
    [ [
    f'${{inst}}/srv/{self.image_directory}/{self.fake_image_md5sum}', f'${{inst}}/srv/{self.image_directory}/{self.fake_image_md5sum}',
    f'${{inst}}/srv/{self.image_directory}/{self.fake_image2_md5sum}', f'${{inst}}/srv/{self.image_directory}/{self.fake_image2_md5sum}',
    '${shared}/debian-${ver}-amd64-netinst.iso',
    ], ],
    self.getRunningImageList(kvm_instance_partition) self.getRunningImageList()
    ) )
    # Switch image # Switch image
    ...@@ -1209,18 +1175,14 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase): ...@@ -1209,18 +1175,14 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase):
    [ [
    f'${{inst}}/srv/{self.image_directory}/{self.fake_image3_md5sum}', f'${{inst}}/srv/{self.image_directory}/{self.fake_image3_md5sum}',
    f'${{inst}}/srv/{self.image_directory}/{self.fake_image2_md5sum}', f'${{inst}}/srv/{self.image_directory}/{self.fake_image2_md5sum}',
    '${shared}/debian-${ver}-amd64-netinst.iso',
    ], ],
    self.getRunningImageList(kvm_instance_partition) self.getRunningImageList()
    ) )
    # cleanup of images works, also asserts that configuration changes are # cleanup of images works, also asserts that configuration changes are
    # reflected # reflected
    # Note: key is left and empty_input is provided, as otherwise the part self.rerequestInstance()
    # which generate images is simply removed, which can lead to self.slap.waitForInstance(max_retry=15)
    # leftover
    self.rerequestInstance({self.key: self.empty_input})
    self.slap.waitForInstance(max_retry=10)
    self.assertEqual( self.assertEqual(
    os.listdir(image_repository), os.listdir(image_repository),
    [] []
    ...@@ -1228,26 +1190,11 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase): ...@@ -1228,26 +1190,11 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase):
    # again only default image is available in the running process # again only default image is available in the running process
    self.assertEqual( self.assertEqual(
    ['${shared}/debian-${ver}-amd64-netinst.iso'], [
    self.getRunningImageList(kvm_instance_partition) '${inst}/srv/boot-image-url-select-repository/'
    ) '326b7737c4262e8eb09cd26773f3356a'
    ],
    def assertPromiseFails(self, promise): self.getRunningImageList()
    partition_directory = os.path.join(
    self.slap.instance_directory,
    self.kvm_instance_partition_reference)
    monitor_run_promise = os.path.join(
    partition_directory, 'software_release', 'bin',
    'monitor.runpromise'
    )
    monitor_configuration = os.path.join(
    partition_directory, 'etc', 'monitor.conf')
    self.assertNotEqual(
    0,
    subprocess.call([
    monitor_run_promise, '-c', monitor_configuration, '-a', '-f',
    '--run-only', promise])
    ) )
    def test_bad_parameter(self): def test_bad_parameter(self):
    ...@@ -1316,36 +1263,60 @@ class TestBootImageUrlListResilientJson( ...@@ -1316,36 +1263,60 @@ class TestBootImageUrlListResilientJson(
    @skipUnlessKvm @skipUnlessKvm
    class TestBootImageUrlSelect(TestBootImageUrlList): class TestBootImageUrlSelect(FakeImageServerMixin, KVMTestCase):
    __partition_reference__ = 'bius' __partition_reference__ = 'bius'
    kvm_instance_partition_reference = 'bius0' kvm_instance_partition_reference = 'bius0'
    # variations
    key = 'boot-image-url-select'
    test_input = '["%s#%s", "%s#%s"]'
    empty_input = '[]'
    image_directory = 'boot-image-url-select-repository'
    config_state_promise = 'boot-image-url-select-config-state-promise.py' config_state_promise = 'boot-image-url-select-config-state-promise.py'
    download_md5sum_promise = 'boot-image-url-select-download-md5sum-promise.py'
    download_state_promise = 'boot-image-url-select-download-state-promise.py' def test(self):
    # check the default image
    bad_value = '["jsutbad"]' image_repository = os.path.join(
    incorrect_md5sum_value_image = '["%s#"]' self.slap.instance_directory, self.kvm_instance_partition_reference,
    incorrect_md5sum_value = '["url#asdasd"]' 'srv', 'boot-image-url-select-repository')
    single_image_value = '["%s#%s"]' self.assertEqual(
    unreachable_host_value = '["evennotahost#%s"]' ['326b7737c4262e8eb09cd26773f3356a'],
    too_many_image_value = """[ os.listdir(image_repository)
    "image1#11111111111111111111111111111111", )
    "image2#22222222222222222222222222222222", image = os.path.join(image_repository, '326b7737c4262e8eb09cd26773f3356a')
    "image3#33333333333333333333333333333333", self.assertTrue(os.path.exists(image))
    "image4#44444444444444444444444444444444", with open(image, 'rb') as fh:
    "image5#55555555555555555555555555555555", image_md5sum = hashlib.md5(fh.read()).hexdigest()
    "image6#66666666666666666666666666666666" self.assertEqual(image_md5sum, '326b7737c4262e8eb09cd26773f3356a')
    ]""" self.assertEqual(
    [
    def test_not_json(self): '${inst}/srv/boot-image-url-select-repository/'
    '326b7737c4262e8eb09cd26773f3356a'
    ],
    self.getRunningImageList()
    )
    # switch the image
    self.rerequestInstance({ self.rerequestInstance({
    self.key: 'notjson#notjson' 'boot-image-url-select': "Debian Bullseye 11 netinst x86_64"})
    self.slap.waitForInstance(max_retry=10)
    image_repository = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference,
    'srv', 'boot-image-url-select-repository')
    self.assertEqual(
    ['b710c178eb434d79ce40ce703d30a5f0'],
    os.listdir(image_repository)
    )
    image = os.path.join(image_repository, 'b710c178eb434d79ce40ce703d30a5f0')
    self.assertTrue(os.path.exists(image))
    with open(image, 'rb') as fh:
    image_md5sum = hashlib.md5(fh.read()).hexdigest()
    self.assertEqual(image_md5sum, 'b710c178eb434d79ce40ce703d30a5f0')
    self.assertEqual(
    [
    '${inst}/srv/boot-image-url-select-repository/'
    'b710c178eb434d79ce40ce703d30a5f0'
    ],
    self.getRunningImageList()
    )
    def test_bad_image(self):
    self.rerequestInstance({
    'boot-image-url-select': 'DOESNOTEXISTS'
    }) })
    self.raising_waitForInstance(3) self.raising_waitForInstance(3)
    self.assertPromiseFails(self.config_state_promise) self.assertPromiseFails(self.config_state_promise)
    ...@@ -1354,66 +1325,113 @@ class TestBootImageUrlSelect(TestBootImageUrlList): ...@@ -1354,66 +1325,113 @@ class TestBootImageUrlSelect(TestBootImageUrlList):
    partition_parameter_kw = { partition_parameter_kw = {
    'boot-image-url-list': "{}#{}".format( 'boot-image-url-list': "{}#{}".format(
    self.fake_image, self.fake_image_md5sum), self.fake_image, self.fake_image_md5sum),
    'boot-image-url-select': '["{}#{}"]'.format( 'boot-image-url-select': "Debian Bullseye 11 netinst x86_64"
    self.fake_image, self.fake_image_md5sum)
    } }
    self.rerequestInstance(partition_parameter_kw) self.rerequestInstance(partition_parameter_kw)
    self.slap.waitForInstance(max_retry=10) self.slap.waitForInstance(max_retry=10)
    # check that image is correctly downloaded # check that image is correctly downloaded
    for image_directory in [
    'boot-image-url-list-repository', 'boot-image-url-select-repository']:
    image_repository = os.path.join( image_repository = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference, self.slap.instance_directory, self.kvm_instance_partition_reference,
    'srv', image_directory) 'srv', 'boot-image-url-list-repository')
    self.assertEqual(
    [self.fake_image_md5sum],
    os.listdir(image_repository)
    )
    image = os.path.join(image_repository, self.fake_image_md5sum) image = os.path.join(image_repository, self.fake_image_md5sum)
    self.assertTrue(os.path.exists(image)) self.assertTrue(os.path.exists(image))
    with open(image, 'rb') as fh: with open(image, 'rb') as fh:
    image_md5sum = hashlib.md5(fh.read()).hexdigest() image_md5sum = hashlib.md5(fh.read()).hexdigest()
    self.assertEqual(image_md5sum, self.fake_image_md5sum) self.assertEqual(image_md5sum, self.fake_image_md5sum)
    image_repository = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference,
    'srv', 'boot-image-url-select-repository')
    self.assertEqual(
    ['b710c178eb434d79ce40ce703d30a5f0'],
    os.listdir(image_repository)
    )
    image = os.path.join(image_repository, 'b710c178eb434d79ce40ce703d30a5f0')
    self.assertTrue(os.path.exists(image))
    with open(image, 'rb') as fh:
    image_md5sum = hashlib.md5(fh.read()).hexdigest()
    self.assertEqual(image_md5sum, 'b710c178eb434d79ce40ce703d30a5f0')
    kvm_instance_partition = os.path.join( kvm_instance_partition = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference) self.slap.instance_directory, self.kvm_instance_partition_reference)
    self.assertEqual( self.assertEqual(
    [ [
    '${{inst}}/srv/boot-image-url-select-repository/{}'.format(
    self.fake_image_md5sum),
    '${{inst}}/srv/boot-image-url-list-repository/{}'.format( '${{inst}}/srv/boot-image-url-list-repository/{}'.format(
    self.fake_image_md5sum), self.fake_image_md5sum),
    '${shared}/debian-${ver}-amd64-netinst.iso', '${inst}/srv/boot-image-url-select-repository/'
    'b710c178eb434d79ce40ce703d30a5f0'
    ], ],
    self.getRunningImageList(kvm_instance_partition) self.getRunningImageList()
    ) )
    # cleanup of images works, also asserts that configuration changes are # check that using only boot-image-url-list results with not having
    # reflected # boot-image-url-select if nothing is provided
    self.rerequestInstance( partition_parameter_kw = {
    {'boot-image-url-list': '', 'boot-image-url-select': ''}) 'boot-image-url-list': "{}#{}".format(
    self.slap.waitForInstance(max_retry=2) self.fake_image, self.fake_image_md5sum),
    for image_directory in [ }
    'boot-image-url-list-repository', 'boot-image-url-select-repository']: self.rerequestInstance(partition_parameter_kw)
    self.slap.waitForInstance(max_retry=10)
    # check that image is correctly downloaded
    image_repository = os.path.join( image_repository = os.path.join(
    kvm_instance_partition, 'srv', image_directory) self.slap.instance_directory, self.kvm_instance_partition_reference,
    'srv', 'boot-image-url-list-repository')
    self.assertEqual( self.assertEqual(
    os.listdir(image_repository), [self.fake_image_md5sum],
    [] os.listdir(image_repository)
    )
    image = os.path.join(image_repository, self.fake_image_md5sum)
    self.assertTrue(os.path.exists(image))
    with open(image, 'rb') as fh:
    image_md5sum = hashlib.md5(fh.read()).hexdigest()
    self.assertEqual(image_md5sum, self.fake_image_md5sum)
    self.assertEqual(
    [],
    os.listdir(os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference,
    'srv', 'boot-image-url-select-repository'))
    )
    kvm_instance_partition = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference)
    self.assertEqual(
    [
    '${{inst}}/srv/boot-image-url-list-repository/{}'.format(
    self.fake_image_md5sum),
    ],
    self.getRunningImageList()
    ) )
    # cleanup of images works, also asserts that configuration changes are # cleanup of images works, also asserts that configuration changes are
    # reflected # reflected
    partition_parameter_kw[self.key] = '' self.rerequestInstance()
    partition_parameter_kw['boot-image-url-list'] = '' self.slap.waitForInstance(max_retry=15)
    self.rerequestInstance(partition_parameter_kw)
    self.slap.waitForInstance(max_retry=2)
    self.assertEqual( self.assertEqual(
    os.listdir(image_repository), os.listdir(os.path.join(
    kvm_instance_partition, 'srv', 'boot-image-url-select-repository')),
    ['326b7737c4262e8eb09cd26773f3356a']
    )
    self.assertEqual(
    os.listdir(os.path.join(
    kvm_instance_partition, 'srv', 'boot-image-url-list-repository')),
    [] []
    ) )
    # again only default image is available in the running process # again only default image is available in the running process
    self.assertEqual( self.assertEqual(
    ['${shared}/debian-${ver}-amd64-netinst.iso'], [
    self.getRunningImageList(kvm_instance_partition) '${inst}/srv/boot-image-url-select-repository/'
    '326b7737c4262e8eb09cd26773f3356a'
    ],
    self.getRunningImageList()
    ) )
    ...@@ -1500,12 +1518,62 @@ class TestBootImageUrlListKvmCluster(FakeImageServerMixin, KVMTestCase): ...@@ -1500,12 +1518,62 @@ class TestBootImageUrlListKvmCluster(FakeImageServerMixin, KVMTestCase):
    @skipUnlessKvm @skipUnlessKvm
    class TestBootImageUrlSelectKvmCluster(TestBootImageUrlListKvmCluster): class TestBootImageUrlSelectKvmCluster(KvmMixin, KVMTestCase):
    __partition_reference__ = 'biuskc' __partition_reference__ = 'biuskc'
    input_value = "[\"%s#%s\"]" @classmethod
    key = 'boot-image-url-select' def getInstanceSoftwareType(cls):
    config_file_name = 'boot-image-url-select.json' return 'kvm-cluster'
    @classmethod
    def getInstanceParameterDict(cls):
    return {'_': json.dumps({
    "kvm-partition-dict": {
    "KVM0": {
    "disable-ansible-promise": True,
    },
    "KVM1": {
    "disable-ansible-promise": True,
    }
    }
    })}
    def test(self):
    # Note: As there is no way to introspect nicely where partition landed
    # we assume ordering of the cluster requests
    self.rerequestInstance({'_': json.dumps({
    "kvm-partition-dict": {
    "KVM0": {
    "disable-ansible-promise": True,
    "boot-image-url-select": "Debian Bullseye 11 netinst x86_64"
    },
    "KVM1": {
    "disable-ansible-promise": True,
    "boot-image-url-select": "Debian Bookworm 12 netinst x86_64"
    }
    }
    })})
    self.slap.waitForInstance(max_retry=10)
    KVM0_config = os.path.join(
    self.slap.instance_directory, self.__partition_reference__ + '1', 'etc',
    'boot-image-url-select.json')
    KVM1_config = os.path.join(
    self.slap.instance_directory, self.__partition_reference__ + '2', 'etc',
    'boot-image-url-select.json')
    with open(KVM0_config) as fh:
    self.assertEqual(
    '["https://shacache.nxdcdn.com/02257c3ec27e45d9f022c181a69b59da67e5c7'
    '2871cdb4f9a69db323a1fad58093f2e69702d29aa98f5f65e920e0b970d816475a5a'
    '936e1f3bf33832257b7e92#b710c178eb434d79ce40ce703d30a5f0"]',
    fh.read().strip()
    )
    with open(KVM1_config) as fh:
    self.assertEqual(
    '["https://shacache.nxdcdn.com/33c08e56c83d13007e4a5511b9bf2c4926c4aa'
    '12fd5dd56d493c0653aecbab380988c5bf1671dbaea75c582827797d98c4a611f7fb'
    '2b131fbde2c677d5258ec9#326b7737c4262e8eb09cd26773f3356a"]',
    fh.read().strip()
    )
    @skipUnlessKvm @skipUnlessKvm
    ...@@ -2178,9 +2246,9 @@ class TestExternalDisk(KVMTestCase, ExternalDiskMixin): ...@@ -2178,9 +2246,9 @@ class TestExternalDisk(KVMTestCase, ExternalDiskMixin):
    restarted_drive_list = self.getRunningDriveList(kvm_instance_partition) restarted_drive_list = self.getRunningDriveList(kvm_instance_partition)
    self.assertEqual(drive_list, restarted_drive_list) self.assertEqual(drive_list, restarted_drive_list)
    # prove that even on resetting parameters, drives are still there # prove that even on resetting parameters, drives are still there
    self.rerequestInstance({}, state='stopped') self.rerequestInstance(state='stopped')
    self.waitForInstance() self.waitForInstance()
    self.rerequestInstance({}) self.rerequestInstance()
    self.waitForInstance() self.waitForInstance()
    dropped_drive_list = self.getRunningDriveList(kvm_instance_partition) dropped_drive_list = self.getRunningDriveList(kvm_instance_partition)
    self.assertEqual(drive_list, dropped_drive_list) self.assertEqual(drive_list, dropped_drive_list)
    ...@@ -2426,6 +2494,7 @@ class TestExternalDiskModernIndexRequired(KVMTestCase, ExternalDiskMixin): ...@@ -2426,6 +2494,7 @@ class TestExternalDiskModernIndexRequired(KVMTestCase, ExternalDiskMixin):
    @skipUnlessKvm @skipUnlessKvm
    class TestInstanceHttpServer(KVMTestCase, KvmMixin): class TestInstanceHttpServer(KVMTestCase, KvmMixin):
    __partition_reference__ = 'ihs' __partition_reference__ = 'ihs'
    kvm_instance_partition_reference = 'ihs0'
    @classmethod @classmethod
    def startHttpServer(cls): def startHttpServer(cls):
    ...@@ -2519,6 +2588,8 @@ vm""", ...@@ -2519,6 +2588,8 @@ vm""",
    """ihs0:6tunnel-10022-{hash}-on-watch RUNNING """ihs0:6tunnel-10022-{hash}-on-watch RUNNING
    ihs0:6tunnel-10080-{hash}-on-watch RUNNING ihs0:6tunnel-10080-{hash}-on-watch RUNNING
    ihs0:6tunnel-10443-{hash}-on-watch RUNNING ihs0:6tunnel-10443-{hash}-on-watch RUNNING
    ihs0:boot-image-url-list-updater-{hash} EXITED
    ihs0:boot-image-url-select-updater-{hash} EXITED
    ihs0:bootstrap-monitor EXITED ihs0:bootstrap-monitor EXITED
    ihs0:certificate_authority-{hash}-on-watch RUNNING ihs0:certificate_authority-{hash}-on-watch RUNNING
    ihs0:crond-{hash}-on-watch RUNNING ihs0:crond-{hash}-on-watch RUNNING
    ...@@ -2531,7 +2602,10 @@ ihs0:nginx-graceful EXITED ...@@ -2531,7 +2602,10 @@ ihs0:nginx-graceful EXITED
    ihs0:nginx-on-watch RUNNING ihs0:nginx-on-watch RUNNING
    ihs0:whitelist-domains-download-{hash} RUNNING ihs0:whitelist-domains-download-{hash} RUNNING
    ihs0:whitelist-firewall-{hash} RUNNING""", ihs0:whitelist-firewall-{hash} RUNNING""",
    self.getProcessInfo() self.getProcessInfo([
    'var/boot-image-url-list/boot-image-url-list.json',
    'var/boot-image-url-select/boot-image-url-select.json'
    ])
    ) )
    public_dir = os.path.join( public_dir = os.path.join(
    self.computer_partition_root_path, 'srv', 'public') self.computer_partition_root_path, 'srv', 'public')
    ......
    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
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7