From 73cd67f4a70473f842978d451c7bf1f3ca3b3d86 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 27 Jan 2009 16:44:38 +0000
Subject: [PATCH] Xen: use utils.WriteFile for the instance configs
Also raise HypervisorError rather than OpExecError.
Reviewed-by: iustinp
---
lib/hypervisor/hv_xen.py | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/lib/hypervisor/hv_xen.py b/lib/hypervisor/hv_xen.py
index 8007a5bd2..506f200b1 100644
--- a/lib/hypervisor/hv_xen.py
+++ b/lib/hypervisor/hv_xen.py
@@ -458,14 +458,13 @@ class XenPvmHypervisor(XenHypervisor):
# just in case it exists
utils.RemoveFile("/etc/xen/auto/%s" % instance.name)
try:
- f = open("/etc/xen/%s" % instance.name, "w")
- try:
- f.write(config.getvalue())
- finally:
- f.close()
- except IOError, err:
- raise errors.OpExecError("Cannot write Xen instance confile"
- " file /etc/xen/%s: %s" % (instance.name, err))
+ utils.WriteFile("/etc/xen/%s" % instance.name,
+ data=config.getvalue())
+ except EnvironmentError, err:
+ raise errors.HypervisorError("Cannot write Xen instance confile"
+ " file /etc/xen/%s: %s" %
+ (instance.name, err))
+
return True
@@ -637,12 +636,11 @@ class XenHvmHypervisor(XenHypervisor):
# just in case it exists
utils.RemoveFile("/etc/xen/auto/%s" % instance.name)
try:
- f = open("/etc/xen/%s" % instance.name, "w")
- try:
- f.write(config.getvalue())
- finally:
- f.close()
- except IOError, err:
- raise errors.OpExecError("Cannot write Xen instance confile"
- " file /etc/xen/%s: %s" % (instance.name, err))
+ utils.WriteFile("/etc/xen/%s" % instance.name,
+ data=config.getvalue())
+ except EnvironmentError, err:
+ raise errors.HypervisorError("Cannot write Xen instance confile"
+ " file /etc/xen/%s: %s" %
+ (instance.name, err))
+
return True
--
GitLab