Muckin around with multiaddr unpacking in .cli; need to use actual lib not our stuff! Bp
parent
88353ffef8
commit
2ebb1e1019
|
|
@ -46,8 +46,8 @@ log = get_logger('piker.cli')
|
||||||
|
|
||||||
|
|
||||||
def load_trans_eps(
|
def load_trans_eps(
|
||||||
network: dict | None = None,
|
network: dict|None = None,
|
||||||
maddrs: list[tuple] | None = None,
|
maddrs: list[tuple]|None = None,
|
||||||
|
|
||||||
) -> dict[str, dict[str, dict]]:
|
) -> dict[str, dict[str, dict]]:
|
||||||
|
|
||||||
|
|
@ -61,15 +61,15 @@ def load_trans_eps(
|
||||||
|
|
||||||
if (
|
if (
|
||||||
network
|
network
|
||||||
and not maddrs
|
and
|
||||||
|
not maddrs
|
||||||
):
|
):
|
||||||
# load network section and (attempt to) connect all endpoints
|
# load network section and (attempt to) connect all endpoints
|
||||||
# which are reachable B)
|
# which are reachable B)
|
||||||
for key, maddrs in network.items():
|
for key, maddrs in network.items():
|
||||||
match key:
|
match key:
|
||||||
|
|
||||||
# TODO: resolve table across multiple discov
|
# TODO: resolve table across multiple discov prots Bo
|
||||||
# prots Bo
|
|
||||||
case 'resolv':
|
case 'resolv':
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -123,7 +123,7 @@ def load_trans_eps(
|
||||||
# help='Enable local ``elasticsearch`` instance'
|
# help='Enable local ``elasticsearch`` instance'
|
||||||
# )
|
# )
|
||||||
def pikerd(
|
def pikerd(
|
||||||
maddr: list[str] | None,
|
maddr: list[str]|None,
|
||||||
loglevel: str,
|
loglevel: str,
|
||||||
tl: bool,
|
tl: bool,
|
||||||
pdb: bool,
|
pdb: bool,
|
||||||
|
|
@ -156,7 +156,8 @@ def pikerd(
|
||||||
network: dict = conf.get('network')
|
network: dict = conf.get('network')
|
||||||
if (
|
if (
|
||||||
network is None
|
network is None
|
||||||
and not maddr
|
and
|
||||||
|
not maddr
|
||||||
):
|
):
|
||||||
regaddrs = [(
|
regaddrs = [(
|
||||||
_default_registry_host,
|
_default_registry_host,
|
||||||
|
|
@ -168,10 +169,40 @@ def pikerd(
|
||||||
network,
|
network,
|
||||||
maddr,
|
maddr,
|
||||||
)
|
)
|
||||||
|
match eps:
|
||||||
|
case {
|
||||||
|
'pikerd': [
|
||||||
|
{
|
||||||
|
'ipv4': {
|
||||||
|
'layer': 3,
|
||||||
|
'addr': host,
|
||||||
|
'proto': l3_proto,
|
||||||
|
},
|
||||||
|
'tcp': {
|
||||||
|
'layer': 4,
|
||||||
|
'port': int(port),
|
||||||
|
'proto': l4_proto,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
# | {
|
||||||
|
# 'uds': {
|
||||||
|
# 'layer': 4,
|
||||||
|
# 'port': int(port),
|
||||||
|
# },
|
||||||
|
# },
|
||||||
|
],
|
||||||
|
}:
|
||||||
|
assert l3_proto == 'ipv4'
|
||||||
|
assert l4_proto == 'tcp'
|
||||||
|
# breakpoint()
|
||||||
|
|
||||||
|
# XXX, for now always setup a localhost TCP registry addr.
|
||||||
for layers in eps['pikerd']:
|
for layers in eps['pikerd']:
|
||||||
|
host: str = layers['ipv4']['addr']
|
||||||
|
port: int = layers['tcp']['port']
|
||||||
regaddrs.append((
|
regaddrs.append((
|
||||||
layers['ipv4']['addr'],
|
host,
|
||||||
layers['tcp']['port'],
|
port,
|
||||||
))
|
))
|
||||||
|
|
||||||
from .. import service
|
from .. import service
|
||||||
|
|
@ -183,8 +214,8 @@ def pikerd(
|
||||||
registry_addrs=regaddrs,
|
registry_addrs=regaddrs,
|
||||||
loglevel=loglevel,
|
loglevel=loglevel,
|
||||||
debug_mode=pdb,
|
debug_mode=pdb,
|
||||||
# enable_transports=['uds'],
|
enable_transports=[l4_proto],
|
||||||
enable_transports=['tcp'],
|
# enable_transports=['tcp'],
|
||||||
) as service_mngr,
|
) as service_mngr,
|
||||||
):
|
):
|
||||||
assert service_mngr
|
assert service_mngr
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue