From patchwork Mon Jul 15 17:48:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Terceiro X-Patchwork-Id: 18367 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 124AC25E28 for ; Mon, 15 Jul 2013 17:48:19 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id cr7sf4060172qab.1 for ; Mon, 15 Jul 2013 10:48:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to :mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=mIB+KlPcfzL2MFbUw4oLDuwIf8vI4Xxn+T3XdnE750E=; b=d1CEWrUcDi3sONQm0u3TGilUUU0vkwtR9peg/H520hkhg7UpTJOjnbz/chBmVsmz0n i0cycfRizk3iG5nRlAfAuKAgMxPfwiLpYmXcGPRLeI5e4P3Xm24a5eUBDp7QlaBJFdjl BWISYP9m0yc9hNGdbNGVHnOQSU5VZ2+WvRuJr6tR7VsLO1V8DhO7YGXFEsXx6i21Tq+f 6Ib4goIe/YBZiB8Klykad5NnSp3isUS8W7BdlWARg+HRmIw72tVpDoa+aMLO3AsiqPV3 phiKX3UH3RISD4CjcpDYV+1zOwu8DqeQ3E/BOktfD+Eq6BfoHueEjN2A14gqE4yZAXRg n3Mg== X-Received: by 10.236.83.82 with SMTP id p58mr27625082yhe.10.1373910498594; Mon, 15 Jul 2013 10:48:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.118.227 with SMTP id kp3ls4473387qeb.19.gmail; Mon, 15 Jul 2013 10:48:18 -0700 (PDT) X-Received: by 10.58.76.34 with SMTP id h2mr28626183vew.93.1373910498416; Mon, 15 Jul 2013 10:48:18 -0700 (PDT) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by mx.google.com with ESMTPS id sj10si14980903vdc.131.2013.07.15.10.48.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jul 2013 10:48:18 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.50 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.50; Received: by mail-vb0-f50.google.com with SMTP id w16so3350134vbb.37 for ; Mon, 15 Jul 2013 10:48:18 -0700 (PDT) X-Received: by 10.220.18.133 with SMTP id w5mr4570825vca.8.1373910498335; Mon, 15 Jul 2013 10:48:18 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.149.77 with SMTP id s13csp80804vcv; Mon, 15 Jul 2013 10:48:17 -0700 (PDT) X-Received: by 10.194.48.116 with SMTP id k20mr33128657wjn.23.1373910496944; Mon, 15 Jul 2013 10:48:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id f7si5382124wiv.8.2013.07.15.10.48.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Jul 2013 10:48:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Uymsi-0003mT-EX for ; Mon, 15 Jul 2013 17:48:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 5DE6FE015A for ; Mon, 15 Jul 2013 17:48:16 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 637 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 637: Remove highbank brand from IPMI/PXE device support code Message-Id: <20130715174816.25331.20730.launchpad@ackee.canonical.com> Date: Mon, 15 Jul 2013 17:48:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16696"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: ddbe6e6df54e990e10ee88812b1ab45ae0f0b169 X-Gm-Message-State: ALoCoQnaUrRRVEeCz8v2f+VGNWjNrfjbCLn8oSHULrcox5abLcbtTVobjMh8BLXdciaZ46fis6x+ X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.50 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Antonio Terceiro (terceiro) Related merge proposals: https://code.launchpad.net/~terceiro/lava-dispatcher/generalize-ipmi-pxe/+merge/164781 proposed by: Antonio Terceiro (terceiro) ------------------------------------------------------------ revno: 637 [merge] committer: Antonio Terceiro branch nick: trunk timestamp: Mon 2013-07-15 14:46:28 -0300 message: Remove highbank brand from IPMI/PXE device support code renamed: lava_dispatcher/device/highbank.py => lava_dispatcher/device/ipmi_pxe.py modified: lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf lava_dispatcher/device/ipmi_pxe.py --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf 2013-02-14 03:14:34 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf 2013-05-20 17:49:09 +0000 @@ -1,2 +1,2 @@ -client_type = highbank +client_type = ipmi_pxe connection_command = ipmitool -I lanplus -U admin -P admin -H %(ecmeip)s sol activate === renamed file 'lava_dispatcher/device/highbank.py' => 'lava_dispatcher/device/ipmi_pxe.py' --- lava_dispatcher/device/highbank.py 2013-05-30 01:41:52 +0000 +++ lava_dispatcher/device/ipmi_pxe.py 2013-07-15 17:44:58 +0000 @@ -52,13 +52,13 @@ from lava_dispatcher.ipmi import IpmiPxeBoot -class HighbankTarget(Target): +class IpmiPxeTarget(Target): MASTER_PS1 = 'root@master [rc=$(echo \$?)]# ' MASTER_PS1_PATTERN = 'root@master \[rc=(\d+)\]# ' def __init__(self, context, config): - super(HighbankTarget, self).__init__(context, config) + super(IpmiPxeTarget, self).__init__(context, config) self.proc = self.context.spawn(self.config.connection_command, timeout=1200) self.device_version = None if self.config.ecmeip == None: @@ -235,7 +235,7 @@ self.proc.expect("\(initramfs\)") self.proc.sendline('export PS1="%s"' % self.MASTER_PS1) self.proc.expect(self.MASTER_PS1_PATTERN, timeout=180, lava_no_logging=1) - runner = HBMasterCommandRunner(self) + runner = BusyboxHttpdMasterCommandRunner(self) runner.run(". /scripts/functions") runner.run("DEVICE=%s configure_networking" % @@ -260,21 +260,21 @@ logging.debug("deploy done") -target_class = HighbankTarget - - -class HBMasterCommandRunner(MasterCommandRunner): +target_class = IpmiPxeTarget + + +class BusyboxHttpdMasterCommandRunner(MasterCommandRunner): """A CommandRunner to use when the target is booted into the master image. """ http_pid = None def __init__(self, target): - super(HBMasterCommandRunner, self).__init__(target) + super(BusyboxHttpdMasterCommandRunner, self).__init__(target) def start_http_server(self): master_ip = self.get_master_ip() if self.http_pid != None: - raise OperationFailed("busybox httpd already running with pid %" % self.http_pid) + raise OperationFailed("busybox httpd already running with pid %d" % self.http_pid) # busybox produces no output to parse for, so run it in the bg and get its pid self.run('busybox httpd -f &') self.run('echo pid:$!:pid',response="pid:(\d+):pid",timeout=10)