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

add singleton / no object_id test to CdistObject

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-02-13 07:25:04 +01:00
commit 0c990e1756
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,25 +96,29 @@ class CdistObject(object):
""" """
return os.path.join(type_name, object_id) return os.path.join(type_name, object_id)
@staticmethod def validate_object_id(self):
def validate_object_id(object_id):
"""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 object_id:
if object_id.startswith('/'): if self.object_id.startswith('/'):
raise IllegalObjectIdError(object_id, 'object_id may not start with /') raise IllegalObjectIdError(object_id, 'object_id may not start with /')
if OBJECT_MARKER in 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(object_id, 'object_id may not contain \'%s\'' % OBJECT_MARKER)
if '//' in object_id: if '//' in self.object_id:
raise IllegalObjectIdError(object_id, 'object_id may not contain //') raise IllegalObjectIdError(object_id, 'object_id may not contain //')
# If no object_id and type is not singleton => error out
if not object_id and not self.type.is_singleton:
raise IllegalObjectIdError(object_id,
"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):
self.type = cdist_type # instance of Type self.type = cdist_type # instance of Type
self.base_path = base_path self.base_path = base_path
self.object_id = object_id self.object_id = object_id
self.sanitise_object_id() self.sanitise_object_id()
self.validate_object_id(object_id) self.validate_object_id()
self.name = self.join_name(self.type.name, self.object_id) self.name = self.join_name(self.type.name, self.object_id)
self.path = os.path.join(self.type.path, self.object_id, OBJECT_MARKER) self.path = os.path.join(self.type.path, self.object_id, OBJECT_MARKER)