diff --git a/instances/templates/create_inst_block.html b/instances/templates/create_inst_block.html index fcb51a83..555fc4a1 100644 --- a/instances/templates/create_inst_block.html +++ b/instances/templates/create_inst_block.html @@ -34,7 +34,7 @@ {{ compute.cpu_count }}
-
@@ -43,7 +43,7 @@ {{ compute.ram_size|filesizeformat }}
-
{{ compute.ram_usage }}%
diff --git a/instances/templates/create_instance_w2.html b/instances/templates/create_instance_w2.html index 1c481742..b5f2ee09 100644 --- a/instances/templates/create_instance_w2.html +++ b/instances/templates/create_instance_w2.html @@ -104,9 +104,9 @@
{% csrf_token %}{% submission_key %}
- +
- @@ -116,9 +116,9 @@
{% if firmwares %}
- +
- {% for frm in firmwares %} {% endfor %} @@ -128,9 +128,9 @@ {% endif %} {% if dom_caps.cpu_modes %}
- +
- {% for mode in dom_caps.cpu_modes %} {% if mode == 'custom' %} @@ -150,10 +150,10 @@
{% endif %}
- +
- {% if storages %} {% for storage in storages %} @@ -165,9 +165,9 @@
- +
- {% for network in networks %} {% endfor %} @@ -177,22 +177,22 @@
-
- +
- +
- +
- {% for nwfilter in nwfilters %} @@ -201,9 +201,9 @@
- +
- {% for model in net_models_host %} {% endfor %} @@ -211,9 +211,9 @@
- +
- {% for mode, name in cache_modes %} @@ -222,9 +222,9 @@
- +
- {% if not videos %} @@ -236,9 +236,9 @@
- +
- {% for addr, label in listener_addr %} {% endfor %} @@ -246,9 +246,9 @@
- +
- {% for bus in cdrom_buses %}
- +
- {% for bus in input_device_buses %}
- +
- +
{% if virtio_support %}
- +
- +
{% endif %} @@ -324,14 +324,14 @@
{% csrf_token %}{% submission_key %}
- +
- +
{% if firmwares %}
- +
+
{% if dom_caps.cpu_modes %}
- +
- {% for mode in dom_caps.cpu_modes %} {% if mode == 'custom' %} @@ -371,9 +371,9 @@
{% endif %}
- +
- +
@@ -386,7 +386,7 @@
- +
+
- +
+ + + + @@ -506,7 +506,7 @@
- +
+
{% if virtio_support %}
- +
- +
{% endif %} @@ -555,16 +555,16 @@
{% csrf_token %}{% submission_key %}
- +
- +
{% if firmwares %}
- +
- {% for frm in firmwares %} {% endfor %} @@ -573,15 +573,15 @@
{% endif %}
- +
- +
- +
- {% for mode in dom_caps.cpu_modes %} {% if mode == 'custom' %} @@ -600,16 +600,16 @@
- +
- +
- +
- {% if storages %} {% for storage in storages %} @@ -627,7 +627,7 @@
- +
+ +
- +
- {% for mode, name in cache_modes %} @@ -681,9 +681,9 @@
- +
- {% for nwfilter in nwfilters %} @@ -692,9 +692,9 @@
- +
- {% for model in net_models_host %} {% endfor %} @@ -702,9 +702,9 @@
- +
- {% if not videos %} @@ -716,9 +716,9 @@
- +
- {% for addr, label in listener_addr %} {% endfor %} @@ -726,9 +726,9 @@
- +
- {% for bus in cdrom_buses %}
- +
- {% for bus in input_device_buses %}
- +
- +
{% if virtio_support %}
- +
- +
{% endif %} diff --git a/interfaces/templates/create_iface_block.html b/interfaces/templates/create_iface_block.html index 3cac2efe..432b8c78 100644 --- a/interfaces/templates/create_iface_block.html +++ b/interfaces/templates/create_iface_block.html @@ -16,15 +16,15 @@ {% csrf_token %}
- +
- +
- +
- @@ -32,9 +32,9 @@
- +
- {% for dev in netdevs %} {% endfor %} @@ -42,7 +42,7 @@
- +
+
- +
- +
@@ -84,7 +84,7 @@
- +
+
- +
- +
@@ -110,7 +110,7 @@
- +
+
- +
- +
diff --git a/networks/templates/create_net_block.html b/networks/templates/create_net_block.html index 20634b2f..0b79c182 100644 --- a/networks/templates/create_net_block.html +++ b/networks/templates/create_net_block.html @@ -16,13 +16,13 @@ {% csrf_token %}
- +
- +
- +
+
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/storages/templates/create_stg_block.html b/storages/templates/create_stg_block.html index c048b0a5..c5ed1a8a 100644 --- a/storages/templates/create_stg_block.html +++ b/storages/templates/create_stg_block.html @@ -47,22 +47,22 @@ {% csrf_token %}
- +
- +
- +
- +
- +
- +
@@ -76,22 +76,22 @@ {% csrf_token %}
- +
- +
- +
- +
- +
- +
@@ -105,40 +105,40 @@ {% csrf_token %}
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- {% if secrets %} {% for secret in secrets %} @@ -170,32 +170,32 @@ {% csrf_token %}
- +
- +
- +
- +
- +
- +
- +
- +
- +
+
@@ -226,17 +226,17 @@ {% csrf_token %}
- +
- +
- +
- +
diff --git a/templates/pleasewaitdialog.html b/templates/pleasewaitdialog.html index 2d514713..02ce2c0c 100644 --- a/templates/pleasewaitdialog.html +++ b/templates/pleasewaitdialog.html @@ -8,7 +8,7 @@
-
+
diff --git a/virtsecrets/templates/create_secret_block.html b/virtsecrets/templates/create_secret_block.html index 34b7003d..8ff145bb 100644 --- a/virtsecrets/templates/create_secret_block.html +++ b/virtsecrets/templates/create_secret_block.html @@ -16,27 +16,27 @@ {% csrf_token %}
- +
-
- +
-
- +
- {% for key, usage_type in secret_usage_types.items %} {% endfor %} @@ -44,9 +44,9 @@
- +
- +
diff --git a/webvirtcloud/tests/test_unique_ids.py b/webvirtcloud/tests/test_unique_ids.py index 1dc583ae..f694371d 100644 --- a/webvirtcloud/tests/test_unique_ids.py +++ b/webvirtcloud/tests/test_unique_ids.py @@ -37,6 +37,7 @@ class UniqueIdTests(TestCase): with patch("vrtManager.connection.connection_manager.get_connection", return_value=conn), \ patch("vrtManager.connection.wvmConnect.get_machine_types", return_value=["pc"]), \ patch("vrtManager.connection.wvmConnect.get_nwfilters", return_value=[]), \ + patch("vrtManager.connection.wvmConnect.get_cpu_modes", return_value=["host-model"]), \ patch.object(libvirt.virConnect, "getMemoryStats", return_value={"total": 8 << 20, "free": 4 << 20, "buffers": 0, "cached": 0}), \ patch.object(libvirt.virConnect, "getCPUStats", return_value={"kernel": 1, "idle": 1, "user": 1, "iowait": 0}): for name, keys in named_urls(get_resolver().url_patterns):