From 9d4d29a7e2a79600cb818bea487e7cd40d891c45 Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Tue, 25 Nov 2008 21:07:04 +0000 Subject: [PATCH] Revert to previous revisions in branches/1.7/ --- plugins/codemux.py | 7 ++----- plugins/vsys.py | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/plugins/codemux.py b/plugins/codemux.py index ce69e4a..7b11350 100644 --- a/plugins/codemux.py +++ b/plugins/codemux.py @@ -16,10 +16,7 @@ def start(options, config): def GetSlivers(data): - """ - For each sliver with the codemux attribute, parse out "host,port" - and make entry in conf. Restart service after. - """ + """For each sliver with the codemux attribute, parse out "host,port" and make entry in conf. Restart service after.""" logger.log("codemux: Starting.", 2) # slices already in conf slicesinconf = parseConf() @@ -33,7 +30,7 @@ def GetSlivers(data): # Parse attributes and update dict of scripts for sliver in data['slivers']: for attribute in sliver['attributes']: - if attribute['tagname'] == 'codemux': + if attribute['name'] == 'codemux': # add to conf. Attribute is [host, port] params = {'host': attribute['value'].split(",")[0], 'port': attribute['value'].split(",")[1]} diff --git a/plugins/vsys.py b/plugins/vsys.py index d26ee4a..c72941c 100644 --- a/plugins/vsys.py +++ b/plugins/vsys.py @@ -25,7 +25,7 @@ def GetSlivers(data): # Parse attributes and update dict of scripts for sliver in data['slivers']: for attribute in sliver['attributes']: - if attribute['tagname'] == 'vsys': + if attribute['name'] == 'vsys': if sliver['name'] not in slices: # add to conf slices.append(sliver['name']) @@ -46,7 +46,7 @@ def createVsysDir(sliver): try: os.mkdir("/vservers/%s/vsys" % sliver) return True - except OSError: + except OSError: return False -- 2.43.0