From tashi-commits-return-572-apmail-incubator-tashi-commits-archive=incubator.apache.org@incubator.apache.org Tue Jul 17 21:06:34 2012 Return-Path: X-Original-To: apmail-incubator-tashi-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-tashi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 78F35D930 for ; Tue, 17 Jul 2012 21:06:34 +0000 (UTC) Received: (qmail 83416 invoked by uid 500); 17 Jul 2012 21:06:34 -0000 Delivered-To: apmail-incubator-tashi-commits-archive@incubator.apache.org Received: (qmail 83392 invoked by uid 500); 17 Jul 2012 21:06:34 -0000 Mailing-List: contact tashi-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tashi-dev@incubator.apache.org Delivered-To: mailing list tashi-commits@incubator.apache.org Received: (qmail 83384 invoked by uid 99); 17 Jul 2012 21:06:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jul 2012 21:06:34 +0000 X-ASF-Spam-Status: No, hits=-1999.6 required=5.0 tests=ALL_TRUSTED,FILL_THIS_FORM_FRAUD_PHISH,T_FILL_THIS_FORM_SHORT,T_FRT_STOCK2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jul 2012 21:06:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2DE0923889BF; Tue, 17 Jul 2012 21:06:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1362643 [3/3] - in /incubator/tashi/branches/stroucki-registration: ./ doc/ etc/ src/tashi/ src/tashi/accounting/ src/tashi/agents/ src/tashi/client/ src/tashi/clustermanager/ src/tashi/clustermanager/data/ src/tashi/dfs/ src/tashi/messagi... Date: Tue, 17 Jul 2012 21:06:01 -0000 To: tashi-commits@incubator.apache.org From: stroucki@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120717210605.2DE0923889BF@eris.apache.org> Modified: incubator/tashi/branches/stroucki-registration/src/zoni/extra/util.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/extra/util.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/extra/util.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/extra/util.py Tue Jul 17 21:05:59 2012 @@ -27,7 +27,6 @@ import shutil import re import threading import subprocess -import logging def loadConfigFile(parser): #parser = ConfigParser.ConfigParser() @@ -64,6 +63,10 @@ def loadConfigFile(parser): config['initrdRoot'] = parser.get("pxe", "INITRD_ROOT").split()[0] config['kernelRoot'] = parser.get("pxe", "KERNEL_ROOT").split()[0] + # Extensions from MIMOS + config['ntpsvrIP'] = parser.get("pxe", "NTPSVR").split()[0] # NTP Server IP Address Support + config['tftpTemplateDir'] = parser.get("pxe", "CUSTOM_TEMPLATES_DIR") # Custom Templates for Disk Image + # Image store config['imageServerIP'] = parser.get("imageStore", "IMAGE_SERVER_IP").split()[0] config['fsImagesBaseDir'] = parser.get("imageStore", "FS_IMAGES_BASE_DIR").split()[0] @@ -108,7 +111,8 @@ def getConfig(additionalNames=[], additi """Creates many permutations of a list of locations to look for config files and then loads them""" config = ConfigParser.ConfigParser() - baseLocations = ['./etc/', '/usr/share/zoni/', '/etc/zoni/', os.path.expanduser('~/.zoni/')] + # added /usr/local/tashi/etc - MIMOS + baseLocations = ['./etc/', '/usr/share/zoni/', '/usr/local/tashi/etc/', '/etc/zoni/', os.path.expanduser('~/.zoni/')] names = ['Zoni'] + additionalNames names = reduce(lambda x, y: x + [y+"Defaults", y], names, []) allLocations = reduce(lambda x, y: x + reduce(lambda z, a: z + [y + a + ".cfg"], names, []), baseLocations, []) + additionalFiles @@ -218,38 +222,43 @@ def createKey(name): f.close() return val - def __getShellFn(): - if sys.version_info < (2, 6, 1): + try: from IPython.Shell import IPShellEmbed - return IPShellEmbed() - else: + return (1, IPShellEmbed) + except ImportError: import IPython - return IPython.embed() + return (2, IPython.embed) def debugConsole(globalDict): """A debugging console that optionally uses pysh""" def realDebugConsole(globalDict): try : import atexit - shellfn = __getShellFn() + (calltype, shellfn) = __getShellFn() def resetConsole(): # XXXpipe: make input window sane - (stdin, stdout) = os.popen2("reset") + (__stdin, stdout) = os.popen2("reset") stdout.read() - dbgshell = shellfn() atexit.register(resetConsole) - dbgshell(local_ns=globalDict, global_ns=globalDict) - except Exception: + if calltype == 1: + dbgshell=shellfn(user_ns=globalDict) + dbgshell() + elif calltype == 2: + dbgshell=shellfn + dbgshell(user_ns=globalDict) + except Exception, e: CONSOLE_TEXT=">>> " - input = " " - while (input != ""): + inputline = " " + while (inputline != ""): sys.stdout.write(CONSOLE_TEXT) - input = sys.stdin.readline() + inputline = sys.stdin.readline() try: - exec(input) in globalDict + exec(inputline) in globalDict except Exception, e: sys.stdout.write(str(e) + "\n") + + os._exit(0) + if (os.getenv("DEBUG", "0") == "1"): threading.Thread(target=lambda: realDebugConsole(globalDict)).start() - Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/apcswitchedrackpdu.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/apcswitchedrackpdu.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/apcswitchedrackpdu.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/apcswitchedrackpdu.py Tue Jul 17 21:05:59 2012 @@ -18,8 +18,6 @@ # $Id$ # -import sys -import os import warnings warnings.filterwarnings("ignore") @@ -46,7 +44,7 @@ class apcSwitchedRackPdu(SystemManagemen def getPowerStatus(self): thisoid = eval(str(self.oid_status) + "," + str(self.port)) - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', self.user, 0), \ cmdgen.UdpTransportTarget((self.pdu_name, 161)), thisoid) output = varBinds[0][1] @@ -81,7 +79,7 @@ class apcSwitchedRackPdu(SystemManagemen def powerOn(self): thisoid = eval(str(self.oid_status) + "," + str(self.port)) - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().setCmd( \ + __errorIndication, __errorStatus, __errorIndex, __varBinds = cmdgen.CommandGenerator().setCmd( \ cmdgen.CommunityData('my-agent', self.user, 1), \ cmdgen.UdpTransportTarget((self.pdu_name, 161)), \ (thisoid, rfc1902.Integer('1'))) @@ -89,7 +87,7 @@ class apcSwitchedRackPdu(SystemManagemen def powerOff(self): thisoid = eval(str(self.oid_status) + "," + str(self.port)) - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().setCmd( \ + __errorIndication, __errorStatus, __errorIndex, __varBinds = cmdgen.CommandGenerator().setCmd( \ cmdgen.CommunityData('my-agent', self.user, 1), \ cmdgen.UdpTransportTarget((self.pdu_name, 161)), \ (thisoid, rfc1902.Integer('2'))) Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/delldrac.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/delldrac.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/delldrac.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/delldrac.py Tue Jul 17 21:05:59 2012 @@ -19,14 +19,13 @@ # import sys -import os import pexpect import time import logging import tempfile from systemmanagementinterface import SystemManagementInterface -from zoni.extra.util import timeF, log +from zoni.extra.util import timeF class dellDrac(SystemManagementInterface): @@ -116,19 +115,19 @@ class dellDrac(SystemManagementInterface child = self.__login() child.logfile = fout - cmd = "racadm serveraction -m " + self.server + " powerup" + cmd = "racadm serveraction -m %s powerup" % (self.server) child.sendline(cmd) - i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) + __i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) fout.seek(0) - self.log.info("Hardware power on : %s", self.hostname) + self.log.info("Hardware power on : %s" % self.hostname) for val in fout.readlines(): if "OK" in val: code = 1 if "ALREADY POWER-ON" in val: code = 1 - self.log.info("Hardware already powered on : %s", self.hostname) + self.log.info("Hardware already powered on : %s" % self.hostname) if code < 1: - self.log.info("Hardware power on failed : %s", self.hostname) + self.log.info("Hardware power on failed : %s" % self.hostname) fout.close() child.terminate() return code @@ -139,11 +138,11 @@ class dellDrac(SystemManagementInterface fout = tempfile.TemporaryFile() child = self.__login() child.logfile = fout - cmd = "racadm serveraction -m " + self.server + " powerdown" + cmd = "racadm serveraction -m %s powerdown" % (self.server) child.sendline(cmd) - i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) + __i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) fout.seek(0) - self.log.info("Hardware power off : %s", self.hostname) + self.log.info("Hardware power off : %s" % self.hostname) for val in fout.readlines(): if "OK" in val: code = 1 @@ -164,7 +163,7 @@ class dellDrac(SystemManagementInterface child.logfile = fout cmd = "racadm serveraction -m " + self.server + " graceshutdown" child.sendline(cmd) - i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) + __i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) fout.seek(0) self.log.info("Hardware power off (soft): %s", self.hostname) @@ -188,7 +187,7 @@ class dellDrac(SystemManagementInterface child.logfile = fout cmd = "racadm serveraction -m " + self.server + " powercycle" child.sendline(cmd) - i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) + __i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) fout.seek(0) self.log.info("Hardware power cycle : %s", self.hostname) for val in fout.readlines(): @@ -208,7 +207,7 @@ class dellDrac(SystemManagementInterface child.logfile = fout cmd = "racadm serveraction -m " + self.server + " hardreset" child.sendline(cmd) - i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) + __i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) fout.seek(0) for val in fout.readlines(): if "OK" in val: @@ -225,5 +224,5 @@ class dellDrac(SystemManagementInterface child = self.__login() cmd = "connect -F " + self.server child.sendline(cmd) - i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) + __i=child.expect(['DRAC/MC:', pexpect.EOF, pexpect.TIMEOUT]) child.terminate() Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/dellswitch.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/dellswitch.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/dellswitch.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/dellswitch.py Tue Jul 17 21:05:59 2012 @@ -18,24 +18,22 @@ # $Id$ # -import os -import sys + import pexpect import datetime -import time import thread -import string -import getpass import socket import tempfile +import os import logging +import sys +import time +import string -#import zoni -from zoni.data.resourcequerysql import * from zoni.hardware.hwswitchinterface import HwSwitchInterface from zoni.data.resourcequerysql import ResourceQuerySql from zoni.agents.dhcpdns import DhcpDns -from zoni.extra.util import * +from zoni.extra.util import normalizeMac ''' Using pexpect to control switches because couldn't get snmp to work @@ -261,10 +259,10 @@ class HwDellSwitch(HwSwitchInterface): i=child.expect(['console','#', 'Name:', pexpect.EOF, pexpect.TIMEOUT], timeout=2) i=child.expect(['console','#', 'Name:', pexpect.EOF, pexpect.TIMEOUT], timeout=2) - except EOF: + except pexpect.EOF: print "EOF", i #child.sendline() - except TIMEOUT: + except pexpect.TIMEOUT: print "TIMEOUT", i #child.interact(escape_character='\x1d', input_filter=None, output_filter=None) @@ -463,16 +461,16 @@ class HwDellSwitch(HwSwitchInterface): child = self.__login() cmd = "copy running-config startup-config" child.sendline(cmd) - i = child.expect(['y/n', pexpect.EOF, pexpect.TIMEOUT]) + __i = child.expect(['y/n', pexpect.EOF, pexpect.TIMEOUT]) child.sendline("y") child.terminate() - def __saveConfig(self): - cmd = "copy running-config startup-config" - child.sendline(cmd) - i = child.expect(['y/n', pexpect.EOF, pexpect.TIMEOUT]) - child.sendline("y") - child.terminate() +# def __saveConfig(self): +# cmd = "copy running-config startup-config" +# child.sendline(cmd) +# __i = child.expect(['y/n', pexpect.EOF, pexpect.TIMEOUT]) +# child.sendline("y") +# child.terminate() def registerToZoni(self, user, password, host): @@ -511,7 +509,7 @@ class HwDellSwitch(HwSwitchInterface): child.sendline(cmd) val = host + "#" tval = host + ">" - i = child.expect([val, tval, '\n\r\n\r', "--More--", pexpect.EOF, pexpect.TIMEOUT]) + __i = child.expect([val, tval, '\n\r\n\r', "--More--", pexpect.EOF, pexpect.TIMEOUT]) cmd = "show version" child.sendline(cmd) i = child.expect([val, tval, '\n\r\n\r', pexpect.EOF, pexpect.TIMEOUT]) @@ -547,19 +545,19 @@ class HwDellSwitch(HwSwitchInterface): user = "public" oid = eval("1,3,6,1,4,1,674,10895,3000,1,2,100,1,0") - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', user, 0), \ cmdgen.UdpTransportTarget((host, 161)), oid) a['hw_model'] = str(varBinds[0][1]) oid = eval("1,3,6,1,4,1,674,10895,3000,1,2,100,3,0") - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', user, 0), \ cmdgen.UdpTransportTarget((host, 161)), oid) a['hw_make'] = str(varBinds[0][1]) oid = eval("1,3,6,1,4,1,674,10895,3000,1,2,100,4,0") - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', user, 0), \ cmdgen.UdpTransportTarget((host, 161)), oid) a['hw_version_sw'] = str(varBinds[0][1]) Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/f10s50switch.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/f10s50switch.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/f10s50switch.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/f10s50switch.py Tue Jul 17 21:05:59 2012 @@ -26,15 +26,13 @@ import datetime import time import thread import string -import getpass import socket import tempfile import logging #import zoni -from zoni.data.resourcequerysql import * -from zoni.hardware.hwswitchinterface import HwSwitchInterface from zoni.data.resourcequerysql import ResourceQuerySql +from zoni.hardware.hwswitchinterface import HwSwitchInterface from zoni.agents.dhcpdns import DhcpDns @@ -49,7 +47,7 @@ class HwF10S50Switch(HwSwitchInterface): self.log = logging.getLogger(os.path.basename(__file__)) - def setVerbose(self, verbose): + def setVerbose(self, verbose): self.verbose = verbose def __login(self): @@ -138,7 +136,7 @@ class HwF10S50Switch(HwSwitchInterface): child.expect(["conf-if", pexpect.EOF]) child.sendline("switchport") child.sendline("exit") - child.sendline("interface vlan " + vlan") + child.sendline("interface vlan %s" % vlan) child.expect(["conf-if", pexpect.EOF]) cmd = "tagged port-channel 1" child.sendline(cmd) @@ -214,10 +212,10 @@ class HwF10S50Switch(HwSwitchInterface): i=child.expect(['console','#', 'Name:', pexpect.EOF, pexpect.TIMEOUT], timeout=2) i=child.expect(['console','#', 'Name:', pexpect.EOF, pexpect.TIMEOUT], timeout=2) - except EOF: + except pexpect.EOF: print "EOF", i #child.sendline() - except TIMEOUT: + except pexpect.TIMEOUT: print "TIMEOUT", i #child.interact(escape_character='\x1d', input_filter=None, output_filter=None) @@ -237,7 +235,7 @@ class HwF10S50Switch(HwSwitchInterface): child = self.__login() child.logfile = sys.stdout child.sendline('config') - cmd = "interface vlan " + vlan) + cmd = "interface vlan %s" % (vlan) child.sendline(cmd) i=child.expect(['conf-if', pexpect.EOF, pexpect.TIMEOUT]) if i > 0: @@ -270,7 +268,7 @@ class HwF10S50Switch(HwSwitchInterface): child.logfile = sys.stdout cmd = "show interfaces g 0/" + str(self.host['hw_port']) child.sendline(cmd) - i = child.expect(['#', pexpect.EOF, pexpect.TIMEOUT]) + __i = child.expect(['#', pexpect.EOF, pexpect.TIMEOUT]) child.terminate() def interactiveSwitchConfig(self): @@ -374,12 +372,12 @@ class HwF10S50Switch(HwSwitchInterface): user = "public" oid = eval("1,3,6,1,4,1,674,10895,3000,1,2,100,1,0") - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', user, 0), \ cmdgen.UdpTransportTarget((host, 161)), oid) a['hw_model'] = str(varBinds[0][1]) oid = eval("1,3,6,1,4,1,674,10895,3000,1,2,100,3,0") - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', user, 0), \ cmdgen.UdpTransportTarget((host, 161)), oid) a['hw_make'] = str(varBinds[0][1]) Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hpilo.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hpilo.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hpilo.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hpilo.py Tue Jul 17 21:05:59 2012 @@ -19,18 +19,14 @@ # import sys -import os import pexpect import time from systemmanagementinterface import SystemManagementInterface - - -#class systemmagement(): - #def __init__(self, proto): - #self.proto = proto +from zoni.extra.util import timeF, log #XXX Need to add more error checking! +#XXX Need to consider difference in responses between a rackmount server and a blade server - MIMOS def log(f): def myF(*args, **kw): @@ -41,8 +37,6 @@ def log(f): myF.__name__ = f.__name__ return myF -import time - def timeF(f): def myF(*args, **kw): start = time.time() @@ -55,15 +49,19 @@ def timeF(f): class hpILo(SystemManagementInterface): - def __init__(self, host): - self.hostname = host['location'] - self.host = host['ilo_name'] + def __init__(self, config, nodeName, hostInfo): + self.config = config + self.nodename = nodeName + self.hostname = hostInfo['location'] + ## Need to add in checking to differentiate between rackmount and blade server + #self.host = host['ilo_name'] + self.host = hostInfo['ilo_enclosure'] self.user = host['ilo_userid'] self.password = host['ilo_password'] self.port = host['ilo_port'] self.powerStatus = None self.verbose = 0 - #self.server = "Server-" + str(self.port) + self.log = logging.getLogger(__name__) def setVerbose(self, verbose): self.verbose = verbose @@ -86,7 +84,7 @@ class hpILo(SystemManagementInterface): i=child.expect(['>', 'please try again.', pexpect.EOF, pexpect.TIMEOUT]) else: mesg = "Error" - sys.stderr.write(mesg) + self.log.error(mesg) exit(1) if i == 1: @@ -102,7 +100,6 @@ class hpILo(SystemManagementInterface): @timeF - @log def getPowerStatus(self): child = self.__login() cmd = "show server status " + str(self.port) @@ -118,7 +115,7 @@ class hpILo(SystemManagementInterface): mesg = self.hostname + " Power is off\n\n" self.powerStatus = 0 - sys.stdout.write(mesg) + self.log.info(mesg) child.close() child.terminate() @@ -131,7 +128,6 @@ class hpILo(SystemManagementInterface): return 1; if not self.powerStatus: return 0; - @timeF def powerOn(self): @@ -151,7 +147,28 @@ class hpILo(SystemManagementInterface): mesg = self.hostname + " Power On\n\n" else: mesg = self.hostname + " Power On Fail\n\n" - sys.stdout.write(mesg) + self.log.info(mesg) + child.sendline("quit") + child.terminate() + + @timeF + def powerOnNet(self): + if self.powerStatus == 1: + mesg = self.hostname + " Power On\n\n" + exit(1) + + child = self.__login() + cmd = "poweron server " + str(self.port) + " PXE" + child.sendline(cmd) + val = child.readline() + while "Powering" not in val and "powered" not in val: + val = child.readline() + + if "Powering" in val or "already" in val: + mesg = self.hostname + " Power On\n\n" + else: + mesg = self.hostname + " Power On Fail\n\n" + self.log.info(mesg) child.sendline("quit") child.terminate() @@ -169,7 +186,7 @@ class hpILo(SystemManagementInterface): else: mesg = self.hostname + " Power Off Fail\n\n" - sys.stdout.write(mesg) + self.log.info(mesg) child.sendline("quit") child.terminate() @@ -189,7 +206,7 @@ class hpILo(SystemManagementInterface): mesg = self.hostname + " Power Reset\n\n" #else: #mesg = self.hostname + " Power Reset Fail\n\n" - sys.stdout.write(mesg) + self.log.info(mesg) child.sendline("quit") child.terminate() Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hpswitch.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hpswitch.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hpswitch.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hpswitch.py Tue Jul 17 21:05:59 2012 @@ -25,13 +25,11 @@ import sys import pexpect import datetime import thread -import time import threading import logging from hwswitchinterface import HwSwitchInterface -from resourcequerysql import ResourceQuerySql class HwHPSwitch(HwSwitchInterface): @@ -169,10 +167,10 @@ class HwHPSwitch(HwSwitchInterface): i=child.expect(['console','sw', 'Name:', pexpect.EOF, pexpect.TIMEOUT], timeout=2) i=child.expect(['console','sw', 'Name:', pexpect.EOF, pexpect.TIMEOUT], timeout=2) - except EOF: + except pexpect.EOF: print "EOF", i #child.sendline() - except TIMEOUT: + except pexpect.TIMEOUT: print "TIMEOUT", i #child.interact(escape_character='\x1d', input_filter=None, output_filter=None) @@ -245,7 +243,7 @@ class HwHPSwitch(HwSwitchInterface): cmd = "/info/port " + str(self.host['hw_port']) child.sendline(cmd) child.logfile = sys.stdout - opt = child.expect(['Info(.*)', pexpect.EOF, pexpect.TIMEOUT]) + __opt = child.expect(['Info(.*)', pexpect.EOF, pexpect.TIMEOUT]) # this needs to be removed or rewritten def interactiveSwitchConfig(self): Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hwswitchinterface.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hwswitchinterface.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hwswitchinterface.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/hwswitchinterface.py Tue Jul 17 21:05:59 2012 @@ -18,8 +18,6 @@ # $Id$ # -import sys -import os class HwSwitchInterface(object): """ Interface description for hardware switches Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/ipmi.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/ipmi.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/ipmi.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/ipmi.py Tue Jul 17 21:05:59 2012 @@ -18,11 +18,8 @@ # $Id$ # -import sys -import os import subprocess import logging -import string from systemmanagementinterface import SystemManagementInterface Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/raritanpdu.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/raritanpdu.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/raritanpdu.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/raritanpdu.py Tue Jul 17 21:05:59 2012 @@ -18,19 +18,19 @@ # $Id$ # -import sys -import os -import string import warnings import logging +import string +import sys import time + warnings.filterwarnings("ignore") from pysnmp.entity.rfc3413.oneliner import cmdgen from pysnmp.proto import rfc1902 -from zoni.data.resourcequerysql import * +from zoni.data.resourcequerysql import ResourceQuerySql from zoni.hardware.systemmanagementinterface import SystemManagementInterface - +from zoni.agents.dhcpdns import DhcpDns #class systemmagement(): #def __init__(self, proto): @@ -90,7 +90,7 @@ class raritanDominionPx(SystemManagement ''' def getOffset(self): thisoid = eval(str(self.oid) + str(self.oid_status) + "," + str(0)) - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', self.user, 0), \ cmdgen.UdpTransportTarget((self.pdu_name, 161)), thisoid) output = varBinds[0][1] @@ -102,7 +102,7 @@ class raritanDominionPx(SystemManagement def __setPowerStatus(self): thisoid = eval(str(self.oid) + str(self.oid_status) + "," + str(self.port)) - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', self.user, 0), \ cmdgen.UdpTransportTarget((self.pdu_name, 161)), thisoid) output = varBinds[0][1] @@ -134,7 +134,7 @@ class raritanDominionPx(SystemManagement def powerOn(self): thisoid = eval(str(self.oid) + str(self.oid_status) + "," + str(self.port)) - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().setCmd( \ + __errorIndication, __errorStatus, __errorIndex, __varBinds = cmdgen.CommandGenerator().setCmd( \ cmdgen.CommunityData('my-agent', self.user, 1), \ cmdgen.UdpTransportTarget((self.pdu_name, 161)), \ (thisoid, rfc1902.Integer('1'))) @@ -142,7 +142,7 @@ class raritanDominionPx(SystemManagement def powerOff(self): thisoid = eval(str(self.oid) + str(self.oid_status) + "," + str(self.port)) - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().setCmd( \ + __errorIndication, __errorStatus, __errorIndex, __varBinds = cmdgen.CommandGenerator().setCmd( \ cmdgen.CommunityData('my-agent', self.user, 1), \ cmdgen.UdpTransportTarget((self.pdu_name, 161)), \ (thisoid, rfc1902.Integer('0'))) @@ -181,7 +181,7 @@ class raritanDominionPx(SystemManagement a={} oid = eval(str("1,3,6,1,2,1,1,1,0")) - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', user, 0), \ cmdgen.UdpTransportTarget((host, 161)), oid) @@ -193,7 +193,7 @@ class raritanDominionPx(SystemManagement a['hw_make'] = str(varBinds[0][1]) oid = eval("1,3,6,1,4,1,13742,4,1,1,6,0") - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', user, 0), \ cmdgen.UdpTransportTarget((host, 161)), oid) x = [] @@ -204,7 +204,7 @@ class raritanDominionPx(SystemManagement a['hw_mac'] = ":".join(['%s' % d for d in x]) oid = eval("1,3,6,1,4,1,13742,4,1,1,2,0") - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', user, 0), \ cmdgen.UdpTransportTarget((host, 161)), oid) serial = str(varBinds[0][1]) @@ -214,13 +214,13 @@ class raritanDominionPx(SystemManagement a['hw_notes'] = val + "; Serial " + serial oid = eval("1,3,6,1,4,1,13742,4,1,1,1,0") - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', user, 0), \ cmdgen.UdpTransportTarget((host, 161)), oid) a['hw_version_fw'] = str(varBinds[0][1]) oid = eval("1,3,6,1,4,1,13742,4,1,1,12,0") - errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ + __errorIndication, __errorStatus, __errorIndex, varBinds = cmdgen.CommandGenerator().getCmd( \ cmdgen.CommunityData('my-agent', user, 0), \ cmdgen.UdpTransportTarget((host, 161)), oid) a['hw_model'] = str(varBinds[0][1]) Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/systemmanagement.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/systemmanagement.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/systemmanagement.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/systemmanagement.py Tue Jul 17 21:05:59 2012 @@ -19,13 +19,11 @@ # $Id$ # -import sys -import os import logging import threading +import time from systemmanagementinterface import SystemManagementInterface -from zoni.data.resourcequerysql import * from tashi.util import instantiateImplementation @@ -41,7 +39,7 @@ class SystemManagement(SystemManagementI def getInfo(self, nodeName): - self.host = self.data.getHostInfo(node) + self.host = self.data.getHostInfo(nodeName) def setVerbose(self, verbose): @@ -65,7 +63,7 @@ class SystemManagement(SystemManagementI # [2] = hw method password success = 0 for i in hw: - inst = instantiateImplementation(self.config['hardwareControl'][i[0]]['class'], self.config, nodeName, self.host) + __inst = instantiateImplementation(self.config['hardwareControl'][i[0]]['class'], self.config, nodeName, self.host) a = "inst.%s" % mycmd for count in range(retries): doit = eval(a) @@ -89,7 +87,7 @@ class SystemManagement(SystemManagementI def softPowerConfirm(self, method, nodeName): # using a sleep for now... time.sleep(30) - inst = instantiateImplementation(self.config['hardwareControl'][method]['class'], self.config, nodeName, self.host) + __inst = instantiateImplementation(self.config['hardwareControl'][method]['class'], self.config, nodeName, self.host) mycmd = "%s()" % ("powerOff") a = "inst.%s" % mycmd doit = eval(a) Modified: incubator/tashi/branches/stroucki-registration/src/zoni/hardware/systemmanagementinterface.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/hardware/systemmanagementinterface.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/hardware/systemmanagementinterface.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/hardware/systemmanagementinterface.py Tue Jul 17 21:05:59 2012 @@ -18,9 +18,6 @@ # $Id$ # -import sys -import os - class SystemManagementInterface(object): """ Interface description for hardware management controllers @@ -66,7 +63,8 @@ class SystemManagementInterface(object): ''' register hardware to zoni''' raise NotImplementedError - - - + # Extensions from MIMOS - specific to HP Blade via c7000 Blade Enclosure + def powerOnNet(self): + ''' Power HP Blade Server directly from PXE ''' + raise NotImplementedError Modified: incubator/tashi/branches/stroucki-registration/src/zoni/install/db/zoniDbSetup.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/install/db/zoniDbSetup.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/install/db/zoniDbSetup.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/install/db/zoniDbSetup.py Tue Jul 17 21:05:59 2012 @@ -20,10 +20,8 @@ import os import sys -import string try: import MySQLdb - import traceback import optparse import getpass except ImportError, e: @@ -38,8 +36,8 @@ sys.path.append(a) a = os.path.join("../../..") sys.path.append(a) -from zoni.version import * -from zoni.extra.util import * +from zoni.version import version, revision +from zoni.extra.util import getConfig def main(): @@ -53,7 +51,7 @@ def main(): parser.add_option("-u", "--userName", "--username", dest="userName", help="Mysql username") parser.add_option("-p", "--password", dest="password", help="Admin mysql password") #parser.add_option("-v", "--verbose", dest="verbosity", help="Be verbose", action="store_true", default=False) - (options, args) = parser.parse_args() + (options, __args) = parser.parse_args() if not options.userName: parser.print_help() @@ -63,7 +61,7 @@ def main(): if not options.password: password = getpass.getpass() - (configs, configFiles) = getConfig() + (configs, __configFiles) = getConfig() CreateZoniDb(configs, options.userName, password) @@ -174,7 +172,7 @@ def createTables(conn): sys.stdout.write(" Creating sysdomainmembermap...") execQuery(conn, "CREATE TABLE IF NOT EXISTS `sysdomainmembermap` (`sys_id` int(11) unsigned NOT NULL, `domain_id` int(11) NOT NULL)") sys.stdout.write("Success\n") - # Create allocationinfo + # Create allocationinfo sys.stdout.write(" Creating allocationinfo...") execQuery(conn, "CREATE TABLE IF NOT EXISTS `allocationinfo` ( `allocation_id` int(11) unsigned NOT NULL auto_increment, `sys_id` int(11) unsigned NOT NULL, `reservation_id` int(11) unsigned NOT NULL, `pool_id` int(11) unsigned NULL, `hostname` varchar(64) default NULL, `domain_id` int(11) unsigned NOT NULL, `notes` tinytext, `expire_time` timestamp default 0 NOT NULL, PRIMARY KEY (`allocation_id`)) ENGINE=INNODB") sys.stdout.write("Success\n") @@ -224,10 +222,10 @@ def createRegistration(conn, config): if checkVal: sys.stdout.write(" Kernel already exists in DB...\n") # Get the kernel_id - kernelId = str(checkVal[1][0][0]) + #kernelId = str(checkVal[1][0][0]) else: - r = execQuery(conn, "INSERT into `kernelinfo` (kernel_name, kernel_release, kernel_arch) values ('linux-2.6.24-19-server', '2.6.24-19-server', 'x86_64' )") - kernelId = str(r.lastrowid) + __r = execQuery(conn, "INSERT into `kernelinfo` (kernel_name, kernel_release, kernel_arch) values ('linux-2.6.24-19-server', '2.6.24-19-server', 'x86_64' )") + #kernelId = str(r.lastrowid) sys.stdout.write(" Success\n") # Initrd @@ -325,7 +323,7 @@ def addInitialConfig(conn, config): if checkVal: sys.stdout.write("Default Domain (ZoniHome) already linked to vlan " + config['zoniHomeDomain'] + "...\n") # Get the domainId - valId = str(checkVal[1][0][0]) + #valId = str(checkVal[1][0][0]) else: r = execQuery(conn, "INSERT into `domainmembermap` (domain_id, vlan_id) values (" + domainId + ", " + vlanId + ")") domainId = str(r.lastrowid) @@ -358,7 +356,7 @@ def addInitialConfig(conn, config): if checkVal: sys.stdout.write("Default pool (ZoniHome) already exists...\n") # Get the domainId - poolId = str(checkVal[1][0][0]) + #poolId = str(checkVal[1][0][0]) else: r = execQuery(conn, "INSERT into `poolmap` (pool_id, vlan_id) values (" + zoniPoolId + ", " + vlanId + ")") domainId = str(r.lastrowid) @@ -370,7 +368,7 @@ def addInitialConfig(conn, config): sys.stdout.write("Default pool (ZoniHome) already exists...\n") # XXX probably should delete first then add, do it later # Get the domainId - poolId = str(checkVal[1][0][0]) + #poolId = str(checkVal[1][0][0]) else: r = execQuery(conn, "INSERT into `poolmap` (pool_id, vlan_id) values (" + zoniIpmiId + ", " + vlanId + ")") domainId = str(r.lastrowid) Modified: incubator/tashi/branches/stroucki-registration/src/zoni/install/dnsdhcp/zoniDnsDhcpSetup.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/install/dnsdhcp/zoniDnsDhcpSetup.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/install/dnsdhcp/zoniDnsDhcpSetup.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/install/dnsdhcp/zoniDnsDhcpSetup.py Tue Jul 17 21:05:59 2012 @@ -21,10 +21,7 @@ import os import sys -import string -import traceback import optparse -import getpass a = os.path.join("../") sys.path.append(a) @@ -33,8 +30,8 @@ sys.path.append(a) a = os.path.join("../../..") sys.path.append(a) -from zoni.version import * -from zoni.extra.util import * +from zoni.version import version, revision +from zoni.extra.util import createKey def main(): @@ -47,13 +44,13 @@ def main(): parser = optparse.OptionParser(usage="%prog -k keyname", version="%prog " + ver + " " + rev) parser.add_option("-k", "--keyName", "--keyname", dest="keyName", help="Key name") #parser.add_option("-v", "--verbose", dest="verbosity", help="Be verbose", action="store_true", default=False) - (options, args) = parser.parse_args() + (options, __args) = parser.parse_args() if not options.keyName: parser.print_help() exit(1) - (configs, configFiles) = getConfig() + #(configs, configFiles) = getConfig() key = createKey(options.keyName) Modified: incubator/tashi/branches/stroucki-registration/src/zoni/install/pxe/zoniPxeSetup.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/install/pxe/zoniPxeSetup.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/install/pxe/zoniPxeSetup.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/install/pxe/zoniPxeSetup.py Tue Jul 17 21:05:59 2012 @@ -21,9 +21,6 @@ import os import sys -import string -import traceback -import optparse import shutil import urllib import tarfile @@ -38,21 +35,21 @@ sys.path.append(a) a = os.path.join("../../..") sys.path.append(a) -from zoni.extra.util import * -from zoni.version import * +from zoni.extra.util import getConfig, checkSuper, createDir +#from zoni.version import version, revision from zoni.bootstrap.pxe import Pxe def main(): ''' This file sets up PXE for Zoni ''' - ver = version.split(" ")[0] - rev = revision + #ver = version.split(" ")[0] + #rev = revision - parser = optparse.OptionParser(usage="%prog ", version="%prog " + ver + " " + rev) - (options, args) = parser.parse_args() + #parser = optparse.OptionParser(usage="%prog ", version="%prog " + ver + " " + rev) + #(options, args) = parser.parse_args() - (configs, configFile) = getConfig() + (configs, __configFile) = getConfig() ZoniPxeSetup(configs) ZoniGetSyslinux(configs) @@ -62,11 +59,11 @@ def ZoniPxeSetup(config): tftpRootDir = config['tftpRootDir'] tftpImageDir = config['tftpImageDir'] tftpBootOptionsDir = config['tftpBootOptionsDir'] - tftpUpdateFile = config['tftpUpdateFile'] + #tftpUpdateFile = config['tftpUpdateFile'] tftpBaseFile = config['tftpBaseFile'] tftpBaseMenuFile = config['tftpBaseMenuFile'] installBaseDir = config['installBaseDir'] - registrationBaseDir = config['registrationBaseDir'] + #registrationBaseDir = config['registrationBaseDir'] # Create the directory structure Modified: incubator/tashi/branches/stroucki-registration/src/zoni/install/www/zoniWebSetup.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/install/www/zoniWebSetup.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/install/www/zoniWebSetup.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/install/www/zoniWebSetup.py Tue Jul 17 21:05:59 2012 @@ -22,12 +22,8 @@ import os import sys import time -import string -import traceback -import optparse +#import optparse import shutil -import urllib -import tarfile a = os.path.join("../") sys.path.append(a) @@ -36,21 +32,20 @@ sys.path.append(a) a = os.path.join("../../..") sys.path.append(a) -from zoni.extra.util import * -from zoni.version import * -from zoni.bootstrap.pxe import Pxe +from zoni.extra.util import getConfig, checkSuper, createDir +#from zoni.version import version, revision def main(): ''' This file sets up the web files for Zoni ''' - ver = version.split(" ")[0] - rev = revision + #ver = version.split(" ")[0] + #rev = revision - parser = optparse.OptionParser(usage="%prog ", version="%prog " + ver + " " + rev) - (options, args) = parser.parse_args() + #parser = optparse.OptionParser(usage="%prog ", version="%prog " + ver + " " + rev) + #(options, args) = parser.parse_args() - (configs, configFiles) = getConfig() + (configs, __configFiles) = getConfig() ZoniWebSetup(configs) ZoniCreateWebConfigFile(configs) Modified: incubator/tashi/branches/stroucki-registration/src/zoni/services/pcvciservice.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/services/pcvciservice.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/services/pcvciservice.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/services/pcvciservice.py Tue Jul 17 21:05:59 2012 @@ -19,7 +19,6 @@ # $Id$ # -import threading import logging from tashi.util import instantiateImplementation @@ -49,10 +48,11 @@ class pcmService(object): def requestResources(self, key, specs, quantity): vcm = self.__key2vcm(key) - node = specs + #node = specs ''' Check for keys later ''' self.log.info("VCM_REQUEST_RESOURCE: VCM %s RESOURCE %s(%s)" % (vcm, specs, quantity)) - # go to scheduler val = self.agent.requestResource(specs) + # go to scheduler + val = self.agent.requestResource(specs) if val: return 1 return 0 Modified: incubator/tashi/branches/stroucki-registration/src/zoni/services/zonimanager.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/services/zonimanager.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/services/zonimanager.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/services/zonimanager.py Tue Jul 17 21:05:59 2012 @@ -20,18 +20,11 @@ # import os -import sys -import threading -import signal import logging.config -import signal -from tashi.util import instantiateImplementation, signalHandler +from tashi.util import instantiateImplementation -from zoni.extra.util import loadConfigFile, getConfig, debugConsole -from zoni.version import * -from zoni.services.hardwareservice import HardwareService -from zoni.services.pcvciservice import pcmService +from zoni.extra.util import getConfig, debugConsole from zoni.services.rpycservices import ManagerService from rpyc.utils.server import ThreadedServer Modified: incubator/tashi/branches/stroucki-registration/src/zoni/version.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-registration/src/zoni/version.py?rev=1362643&r1=1362642&r2=1362643&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-registration/src/zoni/version.py (original) +++ incubator/tashi/branches/stroucki-registration/src/zoni/version.py Tue Jul 17 21:05:59 2012 @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -id = "$Id: version.py 964467 2010-07-15 15:31:02Z rgass $" +_id = "$Id: version.py 964467 2010-07-15 15:31:02Z rgass $" lastChangeDate = "$LastChangedDate$" lastChangeRevision = "$Rev: 964467 $" revision = lastChangeRevision