Move towards a consistent interface across OETarget subclasses by
moving target_ip to the superclass.
QemuTarget automatically determines the target IP on startup, so default
that to None.
Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
meta/lib/oeqa/core/target/__init__.py | 3 ++-
meta/lib/oeqa/core/target/qemu.py | 4 ++--
meta/lib/oeqa/core/target/ssh.py | 5 ++---
meta/lib/oeqa/runtime/context.py | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta/lib/oeqa/core/target/__init__.py
b/meta/lib/oeqa/core/target/__init__.py
index aff02ecc439..45ed3e54b40 100644
--- a/meta/lib/oeqa/core/target/__init__.py
+++ b/meta/lib/oeqa/core/target/__init__.py
@@ -7,8 +7,9 @@
class OETarget:
- def __init__(self, logger, server_ip):
+ def __init__(self, logger, server_ip, target_ip):
self.server_ip = server_ip
+ self.ip = target_ip
self.logger = logger
def start(self):
diff --git a/meta/lib/oeqa/core/target/qemu.py
b/meta/lib/oeqa/core/target/qemu.py
index 66551607fb9..ef567939ad8 100644
--- a/meta/lib/oeqa/core/target/qemu.py
+++ b/meta/lib/oeqa/core/target/qemu.py
@@ -20,13 +20,13 @@ from oeqa.utils.dump import TargetDumper
supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
class OEQemuTarget(OESSHTarget):
- def __init__(self, logger, server_ip, timeout=300, user='root',
+ def __init__(self, logger, server_ip, target_ip=None, timeout=300,
user='root',
port=None, machine='', rootfs='', kernel='', kvm=False,
slirp=False,
dump_dir='', dump_host_cmds='', display='', bootlog='',
tmpdir='', dir_image='', boottime=60, serial_ports=2,
boot_patterns = defaultdict(str), ovmf=False, tmpfsdir=None,
**kwargs):
- super().__init__(logger, None, server_ip, timeout, user, port)
+ super().__init__(logger, server_ip, target_ip, timeout, user, port)
self.machine = machine
self.rootfs = rootfs
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index bbf621c8e38..b61c7d141d9 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -14,7 +14,7 @@ import codecs
from . import OETarget
class OESSHTarget(OETarget):
- def __init__(self, logger, ip, server_ip, timeout=300, user='root',
+ def __init__(self, logger, server_ip, target_ip, timeout=300, user='root',
port=None, **kwargs):
if not logger:
logger = logging.getLogger('target')
@@ -27,8 +27,7 @@ class OESSHTarget(OETarget):
fileHandler.setFormatter(formatter)
logger.addHandler(fileHandler)
- super().__init__(logger, server_ip)
- self.ip = ip
+ super().__init__(logger, server_ip, target_ip)
self.timeout = timeout
self.user = user
ssh_options = [
diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py
index 8552aa782bc..76cae4ee789 100644
--- a/meta/lib/oeqa/runtime/context.py
+++ b/meta/lib/oeqa/runtime/context.py
@@ -100,7 +100,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
kwargs['port'] = target_ip_port[1]
if target_type == 'simpleremote':
- target = OESSHTarget(logger, target_ip, server_ip, **kwargs)
+ target = OESSHTarget(logger, server_ip, target_ip, **kwargs)
elif target_type == 'qemu':
target = OEQemuTarget(logger, server_ip, **kwargs)
else:
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155909):
https://lists.openembedded.org/g/openembedded-core/message/155909
Mute This Topic: https://lists.openembedded.org/mt/85506114/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
