From c125a29764b8f8fb1c3c9d6344b150cd474a6c0c Mon Sep 17 00:00:00 2001 From: refai06 Date: Mon, 6 Jan 2025 15:38:10 +0530 Subject: [PATCH 1/8] Clean envoy CLI & config Signed-off-by: refai06 --- .../101_MNIST/Portland/Portland_config.yaml | 4 +++ .../101_MNIST/Portland/start_envoy.sh | 2 +- .../101_MNIST/Seattle/Seattle_config.yaml | 4 +++ .../101_MNIST/Seattle/start_envoy.sh | 2 +- .../Bangalore/Bangalore_config.yaml | 4 +++ .../Bangalore/start_envoy.sh | 2 +- .../Chandler/Chandler_config.yaml | 4 +++ .../Chandler/start_envoy.sh | 2 +- .../workflow/component/envoy/envoy.py | 4 +-- .../workflow/interface/cli/envoy.py | 28 ++++--------------- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/Portland_config.yaml b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/Portland_config.yaml index 318e22d71d..a37e5010bd 100755 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/Portland_config.yaml +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/Portland_config.yaml @@ -1,2 +1,6 @@ +settings: + director_host: localhost + director_port: 50050 + Portland: private_attributes: private_attributes.portland_attrs \ No newline at end of file diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/start_envoy.sh b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/start_envoy.sh +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/Seattle_config.yaml b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/Seattle_config.yaml index b95c8242ef..07a819115c 100755 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/Seattle_config.yaml +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/Seattle_config.yaml @@ -1,2 +1,6 @@ +settings: + director_host: localhost + director_port: 50050 + Seattle: private_attributes: private_attributes.seattle_attrs \ No newline at end of file diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/start_envoy.sh b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/start_envoy.sh +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/Bangalore_config.yaml b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/Bangalore_config.yaml index ec4a088af7..51366acea8 100644 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/Bangalore_config.yaml +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/Bangalore_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + Bangalore: callable_func: settings: diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/start_envoy.sh b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/start_envoy.sh +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/Chandler_config.yaml b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/Chandler_config.yaml index 60f763ee55..ac0cffda09 100644 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/Chandler_config.yaml +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/Chandler_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + Chandler: callable_func: settings: diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/start_envoy.sh b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/start_envoy.sh +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/openfl/experimental/workflow/component/envoy/envoy.py b/openfl/experimental/workflow/component/envoy/envoy.py index c532ee1a6b..7fb6ccaa56 100644 --- a/openfl/experimental/workflow/component/envoy/envoy.py +++ b/openfl/experimental/workflow/component/envoy/envoy.py @@ -48,8 +48,8 @@ def __init__( self, *, envoy_name: str, - director_host: str, - director_port: int, + director_host: str = "[::]", + director_port: int = 50051, envoy_config: Optional[Path] = None, root_certificate: Optional[Union[Path, str]] = None, private_key: Optional[Union[Path, str]] = None, diff --git a/openfl/experimental/workflow/interface/cli/envoy.py b/openfl/experimental/workflow/interface/cli/envoy.py index dbb5d57ce9..5f62e88cfe 100644 --- a/openfl/experimental/workflow/interface/cli/envoy.py +++ b/openfl/experimental/workflow/interface/cli/envoy.py @@ -12,7 +12,7 @@ from dynaconf import Validator from openfl.experimental.workflow.component.envoy import Envoy -from openfl.utilities import click_types, merge_configs +from openfl.utilities import merge_configs from openfl.utilities.path_check import is_directory_traversal logger = logging.getLogger(__name__) @@ -31,20 +31,6 @@ def envoy(context): @envoy.command(name="start") @option("-n", "--envoy_name", required=True, help="Current shard name") -@option( - "-dh", - "--director-host", - required=True, - help="The FQDN of the federation director", - type=click_types.FQDN, -) -@option( - "-dp", - "--director-port", - required=True, - help="The federation director port", - type=click.IntRange(1, 65535), -) @option( "--tls/--disable-tls", default=True, @@ -52,7 +38,7 @@ def envoy(context): help="Use TLS or not (By default TLS is enabled)", ) @option( - "-ec", + "-c", "--envoy-config-path", default="envoy_config.yaml", help="The envoy config path", @@ -84,8 +70,6 @@ def envoy(context): ) def start_( envoy_name, - director_host, - director_port, tls, envoy_config_path, root_certificate, @@ -96,8 +80,6 @@ def start_( Args: envoy_name (str): Name of the Envoy. - director_host (str): The FQDN of the federation director. - director_port (int): The federation director port. tls (bool): Use TLS or not. envoy_config_path (str): The envoy config path. root_certificate (str): Path to a root CA cert. @@ -118,6 +100,8 @@ def start_( "certificate": certificate, }, validators=[ + Validator("settings.director_host", default="localhost"), + Validator("settings.director_port", default=50051, gte=1024, lte=65535), Validator("params.install_requirements", default=True), ], ) @@ -138,8 +122,8 @@ def start_( envoy = Envoy( envoy_name=envoy_name, - director_host=director_host, - director_port=director_port, + director_host=config.settings.director_host, + director_port=config.settings.director_port, envoy_config=Path(envoy_config_path).absolute(), root_certificate=config.root_certificate, private_key=config.private_key, From 1f2f5984ecb2b98ddc019e0927dba6c588d26271 Mon Sep 17 00:00:00 2001 From: refai06 Date: Tue, 7 Jan 2025 15:28:15 +0530 Subject: [PATCH 2/8] Cleanup federatedruntime testcase-config Signed-off-by: refai06 --- .../testcase_datastore_cli/envoy_one/envoy_config.yaml | 4 ++++ .../testcase_datastore_cli/envoy_one/start_envoy.sh | 2 +- .../testcase_datastore_cli/envoy_two/envoy_config.yaml | 4 ++++ .../testcase_datastore_cli/envoy_two/start_envoy.sh | 2 +- .../testcase_include_exclude/envoy_one/envoy_config.yaml | 4 +++- .../testcase_include_exclude/envoy_one/start_envoy.sh | 2 +- .../testcase_include_exclude/envoy_two/envoy_config.yaml | 4 ++++ .../testcase_include_exclude/envoy_two/start_envoy.sh | 2 +- .../testcase_internalloop/envoy_one/envoy_config.yaml | 3 +++ .../testcase_internalloop/envoy_one/start_envoy.sh | 2 +- .../testcase_internalloop/envoy_two/envoy_config.yaml | 3 +++ .../testcase_internalloop/envoy_two/start_envoy.sh | 2 +- .../testcase_private_attributes/envoy_one/envoy_config.yaml | 4 ++++ .../testcase_private_attributes/envoy_one/start_envoy.sh | 2 +- .../testcase_private_attributes/envoy_two/envoy_config.yaml | 4 ++++ .../testcase_private_attributes/envoy_two/start_envoy.sh | 2 +- .../envoy_one/envoy_config.yaml | 4 ++++ .../envoy_one/start_envoy.sh | 2 +- .../envoy_two/envoy_config.yaml | 4 ++++ .../envoy_two/start_envoy.sh | 2 +- .../envoy_one/envoy_config.yaml | 4 ++++ .../envoy_one/start_envoy.sh | 2 +- .../envoy_two/envoy_config.yaml | 4 ++++ .../envoy_two/start_envoy.sh | 2 +- .../testcase_reference/envoy_one/envoy_config.yaml | 4 ++++ .../testcase_reference/envoy_one/start_envoy.sh | 2 +- .../testcase_reference/envoy_two/envoy_config.yaml | 4 ++++ .../testcase_reference/envoy_two/start_envoy.sh | 2 +- .../envoy_one/envoy_config.yaml | 3 +++ .../envoy_one/start_envoy.sh | 2 +- .../envoy_two/envoy_config.yaml | 4 +++- .../envoy_two/start_envoy.sh | 2 +- .../envoy_four/envoy_config.yaml | 4 ++++ .../envoy_four/start_envoy.sh | 2 +- .../envoy_one/envoy_config.yaml | 4 ++++ .../testcase_subset_of_collaborators/envoy_one/start_envoy.sh | 2 +- .../envoy_three/envoy_config.yaml | 4 ++++ .../envoy_three/start_envoy.sh | 2 +- .../envoy_two/envoy_config.yaml | 4 ++++ .../testcase_subset_of_collaborators/envoy_two/start_envoy.sh | 2 +- 40 files changed, 95 insertions(+), 22 deletions(-) diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/envoy_config.yaml index f6f96d3d6b..a7ec1ff3e5 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_one: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/envoy_config.yaml index eaf34da1df..53af1eff87 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_two: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/envoy_config.yaml index 3d8b4e2882..d52281fda0 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/envoy_config.yaml @@ -1,2 +1,4 @@ - +settings: + director_host: localhost + director_port: 50050 \ No newline at end of file diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/start_envoy.sh index bfc8af2959..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/envoy_config.yaml index e69de29bb2..d52281fda0 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/envoy_config.yaml @@ -0,0 +1,4 @@ +settings: + director_host: localhost + director_port: 50050 + \ No newline at end of file diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/start_envoy.sh index bfc8af2959..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/envoy_config.yaml index e69de29bb2..6d54e2b64a 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/envoy_config.yaml @@ -0,0 +1,3 @@ +settings: + director_host: localhost + director_port: 50050 \ No newline at end of file diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/envoy_config.yaml index e69de29bb2..6d54e2b64a 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/envoy_config.yaml @@ -0,0 +1,3 @@ +settings: + director_host: localhost + director_port: 50050 \ No newline at end of file diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/envoy_config.yaml index 73a1ce09f4..2db6f82dee 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_one: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/envoy_config.yaml index ec859a79cd..060b7dbd37 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_two: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/envoy_config.yaml index afce54bcd2..4d4591cef9 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_one: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/envoy_config.yaml index 51c4e7be6e..629fa0b14a 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_two: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/envoy_config.yaml index a4a2ecb2d8..5ab81a1b49 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/envoy_config.yaml @@ -1,2 +1,6 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_one: private_attributes: private_attributes.collaborator_private_attrs.collaborator_private_attributes diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/envoy_config.yaml index 9bce3671b7..3827c74155 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/envoy_config.yaml @@ -1,2 +1,6 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_two: private_attributes: private_attributes.collaborator_private_attrs.collaborator_private_attributes \ No newline at end of file diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/envoy_config.yaml index bb76d4845e..8370aa8985 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_one: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/envoy_config.yaml index 2c44953a5e..ca7e8b60ab 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_two: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/envoy_config.yaml index e69de29bb2..6d54e2b64a 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/envoy_config.yaml @@ -0,0 +1,3 @@ +settings: + director_host: localhost + director_port: 50050 \ No newline at end of file diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/envoy_config.yaml index 8b13789179..9aee5ed92b 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/envoy_config.yaml @@ -1 +1,3 @@ - +settings: + director_host: localhost + director_port: 50050 diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/envoy_config.yaml index d5c49635f3..ad23030ec3 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_four: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/envoy_config.yaml index 04e7ad4fd8..1eb2d73be3 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_one: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/envoy_config.yaml index f78af08e58..9ee2ad5aa1 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_three: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/envoy_config.yaml b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/envoy_config.yaml index 6149ff9f1d..4b2a040a1f 100644 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/envoy_config.yaml +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/envoy_config.yaml @@ -1,3 +1,7 @@ +settings: + director_host: localhost + director_port: 50050 + envoy_two: callable_func: settings: diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/start_envoy.sh index 4da07821af..a7737cb856 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" -dh localhost -dp 50050 +fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" From 5f7bbe89ca7dc65fbe40f041579aae5db489a4af Mon Sep 17 00:00:00 2001 From: refai06 Date: Fri, 10 Jan 2025 14:00:53 +0530 Subject: [PATCH 3/8] Update files Signed-off-by: refai06 --- .../101_MNIST/Portland/start_envoy.sh | 2 +- .../101_MNIST/Seattle/start_envoy.sh | 2 +- .../301_MNIST_Watermaking/Bangalore/start_envoy.sh | 2 +- .../301_MNIST_Watermaking/Chandler/start_envoy.sh | 2 +- .../experimental/workflow/component/envoy/envoy.py | 4 ++-- openfl/experimental/workflow/interface/cli/envoy.py | 12 ++++++------ .../testcase_datastore_cli/envoy_one/start_envoy.sh | 2 +- .../testcase_datastore_cli/envoy_two/start_envoy.sh | 2 +- .../envoy_one/start_envoy.sh | 2 +- .../envoy_two/start_envoy.sh | 2 +- .../testcase_internalloop/envoy_one/start_envoy.sh | 2 +- .../testcase_internalloop/envoy_two/start_envoy.sh | 2 +- .../envoy_one/start_envoy.sh | 2 +- .../envoy_two/start_envoy.sh | 2 +- .../envoy_one/start_envoy.sh | 2 +- .../envoy_two/start_envoy.sh | 2 +- .../envoy_one/start_envoy.sh | 2 +- .../envoy_two/start_envoy.sh | 2 +- .../testcase_reference/envoy_one/start_envoy.sh | 2 +- .../testcase_reference/envoy_two/start_envoy.sh | 2 +- .../envoy_one/start_envoy.sh | 2 +- .../envoy_two/start_envoy.sh | 2 +- .../envoy_four/start_envoy.sh | 2 +- .../envoy_one/start_envoy.sh | 2 +- .../envoy_three/start_envoy.sh | 2 +- .../envoy_two/start_envoy.sh | 2 +- 26 files changed, 32 insertions(+), 32 deletions(-) diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/start_envoy.sh b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/start_envoy.sh +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Portland/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/start_envoy.sh b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/start_envoy.sh +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/101_MNIST/Seattle/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/start_envoy.sh b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/start_envoy.sh +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Bangalore/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/start_envoy.sh b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/start_envoy.sh +++ b/openfl-tutorials/experimental/workflow/FederatedRuntime/301_MNIST_Watermaking/Chandler/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/openfl/experimental/workflow/component/envoy/envoy.py b/openfl/experimental/workflow/component/envoy/envoy.py index 7fb6ccaa56..c532ee1a6b 100644 --- a/openfl/experimental/workflow/component/envoy/envoy.py +++ b/openfl/experimental/workflow/component/envoy/envoy.py @@ -48,8 +48,8 @@ def __init__( self, *, envoy_name: str, - director_host: str = "[::]", - director_port: int = 50051, + director_host: str, + director_port: int, envoy_config: Optional[Path] = None, root_certificate: Optional[Union[Path, str]] = None, private_key: Optional[Union[Path, str]] = None, diff --git a/openfl/experimental/workflow/interface/cli/envoy.py b/openfl/experimental/workflow/interface/cli/envoy.py index 5f62e88cfe..b11c88ffc9 100644 --- a/openfl/experimental/workflow/interface/cli/envoy.py +++ b/openfl/experimental/workflow/interface/cli/envoy.py @@ -31,12 +31,6 @@ def envoy(context): @envoy.command(name="start") @option("-n", "--envoy_name", required=True, help="Current shard name") -@option( - "--tls/--disable-tls", - default=True, - is_flag=True, - help="Use TLS or not (By default TLS is enabled)", -) @option( "-c", "--envoy-config-path", @@ -44,6 +38,12 @@ def envoy(context): help="The envoy config path", type=ClickPath(exists=True), ) +@option( + "--tls/--disable-tls", + default=True, + is_flag=True, + help="Use TLS or not (By default TLS is enabled)", +) @option( "-rc", "--root-cert-path", diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_datastore_cli/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_include_exclude/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_internalloop/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_with_both_options/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_private_attributes_initialization_without_callable/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_reference_with_include_exclude/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_four/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_one/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_three/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" diff --git a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/start_envoy.sh b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/start_envoy.sh index a7737cb856..5c2d296cda 100755 --- a/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/start_envoy.sh +++ b/tests/github/experimental/workflow/FederatedRuntime/testcase_subset_of_collaborators/envoy_two/start_envoy.sh @@ -3,4 +3,4 @@ set -e ENVOY_NAME=$1 ENVOY_CONF=$2 -fx envoy start -n "$ENVOY_NAME" --disable-tls --envoy-config-path "$ENVOY_CONF" +fx envoy start -n "$ENVOY_NAME" --disable-tls -c "$ENVOY_CONF" From 781e3b993620c3bee9cf649f6f2d7cf8225d4831 Mon Sep 17 00:00:00 2001 From: refai06 Date: Thu, 16 Jan 2025 18:06:25 +0530 Subject: [PATCH 4/8] Envoy execption-handling Signed-off-by: refai06 --- .../workflow/interface/cli/envoy.py | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/openfl/experimental/workflow/interface/cli/envoy.py b/openfl/experimental/workflow/interface/cli/envoy.py index b11c88ffc9..54a3a60142 100644 --- a/openfl/experimental/workflow/interface/cli/envoy.py +++ b/openfl/experimental/workflow/interface/cli/envoy.py @@ -12,7 +12,7 @@ from dynaconf import Validator from openfl.experimental.workflow.component.envoy import Envoy -from openfl.utilities import merge_configs +from openfl.utilities import is_fqdn, merge_configs from openfl.utilities.path_check import is_directory_traversal logger = logging.getLogger(__name__) @@ -100,8 +100,31 @@ def start_( "certificate": certificate, }, validators=[ - Validator("settings.director_host", default="localhost"), - Validator("settings.director_port", default=50051, gte=1024, lte=65535), + Validator( + "settings", + must_exist=True, + messages={ + "must_exist_true": "Missing 'settings' in the configuration. Please provide it." + }, + ), + Validator( + "settings.director_host", + must_exist=True, + condition=lambda x: bool(x) and is_fqdn(x), + messages={ + "must_exist_true": "Missing 'director_host' in the configuration.", + "condition": "Invalid 'director_host'. Must be a valid FQDN and not undefined.", + }, + ), + Validator( + "settings.director_port", + must_exist=True, + condition=lambda value: isinstance(value, int) and 1024 <= value <= 65535, + messages={ + "must_exist_true": "Missing 'director_port' in the configuration.", + "condition": "Invalid 'director_port'. Must be an integer between 1024 & 65535", + }, + ), Validator("params.install_requirements", default=True), ], ) From 268b3e75132f1d43af7ae337a52d4f35e2db33d0 Mon Sep 17 00:00:00 2001 From: refai06 Date: Fri, 17 Jan 2025 15:26:29 +0530 Subject: [PATCH 5/8] Documentation update for recent change Signed-off-by: refai06 --- .../about/features_index/workflowinterface.rst | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/about/features_index/workflowinterface.rst b/docs/about/features_index/workflowinterface.rst index 6dc9527ba1..a31377b1df 100644 --- a/docs/about/features_index/workflowinterface.rst +++ b/docs/about/features_index/workflowinterface.rst @@ -349,30 +349,36 @@ Use the following command: .. code-block:: shell - $ fx envoy start -n -ec -dh -dp -rc -pk -oc + $ fx envoy start -n -c -rc -pk -oc **Without TLS:** Use the following command: .. code-block:: shell - $ fx envoy start -n --disable-tls -ec + $ fx envoy start -n --disable-tls -c **Explanation of Command Options** - `-n `: Specifies the name of the Envoy. -- `-ec `: Path to the Envoy's configuration file. -- `-dh `: Hostname or IP address of the Director. -- `-dp `: Port on which the Director is running. +- `-c `: Path to the Envoy's configuration file. - `-rc `: Path to the root certificate (used with TLS). - `-pk `: Path to the private key file (used with TLS). - `-oc `: Path to the API certificate file (used with TLS). - `--disable-tls`: Disables TLS encryption. -The Envoy configuration file includes details about the private attributes. An example configuration file :code:`envoy_config.yaml` for :code:`envoy_one` is shown below: +The Envoy configuration file includes details of director_host, director_port and private attributes. An example configuration file :code:`envoy_config.yaml` for :code:`settings` and :code:`envoy_one` is shown below: + +- Hostname (`director_host`) +- Port (`director_port`) +- Private attributes for envoy_one .. code-block:: yaml + settings: + director_host: localhost + director_port: 50050 + envoy_one: private_attributes: private_attributes.envoy_one_attrs From 9f60b9e4c850e299d27032a15e3170bcc439ac83 Mon Sep 17 00:00:00 2001 From: refai06 Date: Fri, 17 Jan 2025 15:51:53 +0530 Subject: [PATCH 6/8] Update error messages Signed-off-by: refai06 --- openfl/experimental/workflow/interface/cli/envoy.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/openfl/experimental/workflow/interface/cli/envoy.py b/openfl/experimental/workflow/interface/cli/envoy.py index 54a3a60142..2fb3340ae9 100644 --- a/openfl/experimental/workflow/interface/cli/envoy.py +++ b/openfl/experimental/workflow/interface/cli/envoy.py @@ -104,7 +104,7 @@ def start_( "settings", must_exist=True, messages={ - "must_exist_true": "Missing 'settings' in the configuration. Please provide it." + "must_exist_true": "Missing 'settings' in Envoy Configuration file." }, ), Validator( @@ -112,8 +112,9 @@ def start_( must_exist=True, condition=lambda x: bool(x) and is_fqdn(x), messages={ - "must_exist_true": "Missing 'director_host' in the configuration.", - "condition": "Invalid 'director_host'. Must be a valid FQDN and not undefined.", + "must_exist_true": "Missing 'director_host' in Envoy Configuration file", + "condition": "Invalid 'director_host' in Envoy Configuration file." + "Must be a valid FQDN", }, ), Validator( @@ -121,8 +122,9 @@ def start_( must_exist=True, condition=lambda value: isinstance(value, int) and 1024 <= value <= 65535, messages={ - "must_exist_true": "Missing 'director_port' in the configuration.", - "condition": "Invalid 'director_port'. Must be an integer between 1024 & 65535", + "must_exist_true": "Missing 'director_port' in Envoy Configuration file", + "condition": "Invalid 'director_port' in Envoy Configuration file" + "Must be an integer between 1024 & 65535", }, ), Validator("params.install_requirements", default=True), From 7a735da0719c04fb68c445d69825cbbcde43582d Mon Sep 17 00:00:00 2001 From: refai06 Date: Mon, 20 Jan 2025 11:14:33 +0530 Subject: [PATCH 7/8] Fix code format Signed-off-by: refai06 --- openfl/experimental/workflow/interface/cli/envoy.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/openfl/experimental/workflow/interface/cli/envoy.py b/openfl/experimental/workflow/interface/cli/envoy.py index 2fb3340ae9..1c16ec9990 100644 --- a/openfl/experimental/workflow/interface/cli/envoy.py +++ b/openfl/experimental/workflow/interface/cli/envoy.py @@ -103,9 +103,7 @@ def start_( Validator( "settings", must_exist=True, - messages={ - "must_exist_true": "Missing 'settings' in Envoy Configuration file." - }, + messages={"must_exist_true": "Missing 'settings' in Envoy Configuration file."}, ), Validator( "settings.director_host", From b6822ec90a9d35164495207330794faaf8252e4f Mon Sep 17 00:00:00 2001 From: refai06 Date: Tue, 21 Jan 2025 11:15:47 +0530 Subject: [PATCH 8/8] Document Update Signed-off-by: refai06 --- docs/about/features_index/workflowinterface.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/about/features_index/workflowinterface.rst b/docs/about/features_index/workflowinterface.rst index a31377b1df..8ef440f4ce 100644 --- a/docs/about/features_index/workflowinterface.rst +++ b/docs/about/features_index/workflowinterface.rst @@ -342,7 +342,7 @@ An example configuration file `director_config.yaml` is shown below: **Envoy: Participating nodes in the Federation** -The `fx envoy start` command is used to start the Envoy. You can run it with or without TLS, depending on your setup. +The :code:`fx envoy start` command is used to start the Envoy. You can run it with or without TLS, depending on your setup. **With TLS:** Use the following command: