summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp/lib/oeqa
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2022-02-22 16:58:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-25 12:41:48 +0000
commit18f40dfdfd81d0a08ad31fbe33815477190fa1b6 (patch)
tree793009dc086dffd721d91c6d174899945c221b0d /meta-yocto-bsp/lib/oeqa
parentd418a495bbdee395c8c38191847a19c3256c2a72 (diff)
downloadpoky-18f40dfdfd81d0a08ad31fbe33815477190fa1b6.tar.gz
poky-18f40dfdfd81d0a08ad31fbe33815477190fa1b6.tar.bz2
poky-18f40dfdfd81d0a08ad31fbe33815477190fa1b6.zip
oeqa/controllers: update for MasterImageHardwareTarget->Controller...
oe-core f87b328 renamed MasterImageHardwareTarget to ControllerImageHardwareTarget, but these files were left out of the updates. (From meta-yocto rev: 8e578551e14e90da20701bb8a9598e2bb25f74e6) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/lib/oeqa')
-rw-r--r--meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py19
-rw-r--r--meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py17
-rw-r--r--meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py17
3 files changed, 25 insertions, 28 deletions
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
index 0f1aeb398f..7af3e1dac7 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
+++ b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
@@ -24,11 +24,10 @@ import subprocess
import sys
import pexpect
-import oeqa.utils.sshcontrol as sshcontrol
-from oeqa.controllers.masterimage import MasterImageHardwareTarget
+from oeqa.controllers.controllerimage import ControllerImageHardwareTarget
-class BeagleBoneTarget(MasterImageHardwareTarget):
+class BeagleBoneTarget(ControllerImageHardwareTarget):
dtbs = {'uImage-am335x-bone.dtb': 'am335x-bone.dtb', 'uImage-am335x-boneblack.dtb': 'am335x-boneblack.dtb'}
@@ -57,21 +56,21 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
def _deploy(self):
- self.master.run("umount /boot; umount /mnt/testrootfs;")
- self.master.ignore_status = False
+ self.controller.run("umount /boot; umount /mnt/testrootfs;")
+ self.controller.ignore_status = False
# Kernel and dtb files may not be in the image, so copy them just in case
- self.master.copy_to(self.kernel, "~/test-kernel")
+ self.controller.copy_to(self.kernel, "~/test-kernel")
kernelpath = os.path.dirname(self.kernel)
for dtborig, dtbfn in self.dtbs.iteritems():
dtbfile = os.path.join(kernelpath, dtborig)
if os.path.exists(dtbfile):
- self.master.copy_to(dtbfile, "~/%s" % dtbfn)
- self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype)
+ self.controller.copy_to(dtbfile, "~/%s" % dtbfn)
+ self.controller.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype)
for cmd in self.deploy_cmds:
- self.master.run(cmd)
+ self.controller.run(cmd)
def _start(self, params=None):
- self.power_cycle(self.master)
+ self.power_cycle(self.controller)
try:
serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout)
# We'd wait for "U-Boot" here but sometimes we connect too late on BeagleBone white to see it
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py b/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
index 9c47b5b044..e31670db48 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
+++ b/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
@@ -35,11 +35,10 @@ import subprocess
import sys
import pexpect
-import oeqa.utils.sshcontrol as sshcontrol
-from oeqa.controllers.masterimage import MasterImageHardwareTarget
+from oeqa.controllers.controllerimage import ControllerImageHardwareTarget
-class EdgeRouterTarget(MasterImageHardwareTarget):
+class EdgeRouterTarget(ControllerImageHardwareTarget):
def __init__(self, d):
super(EdgeRouterTarget, self).__init__(d)
@@ -58,15 +57,15 @@ class EdgeRouterTarget(MasterImageHardwareTarget):
def _deploy(self):
- self.master.run("umount /mnt/testrootfs;")
- self.master.ignore_status = False
- self.master.copy_to(self.kernel, "~/test-kernel")
- self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype)
+ self.controller.run("umount /mnt/testrootfs;")
+ self.controller.ignore_status = False
+ self.controller.copy_to(self.kernel, "~/test-kernel")
+ self.controller.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype)
for cmd in self.deploy_cmds:
- self.master.run(cmd)
+ self.controller.run(cmd)
def _start(self, params=None):
- self.power_cycle(self.master)
+ self.power_cycle(self.controller)
try:
serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout)
serialconn.expect("U-Boot")
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py b/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
index 7bc807d2bc..c3a98979c5 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
+++ b/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
@@ -19,10 +19,9 @@ import subprocess
import sys
import pexpect
-import oeqa.utils.sshcontrol as sshcontrol
-from oeqa.controllers.masterimage import MasterImageHardwareTarget
+from oeqa.controllers.controllerimage import ControllerImageHardwareTarget
-class GrubTarget(MasterImageHardwareTarget):
+class GrubTarget(ControllerImageHardwareTarget):
def __init__(self, d):
super(GrubTarget, self).__init__(d)
@@ -41,16 +40,16 @@ class GrubTarget(MasterImageHardwareTarget):
def _deploy(self):
# make sure these aren't mounted
- self.master.run("umount /boot; umount /mnt/testrootfs;")
- self.master.ignore_status = False
+ self.controller.run("umount /boot; umount /mnt/testrootfs;")
+ self.controller.ignore_status = False
# Kernel files may not be in the image, so copy them just in case
- self.master.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype)
- self.master.copy_to(self.kernel, "~/test-kernel")
+ self.controller.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype)
+ self.controller.copy_to(self.kernel, "~/test-kernel")
for cmd in self.deploy_cmds:
- self.master.run(cmd)
+ self.controller.run(cmd)
def _start(self, params=None):
- self.power_cycle(self.master)
+ self.power_cycle(self.controller)
try:
serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout)
serialconn.expect("GNU GRUB version 2.00")