From 18bf85b1fb263a44ae537d7bf3e6f9f1228ce7f1 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 24 Nov 2011 14:17:34 +0100
Subject: [PATCH] =?UTF-8?q?hv=5Fxen:=20Use=20constant=20for=20=E2=80=9CDom?=
=?UTF-8?q?ain-0=E2=80=9D=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
lib/hypervisor/hv_xen.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/hypervisor/hv_xen.py b/lib/hypervisor/hv_xen.py
index 0ee5da705..a563e9373 100644
--- a/lib/hypervisor/hv_xen.py
+++ b/lib/hypervisor/hv_xen.py
@@ -37,6 +37,7 @@ from ganeti import objects
XEND_CONFIG_FILE = "/etc/xen/xend-config.sxp"
XL_CONFIG_FILE = "/etc/xen/xl.conf"
VIF_BRIDGE_SCRIPT = "/etc/xen/scripts/vif-bridge"
+_DOM0_NAME = "Domain-0"
class XenHypervisor(hv_base.BaseHypervisor):
@@ -196,7 +197,7 @@ class XenHypervisor(hv_base.BaseHypervisor):
" line: %s, error: %s" % (line, err))
# skip the Domain-0 (optional)
- if include_node or data[0] != "Domain-0":
+ if include_node or data[0] != _DOM0_NAME:
result.append(data)
return result
@@ -217,7 +218,7 @@ class XenHypervisor(hv_base.BaseHypervisor):
@return: tuple (name, id, memory, vcpus, stat, times)
"""
- xm_list = self._GetXMList(instance_name == "Domain-0")
+ xm_list = self._GetXMList(instance_name == _DOM0_NAME)
result = None
for data in xm_list:
if data[0] == instance_name:
@@ -352,7 +353,7 @@ class XenHypervisor(hv_base.BaseHypervisor):
threads_per_core is not None and nr_cpus is not None):
result["cpu_sockets"] = nr_cpus / (cores_per_socket * threads_per_core)
- dom0_info = self.GetInstanceInfo("Domain-0")
+ dom0_info = self.GetInstanceInfo(_DOM0_NAME)
if dom0_info is not None:
result["memory_dom0"] = dom0_info[2]
--
GitLab