From d59b138182e8a929a599f2b95455d0656be5fbfa Mon Sep 17 00:00:00 2001
From: gengchc2 <geng.changcai2@zte.com.cn>
Date: Tue, 4 Dec 2018 18:13:37 -0800
Subject: [PATCH] Modify a few bugs for supporting ftp/ftps

Change-Id: Ia0cd1a3561097f543cab932bf34cd8161754a0d4
---
 freezer/engine/nova/nova.py  |  2 --
 freezer/openstack/restore.py | 32 ++++++++++++++++++++++++++++++--
 freezer/storage/ftp.py       |  1 -
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/freezer/engine/nova/nova.py b/freezer/engine/nova/nova.py
index cda69cf6..dd5fc4b7 100644
--- a/freezer/engine/nova/nova.py
+++ b/freezer/engine/nova/nova.py
@@ -90,7 +90,6 @@ class NovaEngine(engine.BackupEngine):
             with open(file.name) as f:
                 data = f.readline()
             LOG.info("get_nova_tenant download {0}".format(data))
-            file.close()
 
         return json.loads(data)
 
@@ -208,7 +207,6 @@ class NovaEngine(engine.BackupEngine):
                 f.write(data)
             LOG.info("backup_nova_tenant data={0}".format(data))
             self.storage.put_file(file.name, backup_basepath)
-            file.close()
 
         executor = futures.ThreadPoolExecutor(
             max_workers=len(instance_ids))
diff --git a/freezer/openstack/restore.py b/freezer/openstack/restore.py
index c951246b..02fed4fb 100644
--- a/freezer/openstack/restore.py
+++ b/freezer/openstack/restore.py
@@ -19,6 +19,8 @@ Freezer restore modes related functions
 
 import json
 import os
+import shutil
+import tempfile
 import time
 
 from oslo_config import cfg
@@ -62,7 +64,7 @@ class RestoreOs(object):
         elif self.storage.type == "local":
             path = "{0}/{1}".format(self.container, path)
             backups = os.listdir(os.path.abspath(path))
-        elif self.storage.type in ["ssh", 'ftp', 'ftps']:
+        elif self.storage.type in ['ssh', 'ftp', 'ftps']:
             path = "{0}/{1}".format(self.container, path)
             backups = self.storage.listdir(path)
         else:
@@ -161,7 +163,7 @@ class RestoreOs(object):
                 disk_format="raw",
                 data=data)
             return info, image
-        elif self.storage.type in ['ssh', 'ftp', 'ftps']:
+        elif self.storage.type == 'ssh':
             image_file = "{0}/{1}/{2}/{3}".format(self.container, path,
                                                   backup, path)
             metadata_file = "{0}/{1}/{2}/metadata".format(self.container,
@@ -179,6 +181,32 @@ class RestoreOs(object):
                 disk_format="raw",
                 data=data)
             return info, image
+        elif self.storage.type in ['ftp', 'ftps']:
+            image_file = "{0}/{1}/{2}/{3}".format(self.container, path,
+                                                  backup, path)
+            metadata_file = "{0}/{1}/{2}/metadata".format(self.container,
+                                                          path, backup)
+            try:
+                tmpdir = tempfile.mkdtemp()
+            except Exception:
+                LOG.error("Unable to create a tmp directory")
+                raise
+            try:
+                data_image = utils.path_join(tmpdir, "data_image")
+                LOG.info('create image restore ftp storage')
+                self.storage.get_file(image_file, data_image)
+                data_meta = utils.path_join(tmpdir, "data_meta")
+                self.storage.get_file(metadata_file, data_meta)
+                data = open(data_image, 'rb')
+                info = json.load(open(data_meta, 'r'))
+                image = self.client_manager.create_image(
+                    name="restore_{}".format(path),
+                    container_format="bare",
+                    disk_format="raw",
+                    data=data)
+                return info, image
+            finally:
+                shutil.rmtree(tmpdir)
         else:
             return {}
 
diff --git a/freezer/storage/ftp.py b/freezer/storage/ftp.py
index 9d090a3a..53f7eb70 100644
--- a/freezer/storage/ftp.py
+++ b/freezer/storage/ftp.py
@@ -74,7 +74,6 @@ class BaseFtpStorage(fslike.FsLikeStorage):
     def _create_tempdir(self):
         try:
             tmpdir = tempfile.mkdtemp()
-            LOG.info("****mkdir****")
         except Exception:
             LOG.error("Unable to create a tmp directory")
             raise