Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/5.x] Cherry pick: Enable redirection when starting a network (#6732) | Fixed the backup redirection config in the start_network.py (#6755) #6842

Merged
merged 2 commits into from
Feb 20, 2025
Merged

[release/5.x] Cherry pick: Enable redirection when starting a network (#6732) | Fixed the backup redirection config in the start_network.py (#6755) #6842

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9db8319
Enable redirection when starting a network (#6732)
msftsettiy Jan 8, 2025
ca9be7a
Fixed the backup redirection config in the start_network.py (#6755)
msftsettiy Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions tests/start_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,28 @@ def run(args):
for host_desc in host_descs:
interface = infra.interfaces.RPCInterface.from_args(args)
interface.parse_from_str(host_desc)

if args.redirection_kind == "node-by-role":
LOG.warning("Redirection with node-by-role is enabled")
interface.redirections = infra.interfaces.RedirectionConfig(
to_primary=infra.interfaces.NodeByRoleResolver(),
to_backup=infra.interfaces.NodeByRoleResolver(
target=infra.interfaces.TargetRole(
infra.interfaces.NodeRole.backup
)
),
)
elif args.redirection_kind == "static-address":
LOG.warning("Redirection with static-address is enabled")
interface.redirections = infra.interfaces.RedirectionConfig(
to_primary=infra.interfaces.StaticAddressResolver(
args.primary_hostname
),
to_backup=infra.interfaces.StaticAddressResolver(
args.backup_hostname
),
)

hosts.append(
infra.interfaces.HostSpec(
rpc_interfaces={infra.interfaces.PRIMARY_RPC_INTERFACE: interface}
Expand Down Expand Up @@ -209,12 +231,34 @@ def add(parser):
type=int,
default=0,
)
parser.add_argument(
"--redirection-kind",
default="node-by-role",
choices=["node-by-role", "static-address"],
help="The redirection kind to use in lieu of forwarding. Either node-by-role or static-address",
)
parser.add_argument(
"--primary-hostname",
help="The primary hostname to set when --redirection-kind is set to static-address",
)
parser.add_argument(
"--backup-hostname",
help="The backup hostname to set when --redirection-kind is set to static-address",
)

args = infra.e2e_args.cli_args(add)
if args.recover and not all([args.ledger_dir, args.common_dir]):
print("Error: --recover requires --ledger-dir and --common-dir arguments.")
sys.exit(1)

if args.redirection_kind == "static-address" and not all(
[args.primary_hostname, args.backup_hostname]
):
print(
"Error: --redirection-kind static-address requires --primary-hostname and --backup-hostname arguments."
)
sys.exit(1)

if args.common_dir is not None:
args.common_dir = os.path.abspath(args.common_dir)

Expand Down