From: Thierry Parmentelat Date: Tue, 1 Jun 2010 08:41:45 +0000 (+0000) Subject: more renamings X-Git-Tag: NodeManager-2.0-9~11 X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=2306328a4623d578e93bd59982623908eb8742dd more renamings --- diff --git a/NodeManager.spec b/NodeManager.spec index d58342c..444706e 100644 --- a/NodeManager.spec +++ b/NodeManager.spec @@ -28,22 +28,21 @@ URL: %(echo %{url} | cut -d ' ' -f 2) # not possible because of forward_api_calls #BuildArch: noarch -# Old Node Manager -Obsoletes: sidewinder, sidewinder-common +# old name +#Obsoletes: sidewinder, sidewinder-common +# Uses function decorators +Requires: python >= 2.4 +# connecting PLC +Requires: python-pycurl +# Signed tickets +Requires: gnupg # vuseradd, vuserdel Requires: vserver-%{slicefamily} +# our interface to the vserver patch Requires: util-vserver >= 0.30.208-17 - # vserver.py Requires: util-vserver-python > 0.3-16 - -# Signed tickets -Requires: gnupg - -# Uses function decorators -Requires: python >= 2.4 - # sioc/plnet Requires: pyplnet >= 4.3 diff --git a/database.py b/database.py index c35042a..eaf78d4 100644 --- a/database.py +++ b/database.py @@ -142,7 +142,7 @@ It may be necessary in the future to do something smarter.""" sliver.ensure_created(rec) # Back door to ensure PLC overrides Ticket in delegation. elif rec['instantiation'] == 'delegated' and sliver._get_class() != None: - # if the ticket has been delivered and the nm-contoroller started the slice + # if the ticket has been delivered and the nm-controller started the slice # update rspecs and keep them up to date. if sliver.is_running(): logger.verbose ("database: sync : ensure_create'ing 'delegated' sliver %s"%name) diff --git a/initscripts/nm b/initscripts/nm index cb58689..6988f90 100755 --- a/initscripts/nm +++ b/initscripts/nm @@ -21,16 +21,16 @@ verboseoptions=${DEBUGOPTIONS-"-v -d"} # debug mode is interactive, and has faster period debugoptions=${DEBUGOPTIONS-"-v -p 30 -r 15"} -nm=${NM-"python /usr/share/NodeManager/nm.py"} +nodemanager=${NODEMANAGER-"python /usr/share/NodeManager/nodemanager.py"} prog="Node Manager" -pidfile=${PIDFILE-/var/run/nm.pid} -lockfile=${LOCKFILE-/var/lock/subsys/nm} +pidfile=${PIDFILE-/var/run/nodemanager.pid} +lockfile=${LOCKFILE-/var/lock/subsys/nodemanager} RETVAL=0 function start() { echo -n $"Starting $prog: " - daemon --check=nm $nm "$@" + daemon --check=nodemanager $nodemanager "$@" RETVAL=$? echo [ $RETVAL -eq 0 ] && touch ${lockfile} @@ -39,7 +39,7 @@ function start() { function stop() { echo -n $"Stopping $prog: " - killproc nm + killproc nodemanager RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile} @@ -53,7 +53,7 @@ case "$1" in stop ;; status) - status $nm + status $nodemanager RETVAL=$? ;; restart|reload) @@ -68,13 +68,13 @@ case "$1" in restartverbose) shift stop - $nm $verboseoptions "$@" + $nodemanager $verboseoptions "$@" ;; restartdebug) shift stop echo "Restarting with $debugoptions $@ .." - $nm $debugoptions "$@" + $nodemanager $debugoptions "$@" ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|restartdebug [-d]}" diff --git a/nm.py b/nodemanager.py similarity index 85% rename from nm.py rename to nodemanager.py index 30ee0b7..0cf1dc6 100755 --- a/nm.py +++ b/nodemanager.py @@ -67,7 +67,7 @@ modules = [] def GetSlivers(config, plc): '''Run call backs defined in modules''' try: - logger.log("nm: Syncing w/ PLC") + logger.log("nodemanager: Syncing w/ PLC") # retrieve GetSlivers from PLC data = plc.GetSlivers() # use the magic 'default' slice to retrieve system-wide defaults @@ -78,11 +78,11 @@ def GetSlivers(config, plc): # used to be done only in verbose; very helpful though, and tedious to obtain, # so let's dump this unconditionnally logger.log_slivers(data) - logger.verbose("nm: Sync w/ PLC done") + logger.verbose("nodemanager: Sync w/ PLC done") except: - logger.log_exc("nm: failed in GetSlivers") + logger.log_exc("nodemanager: failed in GetSlivers") # XXX So some modules can at least boostrap. - logger.log("nm: Can't contact PLC to GetSlivers(). Continuing.") + logger.log("nodemanager: Can't contact PLC to GetSlivers(). Continuing.") data = {} # Invoke GetSlivers() functions from the callback modules for module in modules: @@ -91,7 +91,7 @@ def GetSlivers(config, plc): callback = getattr(module, 'GetSlivers') callback(data, config, plc) except: - logger.log_exc("nm: GetSlivers failed to run callback for module %r"%module) + logger.log_exc("nodemanager: GetSlivers failed to run callback for module %r"%module) def getPLCDefaults(data, config): @@ -103,7 +103,7 @@ def getPLCDefaults(data, config): attr_dict = {} for attr in slice.get('attributes'): attr_dict[attr['tagname']] = attr['value'] if len(attr_dict): - logger.verbose("nm: Found default slice overrides.\n %s" % attr_dict) + logger.verbose("nodemanager: Found default slice overrides.\n %s" % attr_dict) config.OVERRIDES = attr_dict return # NOTE: if an _default slice existed, it would have been found above and @@ -127,7 +127,7 @@ def setSliversVref (data): continue sliver['attributes'].append({ 'tagname':'vref','value':slicefamily}) except: - logger.log_exc("nm: Could not overwrite 'vref' attribute from 'GetSliceFamily'",name=sliver['name']) + logger.log_exc("nodemanager: Could not overwrite 'vref' attribute from 'GetSliceFamily'",name=sliver['name']) def run(): @@ -153,7 +153,7 @@ def run(): if options.module: assert options.module in known_modules running_modules=[options.module] - logger.verbose('nm: Running single module %s'%options.module) + logger.verbose('nodemanager: Running single module %s'%options.module) else: running_modules=known_modules for module in running_modules: @@ -185,31 +185,31 @@ def run(): plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/2) #check auth - logger.log("nm: Checking Auth.") + logger.log("nodemanager: Checking Auth.") while plc.check_authentication() != True: try: # import pdb # pdb.set_trace() plc.update_session() - logger.log("nm: Authentication Failure. Retrying") + logger.log("nodemanager: Authentication Failure. Retrying") except Exception,e: - logger.log("nm: Retry Failed. (%r); Waiting.."%e) + logger.log("nodemanager: Retry Failed. (%r); Waiting.."%e) time.sleep(iperiod) - logger.log("nm: Authentication Succeeded!") + logger.log("nodemanager: Authentication Succeeded!") while True: - # Main NM Loop - logger.log('nm: mainloop - calling GetSlivers - period=%d random=%d'%(iperiod,irandom)) + # Main nodemanager Loop + logger.log('nodemanager: mainloop - calling GetSlivers - period=%d random=%d'%(iperiod,irandom)) GetSlivers(config, plc) delay=iperiod + random.randrange(0,irandom) - logger.log('nm: mainloop - sleeping for %d s'%delay) + logger.log('nodemanager: mainloop - sleeping for %d s'%delay) time.sleep(delay) - except: logger.log_exc("nm: failed in run") + except: logger.log_exc("nodemanager: failed in run") if __name__ == '__main__': - logger.log("======================================== Entering nm.py "+id) + logger.log("======================================== Entering nodemanager.py "+id) run() else: # This is for debugging purposes. Open a copy of Python and import nm diff --git a/plugins/specialaccounts.py b/plugins/specialaccounts.py index 359ff21..207eb55 100644 --- a/plugins/specialaccounts.py +++ b/plugins/specialaccounts.py @@ -7,7 +7,7 @@ # NodeManager plugin to create special accounts """ -Have NM create/populate accounts/ssh keys for special persons such as root, site_admin, etc. +create/populate accounts/ssh keys for special persons such as root, site_admin, etc. """ diff --git a/setup.py b/setup.py index fd1cc28..ba3f4e8 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( 'iptables', 'logger', 'net', - 'nm', + 'nodemanager', 'plcapi', 'safexmlrpc', 'sliver_vs', diff --git a/sm.py b/sm.py index 41f1f23..ae3b01f 100644 --- a/sm.py +++ b/sm.py @@ -108,7 +108,7 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True): ## 'Type' isn't returned by GetSlivers() for whatever reason. We're overloading ## instantiation here, but i suppose its the same thing when you think about it. -FA - # Handle nm controller here + # Handle nm-controller here if rec['instantiation'].lower() == 'nm-controller': rec.setdefault('type', attr_dict.get('type', 'controller.Controller')) else: diff --git a/tools.py b/tools.py index 07946bf..98a5b7e 100644 --- a/tools.py +++ b/tools.py @@ -91,7 +91,9 @@ def fork_as(su, function, *args): #################### # manage files def pid_file(): - """We use a pid file to ensure that only one copy of NM is running at a given time. If successful, this function will write a pid file containing the pid of the current process. The return value is the pid of the other running process, or None otherwise.""" + """We use a pid file to ensure that only one copy of NM is running at a given time. +If successful, this function will write a pid file containing the pid of the current process. +The return value is the pid of the other running process, or None otherwise.""" other_pid = None if os.access(PID_FILE, os.F_OK): # check for a pid file handle = open(PID_FILE) # pid file exists, read it