Skip to content

slapos
slapos
Commit d42c6b9a 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 ef26331f
Pipeline #35497 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 325 additions and 276 deletions
    software/kvm/buildout.hash.cfg
    View file @ d42c6b9a
    ......@@ -15,11 +15,11 @@
    [template]
    filename = instance.cfg.in
    md5sum = b6204319cca4264b3c351d4dd1f2b5d0
    md5sum = cca7eb0f975da97491aa7803d5bd753b
    [template-kvm]
    filename = instance-kvm.cfg.jinja2
    md5sum = 4ae98a072354efbdd7440d800cc675c8
    md5sum = 95bce4aa8629d10ffa500ddebecd9da6
    [template-kvm-cluster]
    filename = instance-kvm-cluster.cfg.jinja2.in
    ......@@ -59,7 +59,7 @@ md5sum = 6328f99728284847b8dd1146aadeae1b
    [template-kvm-run]
    filename = template/template-kvm-run.in
    md5sum = f0190843e3979742fe9e29b8a607539f
    md5sum = 7c9b8e0ee78478323cf46837192a1efb
    [template-kvm-controller]
    filename = template/kvm-controller-run.in
    ......@@ -96,3 +96,7 @@ md5sum = b4f6ffef08685bace1b9c01a3bd2620d
    [whitelist-domains-default]
    filename = template/whitelist-domains-default
    md5sum = e9d40162ba77472775256637a2617d14
    [boot-image-select-source-config]
    filename = template/boot-image-select-source-config.json.in
    md5sum = a209bbfb03345153dae7b2e4fad22688
    software/kvm/instance-kvm-cluster-input-schema.json
    View file @ d42c6b9a
    ......@@ -446,73 +446,28 @@
    "type": "boolean",
    "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": {
    "title": "Boot image",
    "type": "string",
    "description": "Selectable list of provided ISO images.",
    "type": "array",
    "oneOf": [
    {
    "const": [
    "https://shacache.nxdcdn.com/02257c3ec27e45d9f022c181a69b59da67e5c72871cdb4f9a69db323a1fad58093f2e69702d29aa98f5f65e920e0b970d816475a5a936e1f3bf33832257b7e92#b710c178eb434d79ce40ce703d30a5f0"
    ],
    "title": "Debian Bullseye 11.1 netinst x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/bc469019b9057073d36ff8f5402c95ff0a0363657358336dc9a05fc6af66276229aa727ec46cf17b84d308f44b825de7f24ea1a256062a14e0f605cd70bae02f#2dcf188877075d7b58ca46e27ca31bb9"
    ],
    "title": "Debian Buster 10.12 netinst x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/ce5ddfdbdaccdf929b7fe321212356347d82a02f6b7733427282b416f113d91e587682b003e9d376ac189c3b731595c50c236962aadf2720c16d9f36913577c0#23bf2a2d60271e553e63525e794415f1"
    ],
    "title": "Centos 8.2004 Minimal 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"
    }
    "default": "Debian Bookworm 12 netinst x86_64",
    "enum": [
    "Debian Bookworm 12 netinst x86_64",
    "Debian Bullseye 11 netinst x86_64",
    "Centos 8.2004 Minimal x86_64",
    "Ubuntu Focal 20.04 Live Server x86_64",
    "openSUSE Leap 15 NET x86_64",
    "Arch Linux 2020.09.01 x86_64",
    "Fedora Server 32 netinst x86_64",
    "FreeBSD 12.1 RELEASE bootonly 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": {
    "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.",
    ......
    software/kvm/instance-kvm-input-schema.json
    View file @ d42c6b9a
    ......@@ -309,67 +309,28 @@
    "format": "uri",
    "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": {
    "title": "Boot image",
    "description": "Selectable list of provided ISO images.",
    "type": "array",
    "oneOf": [
    {
    "const": [
    "https://shacache.nxdcdn.com/bc469019b9057073d36ff8f5402c95ff0a0363657358336dc9a05fc6af66276229aa727ec46cf17b84d308f44b825de7f24ea1a256062a14e0f605cd70bae02f#2dcf188877075d7b58ca46e27ca31bb9"
    ],
    "title": "Debian Buster 10.12 netinst x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/ce5ddfdbdaccdf929b7fe321212356347d82a02f6b7733427282b416f113d91e587682b003e9d376ac189c3b731595c50c236962aadf2720c16d9f36913577c0#23bf2a2d60271e553e63525e794415f1"
    ],
    "title": "Centos 8.2004 Minimal 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"
    }
    "type": "string",
    "default": "Debian Bookworm 12 netinst x86_64",
    "enum": [
    "Debian Bookworm 12 netinst x86_64",
    "Debian Bullseye 11 netinst x86_64",
    "Centos 8.2004 Minimal x86_64",
    "Ubuntu Focal 20.04 Live Server x86_64",
    "openSUSE Leap 15 NET x86_64",
    "Arch Linux 2020.09.01 x86_64",
    "Fedora Server 32 netinst x86_64",
    "FreeBSD 12.1 RELEASE bootonly 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": {
    "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.",
    ......
    software/kvm/instance-kvm.cfg.jinja2
    View file @ d42c6b9a
    ......@@ -19,8 +19,11 @@
    {% 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_gzipped = slapparameter_dict.get('virtual-hard-drive-gzipped', False) %}
    {% set boot_image_url_list_enabled = 'boot-image-url-list' in slapparameter_dict %}
    {% set boot_image_url_select_enabled = 'boot-image-url-select' 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_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 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)) %}
    ......@@ -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-expose = ${monitor-directory:private}/virtual-hard-drive-url
    {%- endif %}
    {%- if boot_image_url_list_enabled %}
    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-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-var = ${:var}/boot-image-url-select
    boot-image-url-select-expose = ${monitor-directory:private}/boot-image-url-select
    {%- endif %}
    [create-mac]
    recipe = slapos.cookbook:generate.mac
    ......@@ -88,7 +87,6 @@ storage-path = ${directory:srv}/.passwd
    # VNC protocol supports passwords of 8 characters max
    bytes = 8
    {% if boot_image_url_select_enabled %}
    ## boot-image-url-select support BEGIN
    [empty-file-state-base-select-promise]
    <= monitor-promise-base
    ......@@ -99,13 +97,12 @@ config-url = ${monitor-base:base-url}/private/boot-image-url-select/${:filename}
    [boot-image-url-select-source-config]
    recipe = slapos.recipe.template:jinja2
    inline =
    {%- raw %}
    {{ boot_image_url_select }}
    {% endraw -%}
    boot-image-url-select = {{ dumps(slapparameter_dict['boot-image-url-select']) }}
    url = {{ boot_image_select_source_config }}
    boot-image-url-select = {{ dumps(slapparameter_dict.get('boot-image-url-select', '')) }}
    boot-image-url-select-default = {{ dumps(boot_image_url_select_default) }}
    context =
    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
    [boot-image-url-select-processed-config]
    ......@@ -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}
    config-filename = ${boot-image-url-select-download-wrapper:error-state-file}
    ## 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
    [empty-file-state-base-list-promise]
    <= monitor-promise-base
    ......@@ -200,7 +195,7 @@ inline =
    {%- raw %}
    {{ boot_image_url_list }}
    {% 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 =
    key boot_image_url_list :boot-image-url-list
    output = ${directory:etc}/boot-image-url-list.conf
    ......@@ -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}
    config-filename = ${boot-image-url-list-download-wrapper:error-state-file}
    ## boot-image-url-list support END
    {% endif %} {# if boot_image_url_list_enabled #}
    {% if virtual_hard_drive_url_enabled %}
    ## virtual-hard-drive-url support BEGIN
    ......@@ -399,22 +393,13 @@ ipv6 = ${slap-network-information:global-ipv6}
    vnc-ip = ${:ipv4}
    vnc-websocket-port = 5701
    default-cdrom-iso = {{ debian_amd64_netinst_location }}
    {% if virtual_hard_drive_url_enabled %}
    virtual-hard-drive-url-json-config = ${virtual-hard-drive-url-json-config:output}
    {% else %}
    virtual-hard-drive-url-json-config =
    {% endif %}
    {% if boot_image_url_list_enabled %}
    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}
    {% else %}
    boot-image-url-select-json-config =
    {% endif %}
    nbd-host = ${slap-parameter:nbd-host}
    nbd-port = ${slap-parameter:nbd-port}
    nbd2-host = ${slap-parameter:nbd2-host}
    ......@@ -549,12 +534,8 @@ update-command = ${:command}
    command = [ ! -f {{ '${' + key + '}' }} ] && touch {{ '${' + key + '}' }}
    {%- endmacro %}
    {#- 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') }}
    {%- endif %}
    {%- if boot_image_url_select_enabled %}
    {{ generate_depend_section('boot-image-url-select-depend', 'boot-image-url-select-download-wrapper:config') }}
    {%- endif %}
    {%- if virtual_hard_drive_url_enabled %}
    {{ generate_depend_section('virtual-hard-drive-url-depend', 'virtual-hard-drive-url-download-wrapper:config') }}
    {%- endif %}
    ......@@ -1285,20 +1266,16 @@ parts =
    virtual-hard-drive-url-download-state-promise
    virtual-hard-drive-url-processed-config-promise
    {% endif %}
    {% if boot_image_url_list_enabled %}
    boot-image-url-list-download-wrapper
    boot-image-url-list-config-state-promise
    boot-image-url-list-download-md5sum-promise
    boot-image-url-list-download-state-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-config-state-promise
    boot-image-url-select-download-md5sum-promise
    boot-image-url-select-download-state-promise
    boot-image-url-select-processed-config-promise
    {% endif %}
    {% if additional_frontend %}
    frontend-additional-promise
    {% endif %}
    ......
    software/kvm/instance.cfg.in
    View file @ d42c6b9a
    ......@@ -81,7 +81,7 @@ extra-context =
    raw dash_executable_location ${dash:location}/bin/dash
    raw dnsresolver_executable ${buildout:bin-directory}/dnsresolver
    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_firewall_download_controller ${whitelist-firewall-download-controller:output}
    raw image_download_controller ${image-download-controller:output}
    ......
    software/kvm/software.cfg
    View file @ d42c6b9a
    ......@@ -129,3 +129,6 @@ context =
    [whitelist-domains-default]
    <= download-base
    [boot-image-select-source-config]
    <= download-base
    software/kvm/template/boot-image-select-source-config.json.in 0 → 100644
    View file @ d42c6b9a
    {%- 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 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",
    } -%}
    {%- 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 @ d42c6b9a
    ......@@ -27,7 +27,6 @@ nbd_list = (('{{ parameter_dict.get("nbd-host") }}',
    {{ parameter_dict.get("nbd-port") }}),
    ('{{ parameter_dict.get("nbd2-host") }}',
    {{ parameter_dict.get("nbd2-port") }}))
    default_cdrom_iso = '{{ parameter_dict.get("default-cdrom-iso") }}'
    nat_rules = '{{ parameter_dict.get("nat-rules") }}'.strip()
    use_tap = '{{ parameter_dict.get("use-tap") }}'.lower()
    ......@@ -408,17 +407,13 @@ for nbd_ip, nbd_port in nbd_list:
    else:
    # Note: Do not get tempted to use virtio-scsi-pci, as it does not work with
    # Debian installation CDs, rendering it uninstallable
    if boot_image_url_select_json_config:
    # Support boot-image-url-select
    handle_image(boot_image_url_select_json_config, 'boot-image-url-select')
    # Note: boot-image-url-list has precedence over boot-image-url-select
    if boot_image_url_list_json_config:
    # Support boot-image-url-list
    handle_image(boot_image_url_list_json_config, 'boot-image-url-list')
    # Always add by default the default image
    kvm_argument_list.extend([
    '-drive', 'file=%s,media=cdrom' % default_cdrom_iso
    ])
    if boot_image_url_select_json_config:
    # Support boot-image-url-select
    handle_image(boot_image_url_select_json_config, 'boot-image-url-select')
    print('Starting KVM: \n %s' % ' '.join(kvm_argument_list))
    os.execv(qemu_path, kvm_argument_list)
    software/kvm/test/test.py
    View file @ d42c6b9a
    ......@@ -199,27 +199,72 @@ class KVMTestCase(InstanceTestCase):
    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 getRunningImageList(
    self,
    _match_cdrom=re.compile('file=(.+),media=cdrom$').match,
    _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:
    kvm_pid = next(q for q in instance_supervisor.getAllProcessInfo()
    if 'kvm-' in q['name'])['pid']
    sub_shared = re.compile(r'^%s/[^/]+/[0-9a-f]{32}/'
    % re.escape(self.slap.shared_directory)).sub
    image_list = []
    for entry in psutil.Process(kvm_pid).cmdline():
    m = _match_cdrom(entry)
    if m:
    path = m.group(1)
    image_list.append(
    _sub_iso(
    r'\1-${ver}\3',
    sub_shared(
    r'${shared}/',
    path.replace(kvm_instance_partition, '${inst}')
    )))
    return image_list
    def getConnectionParameterDictJson(self):
    return json.loads(
    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([
    os.path.join(self.computer_partition_root_path, hash_file)
    for hash_file in [
    'software_release/buildout.cfg',
    ]
    ])
    # find bin/kvm_raw
    kvm_raw_list = glob.glob(
    os.path.join(self.slap.instance_directory, '*', 'bin', 'kvm_raw'))
    self.assertEqual(1, len(kvm_raw_list)) # allow to work only with one
    kvm_partition = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference)
    hash_file_list = [
    kvm_raw_list[0],
    'software_release/buildout.cfg',
    ]
    os.path.join(kvm_partition, 'bin', 'kvm_raw')
    ] + kvm_additional_hash_file_list + [
    'software_release/buildout.cfg']
    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
    ])
    with self.slap.instance_supervisor_rpc as supervisor:
    ......@@ -234,7 +279,9 @@ class KvmMixin:
    with self.assertRaises(SlapOSNodeCommandError):
    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_type = self.getInstanceSoftwareType()
    return self.slap.request(
    ......@@ -251,7 +298,9 @@ class KvmMixinJson:
    return {
    '_': 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(
    parameter_dict={'_': json.dumps(parameter_dict)},
    *args, **kwargs
    ......@@ -261,6 +310,7 @@ class KvmMixinJson:
    @skipUnlessKvm
    class TestInstance(KVMTestCase, KvmMixin):
    __partition_reference__ = 'i'
    kvm_instance_partition_reference = 'i0'
    def test(self):
    connection_parameter_dict = self.getConnectionParameterDictJson()
    ......@@ -292,6 +342,8 @@ class TestInstance(KVMTestCase, KvmMixin):
    """i0:6tunnel-10022-{hash}-on-watch RUNNING
    i0:6tunnel-10080-{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:certificate_authority-{hash}-on-watch RUNNING
    i0:crond-{hash}-on-watch RUNNING
    ......@@ -303,7 +355,19 @@ i0:nginx-graceful EXITED
    i0:nginx-on-watch RUNNING
    i0:whitelist-domains-download-{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()
    )
    ......@@ -316,6 +380,7 @@ class TestInstanceJson(
    @skipUnlessKvm
    class TestMemoryManagement(KVMTestCase, KvmMixin):
    __partition_reference__ = 'i'
    kvm_instance_partition_reference = 'i0'
    def getKvmProcessInfo(self, switch_list):
    return_list = []
    ......@@ -353,7 +418,7 @@ class TestMemoryManagement(KVMTestCase, KvmMixin):
    self.assertNotEqual(kvm_pid_1, kvm_pid_2, "Unexpected: KVM not restarted")
    def tearDown(self):
    self.rerequestInstance({})
    self.rerequestInstance()
    self.slap.waitForInstance(max_retry=10)
    def test_enable_device_hotplug(self):
    ......@@ -484,6 +549,7 @@ class MonitorAccessMixin(KvmMixin):
    @skipUnlessKvm
    class TestAccessDefault(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'ad'
    kvm_instance_partition_reference = 'ad0'
    expected_partition_with_monitor_base_url_count = 1
    def test(self):
    ......@@ -505,6 +571,7 @@ class TestAccessDefaultJson(KvmMixinJson, TestAccessDefault):
    @skipUnlessKvm
    class TestAccessDefaultAdditional(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'ada'
    kvm_instance_partition_reference = 'ada0'
    expected_partition_with_monitor_base_url_count = 1
    @classmethod
    ......@@ -541,6 +608,7 @@ class TestAccessDefaultAdditionalJson(
    @skipUnlessKvm
    class TestAccessDefaultBootstrap(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'adb'
    kvm_instance_partition_reference = 'adb0'
    expected_partition_with_monitor_base_url_count = 1
    @classmethod
    ......@@ -589,6 +657,7 @@ class TestAccessDefaultBootstrap(MonitorAccessMixin, KVMTestCase):
    @skipUnlessKvm
    class TestAccessKvmCluster(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'akc'
    kvm_instance_partition_reference = 'akc0'
    expected_partition_with_monitor_base_url_count = 2
    @classmethod
    ......@@ -619,6 +688,7 @@ class TestAccessKvmCluster(MonitorAccessMixin, KVMTestCase):
    @skipUnlessKvm
    class TestAccessKvmClusterAdditional(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'akca'
    kvm_instance_partition_reference = 'akca0'
    expected_partition_with_monitor_base_url_count = 2
    @classmethod
    ......@@ -659,6 +729,7 @@ class TestAccessKvmClusterAdditional(MonitorAccessMixin, KVMTestCase):
    @skipUnlessKvm
    class TestAccessKvmClusterBootstrap(MonitorAccessMixin, KVMTestCase):
    __partition_reference__ = 'akcb'
    kvm_instance_partition_reference = 'akcb0'
    expected_partition_with_monitor_base_url_count = 3
    @classmethod
    ......@@ -702,6 +773,7 @@ class TestAccessKvmClusterBootstrap(MonitorAccessMixin, KVMTestCase):
    @skipUnlessKvm
    class TestInstanceResilient(KVMTestCase, KvmMixin):
    __partition_reference__ = 'ir'
    kvm_instance_partition_reference = 'ir0'
    instance_max_retry = 20
    @classmethod
    ......@@ -712,7 +784,8 @@ class TestInstanceResilient(KVMTestCase, KvmMixin):
    def setUpClass(cls):
    super().setUpClass()
    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'))
    def test_kvm_exporter(self):
    ......@@ -785,6 +858,8 @@ ir1:pbs_sshkeys_authority-on-watch RUNNING
    ir2:6tunnel-10022-{hash}-on-watch RUNNING
    ir2:6tunnel-10080-{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:certificate_authority-{hash}-on-watch RUNNING
    ir2:crond-{hash}-on-watch RUNNING
    ......@@ -812,7 +887,10 @@ ir3:resilient-web-takeover-httpd-on-watch RUNNING
    ir3:resilient_sshkeys_authority-on-watch RUNNING
    ir3:sshd-graceful EXITED
    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'
    ])
    )
    ......@@ -840,6 +918,7 @@ class TestInstanceResilientDiskTypeIdeJson(
    @skipUnlessKvm
    class TestAccessResilientAdditional(KVMTestCase):
    __partition_reference__ = 'ara'
    kvm_instance_partition_reference = 'ara0'
    expected_partition_with_monitor_base_url_count = 1
    @classmethod
    ......@@ -1350,7 +1429,6 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase):
    # variations
    key = 'boot-image-url-list'
    test_input = "%s#%s\n%s#%s"
    empty_input = ""
    image_directory = 'boot-image-url-list-repository'
    config_state_promise = 'boot-image-url-list-config-state-promise.py'
    download_md5sum_promise = 'boot-image-url-list-download-md5sum-promise.py'
    ......@@ -1384,11 +1462,8 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase):
    def tearDown(self):
    # clean up the instance for other tests
    # 1st remove all images...
    self.rerequestInstance({self.key: ''})
    self.slap.waitForInstance(max_retry=10)
    # 2nd ...move instance to "default" state
    self.rerequestInstance({})
    # move instance to "default" state
    self.rerequestInstance()
    self.slap.waitForInstance(max_retry=10)
    super().tearDown()
    ......@@ -1414,9 +1489,8 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase):
    [
    f'${{inst}}/srv/{self.image_directory}/{self.fake_image_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
    ......@@ -1435,17 +1509,13 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase):
    [
    f'${{inst}}/srv/{self.image_directory}/{self.fake_image3_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
    # reflected
    # Note: key is left and empty_input is provided, as otherwise the part
    # which generate images is simply removed, which can lead to
    # leftover
    self.rerequestInstance({self.key: self.empty_input})
    self.rerequestInstance()
    self.slap.waitForInstance(max_retry=10)
    self.assertEqual(
    os.listdir(image_repository),
    ......@@ -1454,26 +1524,11 @@ class TestBootImageUrlList(FakeImageServerMixin, KVMTestCase):
    # again only default image is available in the running process
    self.assertEqual(
    ['${shared}/debian-${ver}-amd64-netinst.iso'],
    self.getRunningImageList(kvm_instance_partition)
    )
    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])
    [
    '${inst}/srv/boot-image-url-select-repository/'
    '326b7737c4262e8eb09cd26773f3356a'
    ],
    self.getRunningImageList()
    )
    def test_bad_parameter(self):
    ......@@ -1542,36 +1597,60 @@ class TestBootImageUrlListResilientJson(
    @skipUnlessKvm
    class TestBootImageUrlSelect(TestBootImageUrlList):
    class TestBootImageUrlSelect(FakeImageServerMixin, KVMTestCase):
    __partition_reference__ = 'bius'
    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'
    download_md5sum_promise = 'boot-image-url-select-download-md5sum-promise.py'
    download_state_promise = 'boot-image-url-select-download-state-promise.py'
    bad_value = '["jsutbad"]'
    incorrect_md5sum_value_image = '["%s#"]'
    incorrect_md5sum_value = '["url#asdasd"]'
    single_image_value = '["%s#%s"]'
    unreachable_host_value = '["evennotahost#%s"]'
    too_many_image_value = """[
    "image1#11111111111111111111111111111111",
    "image2#22222222222222222222222222222222",
    "image3#33333333333333333333333333333333",
    "image4#44444444444444444444444444444444",
    "image5#55555555555555555555555555555555",
    "image6#66666666666666666666666666666666"
    ]"""
    def test_not_json(self):
    def test(self):
    # check the default image
    image_repository = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference,
    'srv', 'boot-image-url-select-repository')
    self.assertEqual(
    ['326b7737c4262e8eb09cd26773f3356a'],
    os.listdir(image_repository)
    )
    image = os.path.join(image_repository, '326b7737c4262e8eb09cd26773f3356a')
    self.assertTrue(os.path.exists(image))
    with open(image, 'rb') as fh:
    image_md5sum = hashlib.md5(fh.read()).hexdigest()
    self.assertEqual(image_md5sum, '326b7737c4262e8eb09cd26773f3356a')
    self.assertEqual(
    [
    '${inst}/srv/boot-image-url-select-repository/'
    '326b7737c4262e8eb09cd26773f3356a'
    ],
    self.getRunningImageList()
    )
    # switch the image
    self.rerequestInstance({
    '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({
    self.key: 'notjson#notjson'
    'boot-image-url-select': 'DOESNOTEXISTS'
    })
    self.raising_waitForInstance(3)
    self.assertPromiseFails(self.config_state_promise)
    ......@@ -1580,66 +1659,113 @@ class TestBootImageUrlSelect(TestBootImageUrlList):
    partition_parameter_kw = {
    'boot-image-url-list': "{}#{}".format(
    self.fake_image, self.fake_image_md5sum),
    'boot-image-url-select': '["{}#{}"]'.format(
    self.fake_image, self.fake_image_md5sum)
    'boot-image-url-select': "Debian Bullseye 11 netinst x86_64"
    }
    self.rerequestInstance(partition_parameter_kw)
    self.slap.waitForInstance(max_retry=10)
    # 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(
    self.slap.instance_directory, self.kvm_instance_partition_reference,
    'srv', image_directory)
    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)
    image_repository = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference,
    '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)
    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)
    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(
    self.slap.instance_directory, self.kvm_instance_partition_reference)
    self.assertEqual(
    [
    '${{inst}}/srv/boot-image-url-select-repository/{}'.format(
    '${{inst}}/srv/boot-image-url-list-repository/{}'.format(
    self.fake_image_md5sum),
    '${inst}/srv/boot-image-url-select-repository/'
    'b710c178eb434d79ce40ce703d30a5f0'
    ],
    self.getRunningImageList()
    )
    # check that using only boot-image-url-list results with not having
    # boot-image-url-select if nothing is provided
    partition_parameter_kw = {
    'boot-image-url-list': "{}#{}".format(
    self.fake_image, self.fake_image_md5sum),
    }
    self.rerequestInstance(partition_parameter_kw)
    self.slap.waitForInstance(max_retry=10)
    # check that image is correctly downloaded
    image_repository = os.path.join(
    self.slap.instance_directory, self.kvm_instance_partition_reference,
    '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)
    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),
    '${shared}/debian-${ver}-amd64-netinst.iso',
    ],
    self.getRunningImageList(kvm_instance_partition)
    self.getRunningImageList()
    )
    # cleanup of images works, also asserts that configuration changes are
    # reflected
    self.rerequestInstance(
    {'boot-image-url-list': '', 'boot-image-url-select': ''})
    self.slap.waitForInstance(max_retry=2)
    for image_directory in [
    'boot-image-url-list-repository', 'boot-image-url-select-repository']:
    image_repository = os.path.join(
    kvm_instance_partition, 'srv', image_directory)
    self.assertEqual(
    os.listdir(image_repository),
    []
    )
    self.rerequestInstance()
    self.slap.waitForInstance(max_retry=10)
    # cleanup of images works, also asserts that configuration changes are
    # reflected
    partition_parameter_kw[self.key] = ''
    partition_parameter_kw['boot-image-url-list'] = ''
    self.rerequestInstance(partition_parameter_kw)
    self.slap.waitForInstance(max_retry=2)
    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
    self.assertEqual(
    ['${shared}/debian-${ver}-amd64-netinst.iso'],
    self.getRunningImageList(kvm_instance_partition)
    [
    '${inst}/srv/boot-image-url-select-repository/'
    '326b7737c4262e8eb09cd26773f3356a'
    ],
    self.getRunningImageList()
    )
    ......@@ -2404,9 +2530,9 @@ class TestExternalDisk(KVMTestCase, ExternalDiskMixin):
    restarted_drive_list = self.getRunningDriveList(kvm_instance_partition)
    self.assertEqual(drive_list, restarted_drive_list)
    # prove that even on resetting parameters, drives are still there
    self.rerequestInstance({}, state='stopped')
    self.rerequestInstance(state='stopped')
    self.waitForInstance()
    self.rerequestInstance({})
    self.rerequestInstance()
    self.waitForInstance()
    dropped_drive_list = self.getRunningDriveList(kvm_instance_partition)
    self.assertEqual(drive_list, dropped_drive_list)
    ......@@ -2652,6 +2778,7 @@ class TestExternalDiskModernIndexRequired(KVMTestCase, ExternalDiskMixin):
    @skipUnlessKvm
    class TestInstanceHttpServer(KVMTestCase, KvmMixin):
    __partition_reference__ = 'ihs'
    kvm_instance_partition_reference = 'ihs0'
    @classmethod
    def startHttpServer(cls):
    ......@@ -2745,6 +2872,8 @@ vm""",
    """ihs0:6tunnel-10022-{hash}-on-watch RUNNING
    ihs0:6tunnel-10080-{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:certificate_authority-{hash}-on-watch RUNNING
    ihs0:crond-{hash}-on-watch RUNNING
    ......@@ -2757,7 +2886,10 @@ ihs0:nginx-graceful EXITED
    ihs0:nginx-on-watch RUNNING
    ihs0:whitelist-domains-download-{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(
    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