6:17 p.m.
This patch removes all __METHOD and _METHOD functions calls. Since it is not
intended that virt-sandbox-service will be imported into another python module,
there is limited value to using the internal indicators.
Signed-off-by: Dan Walsh <dwalsh(a)redhat.com>
---
bin/virt-sandbox-service | 118 +++++++++++++++++++++++------------------------
1 file changed, 59 insertions(+), 59 deletions(-)
diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service
index 8788183..43158de 100755
--- a/bin/virt-sandbox-service
+++ b/bin/virt-sandbox-service
@@ -103,7 +103,7 @@ class Container:
except GLib.GError, e:
raise OSError(config + ": " + str(e))
- def __follow_units(self):
+ def follow_units(self):
unitst=""
for i, src in self.unit_file_list:
unitst += "ReloadPropagatedFrom=%s\n" % i
@@ -118,17 +118,17 @@ class Container:
def set_unit_file_list(self, unit_file_list):
self.unit_file_list = unit_file_list
- def __get_sandboxed_service(self):
+ def get_sandboxed_service(self):
return self.unit_file_list[0][0].split(".")[0]
- def __get_sandbox_target(self):
+ def get_sandbox_target(self):
if len(self.unit_file_list) > 1:
raise ValueError([_("Only Valid for single units")])
- return "%s_sandbox.target" % self.__get_sandboxed_service()
+ return "%s_sandbox.target" % self.get_sandboxed_service()
- def __target(self):
+ def target(self):
try:
- name = self.__get_sandbox_target()
+ name = self.get_sandbox_target()
path = "/etc/systemd/system/" + name
if not os.path.exists(path):
fd = open(path, "w")
@@ -147,12 +147,12 @@ Documentation=man:virt-sandbox-service(1)
[Install]
WantedBy=multi-user.target
-""" % { "NAME" : self.__get_sandboxed_service() })
+""" % { "NAME" : self.get_sandboxed_service() })
return "%s" % name
except OSError:
return ""
- def __create_system_unit(self):
+ def create_system_unit(self):
self.unitfile = self.get_unit_path()
name = self.config.get_name()
unit = r"""
@@ -169,7 +169,7 @@ ExecStop=/usr/bin/virt-sandbox-service stop %(NAME)s
[Install]
WantedBy=%(TARGET)s
-""" % { 'NAME':name, 'FOLLOW':self.__follow_units(),
'TARGET':self.__target(), 'RELOAD': " -u ".join(map(lambda x:
x[0], self.unit_file_list)) }
+""" % { 'NAME':name, 'FOLLOW':self.follow_units(),
'TARGET':self.target(), 'RELOAD': " -u ".join(map(lambda x:
x[0], self.unit_file_list)) }
fd = open(self.unitfile, "w")
fd.write(unit)
fd.close()
@@ -181,7 +181,7 @@ WantedBy=%(TARGET)s
raise OSError(_("Failed to enable %s unit file") % self.unitfile)
sys.stdout.write(_("Created unit file %s\n") % self.unitfile)
- def __add_dir(self, newd):
+ def add_dir(self, newd):
if newd in self.all_dirs:
return
for ignd in self.IGNORE_DIRS:
@@ -200,7 +200,7 @@ WantedBy=%(TARGET)s
self.dirs.append(newd)
break;
- def __add_file(self, newf):
+ def add_file(self, newf):
if newf in self.files:
return
for d in self.IGNORE_DIRS:
@@ -280,7 +280,7 @@ WantedBy=%(TARGET)s
self.dest = "%s/%s" % (self.path, self.name)
self.config = LibvirtSandbox.ConfigService.new(name)
- def __extract_rpms(self):
+ def extract_rpms(self):
self.all_dirs = []
self.dirs = []
self.files = []
@@ -288,9 +288,9 @@ WantedBy=%(TARGET)s
self.ts = rpm.ts()
for u, src in self.unit_file_list:
- self.__extract_rpm_for_unit(src)
+ self.extract_rpm_for_unit(src)
- def __split_filename(self, filename):
+ def split_filename(self, filename):
if filename[-4:] == '.rpm':
filename = filename[:-4]
@@ -312,7 +312,7 @@ WantedBy=%(TARGET)s
name = filename[epochIndex + 1:verIndex]
return name, ver, rel, epoch, arch
- def __extract_rpm_for_unit(self, unitfile):
+ def extract_rpm_for_unit(self, unitfile):
mi = self.ts.dbMatch(rpm.RPMTAG_BASENAMES, unitfile)
try:
h = mi.next();
@@ -323,12 +323,12 @@ WantedBy=%(TARGET)s
fname = fentry[0]
if os.path.isdir(fname):
- self.__add_dir(fname)
+ self.add_dir(fname)
if os.path.isfile(fname):
- self.__add_file(fname)
+ self.add_file(fname)
srcrpm = h[rpm.RPMTAG_SOURCERPM]
- srcrpmbits = self.__split_filename(srcrpm)
+ srcrpmbits = self.split_filename(srcrpm)
if srcrpmbits[0] == h[rpm.RPMTAG_NAME]:
return
@@ -343,11 +343,11 @@ WantedBy=%(TARGET)s
fname = fentry[0]
if os.path.isdir(fname):
- self.__add_dir(fname)
+ self.add_dir(fname)
if os.path.isfile(fname):
- self.__add_file(fname)
+ self.add_file(fname)
- def __add_mount(self, source, dest):
+ def add_mount(self, source, dest):
mount = LibvirtSandbox.ConfigMountHostBind.new(source, dest)
self.config.add_mount(mount)
@@ -376,7 +376,7 @@ WantedBy=%(TARGET)s
os.symlink(self.dest + jpath, jpath)
- def __gen_filesystems(self):
+ def gen_filesystems(self):
if self.use_image:
self.image = self.DEFAULT_IMAGE % self.get_name()
mount = LibvirtSandbox.ConfigMountHostImage.new(self.image, self.dest)
@@ -397,12 +397,12 @@ WantedBy=%(TARGET)s
for d in self.BIND_SYSTEM_DIRS:
if os.path.exists(d):
source = "%s%s" % ( self.dest, d)
- self.__add_mount(source, d)
+ self.add_mount(source, d)
for f in self.BIND_SYSTEM_FILES:
if os.path.exists(f):
source = "%s%s" % ( self.dest, f)
- self.__add_mount(source, f)
+ self.add_mount(source, f)
for d in self.dirs:
found = False
@@ -413,12 +413,12 @@ WantedBy=%(TARGET)s
break
if not found:
source = "%s%s" % ( self.dest, d)
- self.__add_mount(source, d)
+ self.add_mount(source, d)
- def __get_init_path(self):
+ def get_init_path(self):
return "%s/%s/init" % (self.path, self.get_name())
- def __create_container_unit(self, src, dest, unit):
+ def create_container_unit(self, src, dest, unit):
fd = open(dest + "/" + unit, "w")
fd.write(""".include %s
[Service]
@@ -427,7 +427,7 @@ PrivateNetwork=false
""" % src )
fd.close()
- def __fix_stat(self, f):
+ def fix_stat(self, f):
try:
s = os.stat(f)
path = "%s%s" % (self.dest, f)
@@ -437,15 +437,15 @@ PrivateNetwork=false
if not e.errno == errno.ENOENT:
raise e
- def __fix_protection(self):
+ def fix_protection(self):
l = len(self.dest)
for root, dirs, files in os.walk(self.dest):
for f in files:
dest = root + "/" + f
- self.__fix_stat(dest[l:])
+ self.fix_stat(dest[l:])
for d in dirs:
dest = root + "/" + d
- self.__fix_stat(dest[l:])
+ self.fix_stat(dest[l:])
def makedirs(self, d):
try:
@@ -465,7 +465,7 @@ PrivateNetwork=false
if not e.errno == errno.EEXIST:
raise e
- def __gen_content(self):
+ def gen_content(self):
if self.copy:
for d in self.dirs:
shutil.copytree(d, "%s%s" % (self.dest, d), symlinks=True)
@@ -505,7 +505,7 @@ PrivateNetwork=false
os.symlink("/run", self.dest + "/var/run")
for i, src in self.unit_file_list:
- self.__create_container_unit(src, self.dest + unitdir, i)
+ self.create_container_unit(src, self.dest + unitdir, i)
os.symlink("../" + i, self.dest + tgtdir + "/" + i)
tgtfile = unitdir + "/multi-user.target"
@@ -522,15 +522,15 @@ PrivateNetwork=false
profile = "/etc/skel/" + p
shutil.copy(profile, self.dest + "/root/")
- self.__fix_protection()
+ self.fix_protection()
- def __umount(self):
+ def umount(self):
p = Popen(["/bin/umount", self.dest])
p.communicate()
if p.returncode and p.returncode != 0:
raise OSError(_("Failed to unmount image %s from %s") %
(self.image, self.dest))
- def __create_image(self):
+ def create_image(self):
fd = open(self.image, "w")
fd.truncate(self.size)
fd.close()
@@ -553,7 +553,7 @@ PrivateNetwork=false
selinux.restorecon(config)
sys.stdout.write(_("Created sandbox config %s\n") % config)
- def __get_image_path(self):
+ def get_image_path(self):
mounts = self.config.get_mounts()
for m in mounts:
if type(m) != LibvirtSandbox.ConfigMountHostImage:
@@ -563,7 +563,7 @@ PrivateNetwork=false
return m.get_source()
return None
- def _delete(self):
+ def delete(self):
# Should be stored in config
try:
fd=open(self.dest + self.MACHINE_ID, "r")
@@ -577,7 +577,7 @@ PrivateNetwork=false
if os.path.exists(self.dest):
shutil.rmtree(self.dest)
- mount_path = self.__get_image_path()
+ mount_path = self.get_image_path()
if mount_path:
os.remove(mount_path)
@@ -615,36 +615,36 @@ PrivateNetwork=false
except:
pass
- self._delete()
+ self.delete()
- def _create(self):
- self.__connect()
+ def create_service(self):
+ self.connect()
self.config.set_shell(True)
self.config.set_boot_target("multi-user.target")
- self.__extract_rpms()
- self.__gen_filesystems()
+ self.extract_rpms()
+ self.gen_filesystems()
os.mkdir(self.dest)
if self.image:
- self.__create_image()
- self.__gen_content()
- self.__umount()
+ self.create_image()
+ self.gen_content()
+ self.umount()
sys.stdout.write(_("Created sandbox container image %s\n") %
self.image)
else:
- self.__gen_content()
+ self.gen_content()
sys.stdout.write(_("Created sandbox container dir %s\n") %
self.dest)
self.set_security_label()
self.save_config()
- self.__create_system_unit()
+ self.create_system_unit()
def create(self):
if os.path.exists(self.dest):
raise OSError(_("%s already exists") % self.dest)
try:
- self._create()
+ self.create_service()
except Exception, e:
try:
- self._delete()
+ self.delete()
except Exception, e2:
pass
raise e
@@ -662,12 +662,12 @@ PrivateNetwork=false
args.command = [ "systemctl", "reload" ] + map(lambda x:
x[0], unitfiles)
execute(args)
- def __connect(self):
+ def connect(self):
if not self.conn:
self.conn=LibvirtGObject.Connection.new(self.uri)
self.conn.open(None)
- def __disconnect(self):
+ def disconnect(self):
if self.conn:
self.conn.close()
self.conn = None
@@ -676,10 +676,10 @@ PrivateNetwork=false
def closed(obj, error):
self.loop.quit()
try:
- self.__connect()
+ self.connect()
context = LibvirtSandbox.ContextService.new(self.conn, self.config)
context.attach()
- self.__disconnect()
+ self.disconnect()
return 1
except GLib.GError, e:
return 0
@@ -689,7 +689,7 @@ PrivateNetwork=false
self.loop.quit()
try:
- self.__connect()
+ self.connect()
context = LibvirtSandbox.ContextService.new(self.conn, self.config)
context.start()
console = context.get_log_console()
@@ -710,7 +710,7 @@ PrivateNetwork=false
def stop(self):
try:
- self.__connect()
+ self.connect()
context = LibvirtSandbox.ContextService.new(self.conn, self.config)
context.attach()
context.stop()
@@ -722,7 +722,7 @@ PrivateNetwork=false
self.loop.quit()
try:
- self.__connect()
+ self.connect()
context = LibvirtSandbox.ContextService.new(self.conn, self.config)
context.attach()
console = context.get_shell_console()
@@ -742,7 +742,7 @@ PrivateNetwork=false
self.loop.quit()
try:
- self.__connect()
+ self.connect()
context = LibvirtSandbox.ContextService.new(self.conn, self.config)
context.attach()
console = context.get_shell_console()
--
1.8.2