From faecd53622b233f72961ce626ef70788b8a12562 Mon Sep 17 00:00:00 2001
From: Peter Barabas <peter.barabas@ericsson.com>
Date: Tue, 8 Dec 2015 13:05:57 +0100
Subject: Refactor temporary directory creation

Use Python's tempfile instead of forking a shell for mktemp.

Change-Id: Icba442ea08d4098d67fb51575da16e85d4363beb
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
---
 deploy/dha_adapters/libvirt_adapter.py     | 3 ++-
 deploy/environments/libvirt_environment.py | 3 ++-
 deploy/environments/virtual_fuel.py        | 3 ++-
 deploy/reap.py                             | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'deploy')

diff --git a/deploy/dha_adapters/libvirt_adapter.py b/deploy/dha_adapters/libvirt_adapter.py
index d6a30d75e..c65dab554 100644
--- a/deploy/dha_adapters/libvirt_adapter.py
+++ b/deploy/dha_adapters/libvirt_adapter.py
@@ -10,6 +10,7 @@
 
 from lxml import etree
 from hardware_adapter import HardwareAdapter
+import tempfile
 
 from common import (
     log,
@@ -60,7 +61,7 @@ class LibvirtAdapter(HardwareAdapter):
     def node_set_boot_order(self, node_id, boot_order_list):
         boot_order_list = self.translate(boot_order_list)
         vm_name = self.get_node_property(node_id, 'libvirtName')
-        temp_dir = exec_cmd('mktemp -d')
+        temp_dir = tempfile.mkdtemp()
         log('Set boot order %s on Node %s' % (boot_order_list, vm_name))
         resp = exec_cmd('virsh dumpxml %s' % vm_name)
         xml_dump = etree.fromstring(resp, self.parser)
diff --git a/deploy/environments/libvirt_environment.py b/deploy/environments/libvirt_environment.py
index af2d3f8fb..c8a2ef529 100644
--- a/deploy/environments/libvirt_environment.py
+++ b/deploy/environments/libvirt_environment.py
@@ -11,6 +11,7 @@
 from lxml import etree
 import glob
 from execution_environment import ExecutionEnvironment
+import tempfile
 
 from common import (
     exec_cmd,
@@ -42,7 +43,7 @@ class LibvirtEnvironment(ExecutionEnvironment):
         exec_cmd('fallocate -l %s %s' % (disk_size, disk_path))
 
     def create_vms(self):
-        temp_dir = exec_cmd('mktemp -d')
+        temp_dir = tempfile.mkdtemp()
         disk_sizes = self.dha.get_disks()
         for node_id in self.node_ids:
             vm_name = self.dha.get_node_property(node_id, 'libvirtName')
diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py
index 705eee48b..89a82c078 100644
--- a/deploy/environments/virtual_fuel.py
+++ b/deploy/environments/virtual_fuel.py
@@ -10,6 +10,7 @@
 
 from lxml import etree
 from execution_environment import ExecutionEnvironment
+import tempfile
 
 from common import (
     exec_cmd,
@@ -45,7 +46,7 @@ class VirtualFuel(ExecutionEnvironment):
             vm_xml.write(f, pretty_print=True, xml_declaration=True)
 
     def create_vm(self):
-        temp_dir = exec_cmd('mktemp -d')
+        temp_dir = tempfile.mkdtemp()
         vm_name = self.dha.get_node_property(self.fuel_node_id, 'libvirtName')
         vm_template = '%s/%s' % (self.root_dir,
                                  self.dha.get_node_property(
diff --git a/deploy/reap.py b/deploy/reap.py
index b7080cdae..51e7cb658 100644
--- a/deploy/reap.py
+++ b/deploy/reap.py
@@ -13,6 +13,7 @@ import os
 import yaml
 import glob
 import shutil
+import tempfile
 
 from common import (
     N,
@@ -282,7 +283,7 @@ class Reap(object):
     def intro(self):
         delete(self.dea_file)
         delete(self.dha_file)
-        self.temp_dir = exec_cmd('mktemp -d')
+        self.temp_dir = tempfile.mkdtemp()
         date = time.strftime('%c')
         self.write(self.dea_file,
                    DEA_1.format(date=date, comment=self.comment), False)
-- 
cgit 1.2.3-korg