diff --git a/openstackclient/network/v2/network_trunk.py b/openstackclient/network/v2/network_trunk.py index 8d83e6175f..f8f1c5bcbb 100644 --- a/openstackclient/network/v2/network_trunk.py +++ b/openstackclient/network/v2/network_trunk.py @@ -17,6 +17,7 @@ """Network trunk and subports action implementations""" import logging +import typing as ty from cliff import columns as cliff_columns from osc_lib.cli import format_columns @@ -343,7 +344,7 @@ def _get_columns(item): def _get_attrs_for_trunk(client_manager, parsed_args): - attrs = {} + attrs: dict[str, ty.Any] = {} if parsed_args.name is not None: attrs['name'] = str(parsed_args.name) if parsed_args.description is not None: @@ -400,7 +401,7 @@ def _format_subports(client_manager, subports): def _get_attrs_for_subports(client_manager, parsed_args): - attrs = {} + attrs = [] if 'set_subports' in parsed_args and parsed_args.set_subports is not None: attrs = _format_subports(client_manager, parsed_args.set_subports) if ( diff --git a/openstackclient/tests/functional/base.py b/openstackclient/tests/functional/base.py index 2539c56fc3..97b2c1830d 100644 --- a/openstackclient/tests/functional/base.py +++ b/openstackclient/tests/functional/base.py @@ -36,8 +36,8 @@ def execute(cmd, *, fail_ok=False): proc = subprocess.Popen(cmdlist, stdout=stdout, stderr=stderr, env=env) - result_out, result_err = proc.communicate() - result_out = result_out.decode('utf-8') + result_out_b, result_err = proc.communicate() + result_out = result_out_b.decode('utf-8') LOG.debug('stdout: %s', result_out) LOG.debug('stderr: %s', result_err)