| Message ID | 20220225210156.2032055-4-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Avocado tests: filter out tests using TCG booting full blown distros | expand |
On 25/2/22 22:01, Cleber Rosa wrote: > Since Avocado 94.0[1], the "avocado.utils.network" dropped a lot of > previously deprecated API names, having the new names into a finer > grained structure. > > This simply uses the new API names for the network port utility > module. > > [1] - https://avocado-framework.readthedocs.io/en/latest/releases/94_0.html#utility-apis > > Signed-off-by: Cleber Rosa <crosa@redhat.com> > --- > tests/avocado/avocado_qemu/__init__.py | 5 +++-- > tests/avocado/migration.py | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cleber Rosa <crosa@redhat.com> writes: > Since Avocado 94.0[1], the "avocado.utils.network" dropped a lot of > previously deprecated API names, having the new names into a finer > grained structure. > > This simply uses the new API names for the network port utility > module. > > [1] - https://avocado-framework.readthedocs.io/en/latest/releases/94_0.html#utility-apis > > Signed-off-by: Cleber Rosa <crosa@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py index 88cec83e5c..3f15c8a222 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -17,7 +17,8 @@ import uuid import avocado -from avocado.utils import cloudinit, datadrainer, network, process, ssh, vmimage +from avocado.utils import cloudinit, datadrainer, process, ssh, vmimage +from avocado.utils.network import ports from avocado.utils.path import find_command #: The QEMU build root directory. It may also be the source directory @@ -601,7 +602,7 @@ def prepare_cloudinit(self, ssh_pubkey=None): self.log.info('Preparing cloudinit image') try: cloudinit_iso = os.path.join(self.workdir, 'cloudinit.iso') - self.phone_home_port = network.find_free_port() + self.phone_home_port = ports.find_free_port() pubkey_content = None if ssh_pubkey: with open(ssh_pubkey) as pubkey: diff --git a/tests/avocado/migration.py b/tests/avocado/migration.py index 584d6ef53f..4b25680c50 100644 --- a/tests/avocado/migration.py +++ b/tests/avocado/migration.py @@ -14,7 +14,7 @@ from avocado_qemu import QemuSystemTest from avocado import skipUnless -from avocado.utils import network +from avocado.utils.network import ports from avocado.utils import wait from avocado.utils.path import find_command @@ -57,7 +57,7 @@ def do_migrate(self, dest_uri, src_uri=None): self.assert_migration(source_vm, dest_vm) def _get_free_port(self): - port = network.find_free_port() + port = ports.find_free_port() if port is None: self.cancel('Failed to find a free port') return port
Since Avocado 94.0[1], the "avocado.utils.network" dropped a lot of previously deprecated API names, having the new names into a finer grained structure. This simply uses the new API names for the network port utility module. [1] - https://avocado-framework.readthedocs.io/en/latest/releases/94_0.html#utility-apis Signed-off-by: Cleber Rosa <crosa@redhat.com> --- tests/avocado/avocado_qemu/__init__.py | 5 +++-- tests/avocado/migration.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)