From ed1fe6fee3120d76fffb9ab676003a39c8ba313f Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Fri, 21 Mar 2008 18:27:10 +0000 Subject: [PATCH] Check to see if slice is running first before creating /vsys directory. --- vsys.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/vsys.py b/vsys.py index da79b92..5766f82 100644 --- a/vsys.py +++ b/vsys.py @@ -5,6 +5,7 @@ import logger import os +import vserver from sets import Set VSYSCONF="/etc/vsys.conf" @@ -27,14 +28,21 @@ def GetSlivers(data): for sliver in data['slivers']: for attribute in sliver['attributes']: if attribute['name'] == 'vsys': - if sliver['name'] not in slices: - # add to conf - slices.append(sliver['name']) - # As the name implies, when we find an attribute, we - createVsysDir(sliver['name']) - # add it to our list of slivers that need vsys - if attribute['value'] in scripts.keys(): - scripts[attribute['value']].append(sliver['name']) + # Check to see if sliver is running. If not, continue + try: + if vserver.VServer(sliver['name']).is_running(): + if sliver['name'] not in slices: + # add to conf + slices.append(sliver['name']) + # As the name implies, when we find an attribute, we + createVsysDir(sliver['name']) + # add it to our list of slivers that need vsys + if attribute['value'] in scripts.keys(): + scripts[attribute['value']].append(sliver['name']) + except: + logger.log("vsys: sliver %s not running yet. Deferring." \ + % sliver['name']) + pass # Write the conf writeConf(slices, parseConf()) -- 2.43.0