matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

finish rewrite to instance method

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-02-13 07:45:32 +01:00
parent ab565dc3d9
commit f27730e10b
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/cdist/core/cdist_object.py
View file

@ -97,19 +97,21 @@ class CdistObject(object):
return os.path.join(type_name, object_id) return os.path.join(type_name, object_id)
def validate_object_id(self): def validate_object_id(self):
# FIXME: also check that there is no object ID when type is singleton?
"""Validate the given object_id and raise IllegalObjectIdError if it's not valid. """Validate the given object_id and raise IllegalObjectIdError if it's not valid.
""" """
if object_id: if self.object_id:
if self.object_id.startswith('/'): if self.object_id.startswith('/'):
raise IllegalObjectIdError(object_id, 'object_id may not start with /') raise IllegalObjectIdError(self.object_id, 'object_id may not start with /')
if OBJECT_MARKER in self.object_id.split(os.sep): if OBJECT_MARKER in self.object_id.split(os.sep):
raise IllegalObjectIdError(object_id, 'object_id may not contain \'%s\'' % OBJECT_MARKER) raise IllegalObjectIdError(self.object_id, 'object_id may not contain \'%s\'' % OBJECT_MARKER)
if '//' in self.object_id: if '//' in self.object_id:
raise IllegalObjectIdError(object_id, 'object_id may not contain //') raise IllegalObjectIdError(self.object_id, 'object_id may not contain //')
# If no object_id and type is not singleton => error out # If no object_id and type is not singleton => error out
if not object_id and not self.type.is_singleton: if not self.object_id and not self.type.is_singleton:
raise IllegalObjectIdError(object_id, raise IllegalObjectIdError(self.object_id,
"Missing object_id and type is not a singleton.") "Missing object_id and type is not a singleton.")
def __init__(self, cdist_type, base_path, object_id=None): def __init__(self, cdist_type, base_path, object_id=None):
@ -127,19 +129,6 @@ class CdistObject(object):
self.code_remote_path = os.path.join(self.path, "code-remote") self.code_remote_path = os.path.join(self.path, "code-remote")
self.parameter_path = os.path.join(self.path, "parameter") self.parameter_path = os.path.join(self.path, "parameter")
def __repr__(self):
return '<CdistObject %s>' % self.name
def __eq__(self, other):
"""define equality as 'name is the same'"""
return self.name == other.name
def __hash__(self):
return hash(self.name)
def __lt__(self, other):
return isinstance(other, self.__class__) and self.name < other.name
def object_from_name(self, object_name): def object_from_name(self, object_name):
"""Convenience method for creating an object instance from an object name. """Convenience method for creating an object instance from an object name.
@ -154,6 +143,19 @@ class CdistObject(object):
type_name, object_id = self.split_name(object_name) type_name, object_id = self.split_name(object_name)
return self.__class__(self.type.__class__(type_path, type_name), base_path, object_id=object_id) return self.__class__(self.type.__class__(type_path, type_name), base_path, object_id=object_id)
def __repr__(self):
return '<CdistObject %s>' % self.name
def __eq__(self, other):
"""define equality as 'name is the same'"""
return self.name == other.name
def __hash__(self):
return hash(self.name)
def __lt__(self, other):
return isinstance(other, self.__class__) and self.name < other.name
def sanitise_object_id(self): def sanitise_object_id(self):
""" """
Remove leading and trailing slash (one only) Remove leading and trailing slash (one only)