diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cf3ba77..412dd608 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#243](https://github.com/fabric-testbed/fabrictestbed-extensions/issues/243), PR [#251](https://github.com/fabric-testbed/fabrictestbed-extensions/pull/251)) +### Changed + +- Use defaults for FABRIC CM, orchestrator and bastion hosts (Issue + [#258](https://github.com/fabric-testbed/fabrictestbed-extensions/issues/258)) + ## [1.5.5] diff --git a/fabrictestbed_extensions/fablib/fablib.py b/fabrictestbed_extensions/fablib/fablib.py index aa02b776..c54305eb 100644 --- a/fabrictestbed_extensions/fablib/fablib.py +++ b/fabrictestbed_extensions/fablib/fablib.py @@ -573,6 +573,10 @@ class FablibManager: "CRITICAL": logging.CRITICAL, } + DEFAULT_FABRIC_CREDMGR_HOST = "cm.fabric-testbed.net" + DEFAULT_FABRIC_ORCHESTRATOR_HOST = "orchestrator.fabric-testbed.net" + DEFAULT_FABRIC_BASTION_HOST = "bastion.fabric-testbed.net" + default_fabric_rc = os.environ["HOME"] + "/work/fabric_config/fabric_rc" default_log_level = "DEBUG" default_log_file = "/tmp/fablib/fablib.log" @@ -784,6 +788,15 @@ def __init__( self.bastion_private_ipv4_addr = "0.0.0.0" self.bastion_private_ipv6_addr = "0:0:0:0:0:0" + if self.credmgr_host is None: + self.credmgr_host = self.DEFAULT_FABRIC_CREDMGR_HOST + + if self.orchestrator_host is None: + self.orchestrator_host = self.DEFAULT_FABRIC_ORCHESTRATOR_HOST + + if self.bastion_public_addr is None: + self.bastion_public_addr = self.DEFAULT_FABRIC_BASTION_HOST + self._validate_configuration() # Create slice manager