@@ -55,41 +55,21 @@
{% if given %}
- {{ given.ratio|floatformat:1 }}:1
- {% blocktrans count counter=given.vcpus.all %}{{ counter }} vCPU{% plural %}{{ counter }} vCPUs{% endblocktrans %} {% blocktrans count counter=given.cpus %}on {{ counter }} CPU{% plural %}on {{ counter }} CPUs{% endblocktrans %}
- {% blocktrans with running=given.vcpus.running %}{{ running }} running{% endblocktrans %}
+ {% include "computes/capacity_vcpus.html" %}
- {% blocktrans with all=given.assigned.all|filesizeformat memory=given.memory|filesizeformat %}{{ all }} given of {{ memory }}{% endblocktrans %}
-
- {% blocktrans with running=given.assigned.running|filesizeformat %}{{ running }} of it running{% endblocktrans %}
+ {% include "computes/capacity_memory.html" %}
- {% if given.pool %}{% include "computes/pool_bar.html" with pool=given.pool %}{% endif %}
- {% if given.more_pools %}
-
- {% blocktrans count counter=given.more_pools|length %}{{ counter }} more pool{% plural %}{{ counter }} more pools{% endblocktrans %}
- {% for pool in given.more_pools %}
- {% include "computes/pool_bar.html" %}
- {% endfor %}
-
- {% endif %}
+ {% include "computes/capacity_storage.html" %}
{% else %}
{% if compute.status is True %}{% trans "The capacity could not be read." %}{% else %}{% trans "No capacity while the host cannot be reached." %}{% endif %}
{% endif %}
diff --git a/computes/templates/overview.html b/computes/templates/overview.html
index efc5a40e..fda5fcb3 100644
--- a/computes/templates/overview.html
+++ b/computes/templates/overview.html
@@ -5,97 +5,154 @@
{% block title %}{% trans "Overview" %} - {{ compute.name }}{% endblock %}
+{% block page_heading_extra %}
+{% bs_icon 'pencil' %} {% trans "Edit connection" %}
+{% bs_icon 'x-circle' %} {% trans "Remove from panel" %}
+{% endblock page_heading_extra %}
+
{% block page_heading %}{{ compute.name }}{% endblock page_heading %}
{% block content %}
-
- {% include "computes/host_nav.html" with section="overview" %}
-
+
+
+ {% if connected %}
+ {% trans "Connected" %}
+ {% else %}
+ {% trans "Not connected" %}
+ {% endif %}
+
+ {{ compute.hostname }}
+ {% if compute.details %}{{ compute.details }} {% endif %}
+
-
-
-
- {% trans "Hostname" %}
- {{ hostname }}
- {% trans "Hypervisors" %}
-
-
- {% for arch, hpv in hypervisor.items|slice:":4" %}
-
- {{ arch }}
-
-
- {% endfor %}
-
-
- {% if hypervisor.items|length > 4 %}
-
- {{ hypervisor.items|slice:"4:"|length }} {% trans 'more' %}...
-
-
- {% endif %}
-
-
- {% trans "Emulator" %}
- {{ emulator }}
- {% trans "Version" %}
-
- {% trans 'Qemu' %}
- {{ version }}
- {% trans 'Libvirt' %}
- {{ lib_version }}
-
- {% trans "Memory" %}
- {{ host_memory|filesizeformat }}
- {% trans "Architecture" %}
- {{ host_arch }}
- {% trans "Logical CPUs" %}
- {{ logical_cpu }}
- {% trans "Processor" %}
- {{ model_cpu }}
- {% trans "Connection" %}
- {{ uri_conn }}
- {% trans "Details" %}
- {{ compute.details }}
+{% include "computes/host_nav.html" with section="overview" %}
+
+{% if not connected %}
+
+{% else %}
+
+{% if read_error %}
+{% trans "The host's details could not be read:" %} {{ read_error }}
+{% endif %}
+
+
+{% if given %}
+
+
+
+
{% trans "VMs" %}
+
{{ given.vm_count }}
+
+ {% blocktrans with running=given.vms.running shutoff=given.vms.shutoff %}{{ running }} running, {{ shutoff }} shut off{% endblocktrans %}{% if given.vms.paused %}, {% blocktrans with paused=given.vms.paused %}{{ paused }} paused{% endblocktrans %}{% endif %}{% if given.vms.other %}, {% blocktrans with other=given.vms.other %}{{ other }} other{% endblocktrans %}{% endif %}
+
+
{% trans "Instances" %} →
+
+
+
+
+
{% trans "vCPUs" %}
+ {% include "computes/capacity_vcpus.html" %}
+
+
+
+
+
{% trans "Memory" %}
+ {% include "computes/capacity_memory.html" %}
+
+
+
+
{% trans "The capacity could not be read." %}
+{% endif %}
+
+{# the load is read on its own: shown also when the details could not be #}
+
+
+
+
+
{% trans "CPU in use" %} –
+
+
+
+
+
+
{% trans "Memory in use" %} –
+
+
+
+
+ {% trans "The last 10 readings, one every 5 seconds. Memory in use leaves out the host's buffers and cache." %}
+ {% trans "Waiting for the first reading." %}
+
+
+{% if host %}
+
+
+
+
+ {% trans "Hostname" %}
+ {{ host.hostname }}
+ {% trans "Architecture" %}
+ {{ host.arch }}
+ {% trans "Processor" %}
+ {{ host.processor|default:"–" }}
+ {% trans "Logical CPUs" %}
+ {{ host.topology.cpus }}
+ {% trans "Physical cores" %}
+ {{ host.topology.cores|default:"–" }}
+ {% trans "Sockets" %}
+ {{ host.topology.sockets|default:"–" }}
+ {% trans "NUMA nodes" %}
+ {{ host.topology.nodes|default:"–" }}
+ {% trans "Clock" %}
+ {{ host.topology.mhz }} MHz
+ {% trans "Memory" %}
+ {{ host.memory|filesizeformat }}
-
-
-
-
-
-
- {% bs_icon 'arrow-right' %}
- {% trans "CPU Utilization" %}
-
-
-
-
-
-
-
-
- {% bs_icon 'arrow-right'%} {% trans "RAM Utilization" %}
-
-
-
-
-
-
+
+
+
+ {% trans "Hypervisor" %}
+ {{ host.hypervisor }} {{ host.hypervisor_version }}
+ libvirt
+ {{ host.libvirt_version }}
+ {% trans "Emulator" %}
+ {{ host.emulator|default:"–" }}
+ {% trans "Guest architectures" %}
+
+ {% for arch, types in host.guest_archs.items %}
+ {{ arch }} ({{ types|join:", " }})
+ {% endfor %}
+
+ {% trans "Connection" %}
+ {{ host.uri }}
+
+
+
+
+
diff --git a/static/icon_cache/x-circle_None_None_None.svg b/static/icon_cache/x-circle_None_None_None.svg
new file mode 100644
index 00000000..cb45faf9
--- /dev/null
+++ b/static/icon_cache/x-circle_None_None_None.svg
@@ -0,0 +1,11 @@
+
+
+
+
+
diff --git a/vrtManager/hostdetails.py b/vrtManager/hostdetails.py
index 3de53687..08f30c65 100644
--- a/vrtManager/hostdetails.py
+++ b/vrtManager/hostdetails.py
@@ -1,11 +1,26 @@
import time
-from libvirt import VIR_DOMAIN_SHUTOFF, VIR_NODE_CPU_STATS_ALL_CPUS
+from libvirt import (
+ libvirtError,
+ VIR_DOMAIN_BLOCKED,
+ VIR_DOMAIN_PAUSED,
+ VIR_DOMAIN_RUNNING,
+ VIR_DOMAIN_SHUTOFF,
+ VIR_NODE_CPU_STATS_ALL_CPUS,
+)
from vrtManager.connection import wvmConnect
from vrtManager.util import get_xml_path
+# a VM's state as the host's VM counts group it; others count as "other"
+VM_STATES = {
+ VIR_DOMAIN_RUNNING: "running",
+ VIR_DOMAIN_BLOCKED: "running", # running, waiting on a resource
+ VIR_DOMAIN_PAUSED: "paused",
+ VIR_DOMAIN_SHUTOFF: "shutoff",
+}
+
# the times of virNodeGetCPUStats that add up to the elapsed CPU time; guest is
# already part of user and utilization is a percentage
CPU_TIMES = ("kernel", "user", "idle", "iowait")
@@ -78,23 +93,47 @@ class wvmHostDetails(wvmConnect):
info.append(self.host_info[0]) # architecture
info.append(self.host_info[1] * 1048576) # memory
info.append(self.host_info[2]) # cpu core count
- info.append(
- get_xml_path(self.wvm.getSysinfo(0), func=cpu_version)
- ) # cpu version
+ try:
+ info.append(get_xml_path(self.wvm.getSysinfo(0), func=cpu_version)) # cpu version
+ except libvirtError: # not every driver or host gives its sysinfo
+ info.append(None)
info.append(self.wvm.getURI()) # uri
return info
def get_capacity(self):
"""
What the host has given its VMs: vCPUs and memory (bytes) of all VMs
- and of the running ones, against its CPUs and memory. A shut-off VM
- takes its share again when it starts.
+ and of the running ones (paused ones too: they keep theirs), against
+ its CPUs and memory. A shut-off VM takes its share again when it
+ starts. Also its VMs by state: running, paused, shut off and other
+ (crashed, suspended, shutting down).
"""
vcpus = {"all": 0, "running": 0}
assigned = {"all": 0, "running": 0}
+ vms = {"running": 0, "paused": 0, "shutoff": 0, "other": 0}
for vm in self.get_host_instances(raw_mem_size=True).values():
for share in ("all",) if vm["status"] == VIR_DOMAIN_SHUTOFF else ("all", "running"):
vcpus[share] += int(vm["vcpu"])
assigned[share] += vm["memory"]
+ vms[VM_STATES.get(vm["status"], "other")] += 1
return {"cpus": self.host_info[2], "memory": self.host_info[1] * 1048576,
- "vcpus": vcpus, "assigned": assigned}
+ "vcpus": vcpus, "assigned": assigned, "vms": vms}
+
+ def get_cpu_topology(self):
+ """
+ The host's logical CPUs and MHz, and from the CPUs of its NUMA cells
+ in its capabilities, the NUMA nodes, sockets and physical cores (None
+ when it does not say). Not virNodeGetInfo's topology: it makes one up
+ for hosts it cannot describe, such as asymmetric NUMA.
+ """
+
+ def topology(doc):
+ cpus = doc.xpath("/capabilities/host/topology/cells/cell/cpus/cpu[@socket_id]")
+ return {
+ "nodes": len(doc.xpath("/capabilities/host/topology/cells/cell")) or None,
+ "sockets": len({cpu.get("socket_id") for cpu in cpus}) or None,
+ # a core is one within its socket and die
+ "cores": len({(cpu.get("socket_id"), cpu.get("die_id"), cpu.get("core_id")) for cpu in cpus}) or None,
+ }
+
+ return {**get_xml_path(self.get_cap_xml(), func=topology), "cpus": self.host_info[2], "mhz": self.host_info[3]}
diff --git a/vrtManager/tests/test_host_reads.py b/vrtManager/tests/test_host_reads.py
index 9ada59de..f544fb28 100644
--- a/vrtManager/tests/test_host_reads.py
+++ b/vrtManager/tests/test_host_reads.py
@@ -158,10 +158,35 @@ class CapacityTestCase(unittest.TestCase):
"cpus": 4, "memory": 2 * gib,
"vcpus": {"all": 14, "running": 6},
"assigned": {"all": 14 * gib, "running": 6 * gib},
+ "vms": {"running": 1, "paused": 1, "shutoff": 1, "other": 0},
})
conn.get_host_instances.assert_called_once_with(raw_mem_size=True)
+class CpuTopologyTestCase(unittest.TestCase):
+ """The topology comes from the capabilities' NUMA cells: getInfo makes
+ one up (one node, one socket, every CPU a core) for hosts it cannot
+ describe."""
+
+ def topology(self, cells):
+ conn = connection(wvmHostDetails)
+ conn.__dict__["host_info"] = ["x86_64", 65536, 16, 2400, 1, 1, 16, 1] # getInfo's made-up one
+ conn.get_cap_xml = lambda: f"{cells} "
+ + "".join(f" | " for node in range(2))
+ self.assertEqual(self.topology(cells), {"nodes": 2, "sockets": 2, "cores": 4, "cpus": 16, "mhz": 2400})
+
+ def test_a_host_that_does_not_say_has_no_sockets_or_cores(self):
+ cells = " | "
+ self.assertEqual(self.topology(cells), {"nodes": 1, "sockets": None, "cores": None, "cpus": 16, "mhz": 2400})
+
+
class StoragesInfoTestCase(unittest.TestCase):
def test_each_pool_tells_its_free_space(self):
conn = connection(wvmStorages)