andrewschleifer/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

finish type, shrink path

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-05 16:12:25 +02:00
parent 2176e4e2d4
commit 68889c4bf7
2 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/cdist/path.py
View file

@ -171,30 +171,11 @@ class Path:
"""Return list of available explorers""" """Return list of available explorers"""
return os.listdir(self.global_explorer_dir) return os.listdir(self.global_explorer_dir)
# FIXME: Type - only needs to know its path
def list_type_explorers(self, type):
"""Return list of available explorers for a specific type"""
dir = self.type_dir(type, "explorer")
if os.path.isdir(dir):
list = os.listdir(dir)
else:
list = []
log.debug("Explorers for %s in %s: %s", type, dir, list)
return list
# Stays here # Stays here
def list_types(self): def list_types(self):
"""Retuns list of types""" """Retuns list of types"""
return os.listdir(self.type_base_dir) return os.listdir(self.type_base_dir)
# FIXME: type
def is_install_type(self, type):
"""Check whether a type is used for installation (if not: for configuration)"""
marker = os.path.join(self.type_dir(type), "install")
return os.path.isfile(marker)
# Stays here # Stays here
def list_object_paths(self, starting_point): def list_object_paths(self, starting_point):
"""Return list of paths of existing objects""" """Return list of paths of existing objects"""
@ -260,16 +241,6 @@ class Path:
return objects return objects
# FIXME: Type
def type_dir(self, type, *args):
"""Return (sub-)directory of a type"""
return os.path.join(self.type_base_dir, type, *args)
# FIXME: Type
def remote_type_explorer_dir(self, type):
"""Return remote directory that holds the explorers of a type"""
return os.path.join(REMOTE_TYPE_DIR, type, "explorer")
# Stays here # Stays here
def transfer_object_parameter(self, cdist_object): def transfer_object_parameter(self, cdist_object):
"""Transfer the object parameter to the remote destination""" """Transfer the object parameter to the remote destination"""
@ -286,7 +257,7 @@ class Path:
self.remote_mkdir(REMOTE_GLOBAL_EXPLORER_DIR) self.remote_mkdir(REMOTE_GLOBAL_EXPLORER_DIR)
self.transfer_dir(self.global_explorer_dir, REMOTE_GLOBAL_EXPLORER_DIR) self.transfer_dir(self.global_explorer_dir, REMOTE_GLOBAL_EXPLORER_DIR)
# Stays here # Stays here - FIXME: adjust to type code, loop over types!
def transfer_type_explorers(self, type): def transfer_type_explorers(self, type):
"""Transfer explorers of a type, but only once""" """Transfer explorers of a type, but only once"""
if type in self.type_explorers_transferred: if type in self.type_explorers_transferred:

10
lib/cdist/type.py
View file

@ -46,12 +46,6 @@ class Type(object):
"""Check whether a type is used for installation (if not: for configuration)""" """Check whether a type is used for installation (if not: for configuration)"""
return os.path.isfile(os.path.join(self.path, "install")) return os.path.isfile(os.path.join(self.path, "install"))
# FIXME: Type def remote_explorer_dir(self):
def type_dir(self, type, *args):
"""Return (sub-)directory of a type"""
return os.path.join(self.type_base_dir, type, *args)
# FIXME: Type
def remote_type_explorer_dir(self, type):
"""Return remote directory that holds the explorers of a type""" """Return remote directory that holds the explorers of a type"""
return os.path.join(REMOTE_TYPE_DIR, type, "explorer") return os.path.join(self.remote_path, "explorer")