Merge remote-tracking branch 'origin/pr/786'

* origin/pr/786:
  Add label to test_010
  Add label to vm_events
  Add label to system_info

Pull request description:

This is necessary to display qube colors in qrexec-policy-graph (QubesOS/qubes-core-qrexec#222).

Author: marmarek

qubes/api/internal.py

@@ -53,6 +53,8 @@ class SystemInfoCache:
         "property-reset:default_dispvm",
         "property-set:icon",
         "property-reset:icon",
+        "property-set:label",
+        "property-reset:label",
         "property-set:guivm",
         "property-reset:guivm",
         "property-set:relayvm",
@@ -131,6 +133,7 @@ def get_system_info(cls, app):
                         else None
                     ),
                     "icon": str(domain.label.icon),
+                    "label": str(domain.label.color),
                     "guivm": (
                         domain.guivm.name
                         if getattr(domain, "guivm", None)

qubes/tests/api_internal.py

@@ -221,6 +221,7 @@ def test_010_get_system_info(self):
         self.dom0.default_dispvm = None
         self.dom0.template_for_dispvms = False
         self.dom0.label.icon = "icon-dom0"
+        self.dom0.label.color = "0xffffff"
         self.dom0.get_power_state.return_value = "Running"
         self.dom0.uuid = uuid.UUID("00000000-0000-0000-0000-000000000000")
         del self.dom0.guivm
@@ -232,6 +233,7 @@ def test_010_get_system_info(self):
         vm.default_dispvm = vm
         vm.template_for_dispvms = True
         vm.label.icon = "icon-vm"
+        vm.label.color = "0xcc0000"
         vm.guivm = vm
         vm.get_power_state.return_value = "Halted"
         vm.uuid = TEST_UUID
@@ -246,6 +248,7 @@ def test_010_get_system_info(self):
                     "template_for_dispvms": False,
                     "icon": "icon-dom0",
                     "internal": None,
+                    "label": "0xffffff",
                     "guivm": None,
                     "power_state": "Running",
                     "relayvm": None,
@@ -259,6 +262,7 @@ def test_010_get_system_info(self):
                     "template_for_dispvms": True,
                     "icon": "icon-vm",
                     "internal": 1,
+                    "label": "0xcc0000",
                     "guivm": "vm",
                     "power_state": "Halted",
                     "relayvm": None,