From 68889c4bf7a5281cab51a8be0ba7fa7ca40c4da7 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Wed, 5 Oct 2011 16:12:25 +0200
Subject: [PATCH] finish type, shrink path
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
lib/cdist/path.py | 31 +------------------------------
lib/cdist/type.py | 10 ++--------
2 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/lib/cdist/path.py b/lib/cdist/path.py
index 5cde357b..e709e6fe 100644
--- a/lib/cdist/path.py
+++ b/lib/cdist/path.py
@@ -171,30 +171,11 @@ class Path:
"""Return list of available explorers"""
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
def list_types(self):
"""Retuns list of types"""
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
def list_object_paths(self, starting_point):
"""Return list of paths of existing objects"""
@@ -260,16 +241,6 @@ class Path:
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
def transfer_object_parameter(self, cdist_object):
"""Transfer the object parameter to the remote destination"""
@@ -286,7 +257,7 @@ class Path:
self.remote_mkdir(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):
"""Transfer explorers of a type, but only once"""
if type in self.type_explorers_transferred:
diff --git a/lib/cdist/type.py b/lib/cdist/type.py
index b0280660..e1c5f589 100644
--- a/lib/cdist/type.py
+++ b/lib/cdist/type.py
@@ -46,12 +46,6 @@ class Type(object):
"""Check whether a type is used for installation (if not: for configuration)"""
return os.path.isfile(os.path.join(self.path, "install"))
- # 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):
+ def remote_explorer_dir(self):
"""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")