[CRIU] [PATCH 5/5] haul_type: Rename into htype
Pavel Emelyanov
xemul at parallels.com
Thu Oct 22 07:14:38 PDT 2015
Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
p.haul | 4 ++--
phaul/{p_haul_type.py => htype.py} | 0
phaul/iters.py | 4 ++--
phaul/service.py | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
rename phaul/{p_haul_type.py => htype.py} (100%)
diff --git a/p.haul b/p.haul
index 2677165..7dbb715 100755
--- a/p.haul
+++ b/p.haul
@@ -7,7 +7,7 @@ import phaul.iters
import phaul.connection
import phaul.images
import phaul.criu_api
-import phaul.p_haul_type
+import phaul.htype
# Usage idea
# p.haul <type> <id> --fdrpc <fd> --fdmem <fd> --fdfs <fd>
@@ -24,7 +24,7 @@ import phaul.p_haul_type
#
parser = argparse.ArgumentParser("Process HAULer")
-parser.add_argument("type", choices=phaul.p_haul_type.get_haul_names(),
+parser.add_argument("type", choices=phaul.htype.get_haul_names(),
help="Type of hat to haul, e.g. vz or lxc")
parser.add_argument("id", help="ID of what to haul")
parser.add_argument("--to", help="IP where to haul")
diff --git a/phaul/p_haul_type.py b/phaul/htype.py
similarity index 100%
rename from phaul/p_haul_type.py
rename to phaul/htype.py
diff --git a/phaul/iters.py b/phaul/iters.py
index 7f1351b..3c06b56 100644
--- a/phaul/iters.py
+++ b/phaul/iters.py
@@ -9,7 +9,7 @@ import xem_rpc_client
import pycriu
import criu_api
import criu_req
-import p_haul_type
+import htype
PRE_DUMP_AUTO_DETECT = None
PRE_DUMP_DISABLE = False
@@ -35,7 +35,7 @@ class phaul_iter_worker:
self.criu_connection = criu_api.criu_conn(self.connection.mem_sk)
self.img = images.phaul_images("dmp")
- self.htype = p_haul_type.get_src(p_type)
+ self.htype = htype.get_src(p_type)
if not self.htype:
raise Exception("No htype driver found")
diff --git a/phaul/service.py b/phaul/service.py
index 46b40e5..5e6183a 100644
--- a/phaul/service.py
+++ b/phaul/service.py
@@ -7,7 +7,7 @@ import xem_rpc
import images
import criu_api
import criu_req
-import p_haul_type
+import htype
class phaul_service:
def __init__(self, connection):
@@ -46,7 +46,7 @@ class phaul_service:
self.img = images.phaul_images("rst")
self.criu_connection = criu_api.criu_conn(self._mem_sk)
- self.htype = p_haul_type.get_dst(htype_id)
+ self.htype = htype.get_dst(htype_id)
# Create and start fs receiver if current p.haul module provide it
self.__fs_receiver = self.htype.get_fs_receiver(self._fs_sk)
--
1.9.3
More information about the CRIU
mailing list