Merging upstream version 2.4.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
50f6a45557
commit
c2a4b9519f
35 changed files with 364 additions and 122 deletions
|
@ -6,8 +6,8 @@
|
|||
#
|
||||
# Authors: Martin Belanger <Martin.Belanger@dell.com>
|
||||
#
|
||||
''' Module that provides a way to retrieve discovered
|
||||
services from the Avahi daemon over D-Bus.
|
||||
'''Module that provides a way to retrieve discovered
|
||||
services from the Avahi daemon over D-Bus.
|
||||
'''
|
||||
import socket
|
||||
import typing
|
||||
|
@ -167,9 +167,11 @@ class Service: # pylint: disable=too-many-instance-attributes
|
|||
'trsvcid': trsvcid,
|
||||
# host-iface permitted for tcp alone and not rdma
|
||||
'host-iface': host_iface,
|
||||
'subsysnqn': txt.get('nqn', defs.WELL_KNOWN_DISC_NQN).strip()
|
||||
if conf.NvmeOptions().discovery_supp
|
||||
else defs.WELL_KNOWN_DISC_NQN,
|
||||
'subsysnqn': (
|
||||
txt.get('nqn', defs.WELL_KNOWN_DISC_NQN).strip()
|
||||
if conf.NvmeOptions().discovery_supp
|
||||
else defs.WELL_KNOWN_DISC_NQN
|
||||
),
|
||||
}
|
||||
|
||||
self._ip = iputil.get_ipaddress_obj(traddr, ipv4_mapped_convert=True)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue