from steps import *
from Exceptions import *
import notify_messages
+import BootServerRequest
# all output is written to this file
LOG_FILE= "/tmp/bm.log"
-CURL_PATH= "curl"
-UPLOAD_LOG_URL = "http://boot.planet-lab.org/alpina-logs/upload.php"
+UPLOAD_LOG_PATH = "/alpina-logs/upload.php"
# the new contents of PATH when the boot manager is running
BIN_PATH= ('/usr/local/bin',
"""
if self.OutputFile is not None:
- self.LogEntry( "Uploading logs to %s" % UPLOAD_LOG_URL )
+ self.LogEntry( "Uploading logs to %s" % UPLOAD_LOG_PATH )
self.OutputFile.close()
self.OutputFile= None
-
- curl_cmd= "%s -s --connect-timeout 60 --max-time 600 " \
- "--form log=@%s %s" % \
- (CURL_PATH, self.OutputFilePath, UPLOAD_LOG_URL)
- os.system( curl_cmd )
+
+ bs_request = BootServerRequest.BootServerRequest()
+ bs_request.MakeRequest(PartialPath = UPLOAD_LOG_PATH,
+ GetVars = None, PostVars = None,
+ FormData = ["log=@" + self.OutputFilePath],
+ DoSSL = True, DoCertCheck = True)
SendHardwareConfigToPLC.Run( self.VARS, self.LOG )
ChainBootNode.Run( self.VARS, self.LOG )
else:
- self._nodeNotInstalled()
+ _nodeNotInstalled()
def _newRun():
# implements the new install logic, which will first check
return 0
self.VARS['BOOT_STATE']= 'rins'
UpdateBootStateWithPLC.Run( self.VARS, self.LOG )
- self._rins()
+ _rinsRun()
def _bootRun():
# implements the boot logic, which consists of first
SendHardwareConfigToPLC.Run( self.VARS, self.LOG )
ChainBootNode.Run( self.VARS, self.LOG )
else:
- self._nodeNotInstalled()
+ _nodeNotInstalled()
def _debugRun():
InstallInit.Run( self.VARS, self.LOG )
InstallPartitionDisks.Run( self.VARS, self.LOG )
InstallBootstrapRPM.Run( self.VARS, self.LOG )
- InstallBase.Run( self.VARS, self.LOG )
InstallWriteConfig.Run( self.VARS, self.LOG )
InstallBuildVServer.Run( self.VARS, self.LOG )
InstallNodeInit.Run( self.VARS, self.LOG )