From 4955df38f5448f968b6478e6fab94efebc900518 Mon Sep 17 00:00:00 2001 From: Matthias Frei Date: Tue, 11 Feb 2020 13:58:30 +0100 Subject: [PATCH 1/3] Remove unused sd_client config from control service --- go/cs/config/config.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/go/cs/config/config.go b/go/cs/config/config.go index 95b7b70ea9..db77d45fa2 100644 --- a/go/cs/config/config.go +++ b/go/cs/config/config.go @@ -85,8 +85,7 @@ type Config struct { Logging env.Logging Metrics env.Metrics Tracing env.Tracing - QUIC env.QUIC `toml:"quic"` - SCIOND env.SCIONDClient `toml:"sd_client"` + QUIC env.QUIC `toml:"quic"` TrustDB truststorage.TrustDBConf BeaconDB beaconstorage.BeaconDBConf BS BSConfig @@ -103,7 +102,6 @@ func (cfg *Config) InitDefaults() { &cfg.Logging, &cfg.Metrics, &cfg.Tracing, - &cfg.SCIOND, &cfg.TrustDB, &cfg.BeaconDB, &cfg.BS, @@ -119,7 +117,6 @@ func (cfg *Config) Validate() error { &cfg.Features, &cfg.Logging, &cfg.Metrics, - &cfg.SCIOND, &cfg.TrustDB, &cfg.BeaconDB, &cfg.BS, @@ -137,7 +134,6 @@ func (cfg *Config) Sample(dst io.Writer, path config.Path, _ config.CtxMap) { &cfg.Metrics, &cfg.Tracing, &cfg.QUIC, - &cfg.SCIOND, &cfg.TrustDB, &cfg.BeaconDB, &cfg.BS, From 16f3e421be5f0ca39badf5e7b47392de2498bf3e Mon Sep 17 00:00:00 2001 From: Matthias Frei Date: Mon, 17 Feb 2020 16:09:44 +0100 Subject: [PATCH 2/3] Remove sd_config from generator and test configs --- acceptance/topo_cs_reload/testdata/cs.toml | 3 --- go/lib/env/testdata/cs.toml | 7 ------- python/topology/go.py | 4 ---- 3 files changed, 14 deletions(-) diff --git a/acceptance/topo_cs_reload/testdata/cs.toml b/acceptance/topo_cs_reload/testdata/cs.toml index 51757c3e2a..eb06570cc5 100644 --- a/acceptance/topo_cs_reload/testdata/cs.toml +++ b/acceptance/topo_cs_reload/testdata/cs.toml @@ -20,6 +20,3 @@ Connection = "cs1-ff00_0_110-1.beacon.db" [metrics] Prometheus = "242.253.100.2:30453" - -[sd_client] -Address = "242.253.100.3:30255" diff --git a/go/lib/env/testdata/cs.toml b/go/lib/env/testdata/cs.toml index 2415e87c7c..eae93f4319 100644 --- a/go/lib/env/testdata/cs.toml +++ b/go/lib/env/testdata/cs.toml @@ -14,13 +14,6 @@ # reconnects. ReconnectToDispatcher = true -[sd_client] - # Sciond path. It defaults to sciond.DefaultSCIONDPath. - Path = "/run/shm/sciond/1-ff00_0_110.sock" - - # Timeout for trying to connect to sciond. (default 20s) - Timeout = "20s" - [logging] [logging.file] # Location of the logging file. diff --git a/python/topology/go.py b/python/topology/go.py index e4e331b2b3..68bbb9bdc2 100755 --- a/python/topology/go.py +++ b/python/topology/go.py @@ -111,7 +111,6 @@ def generate_control_service(self): CS_CONFIG_NAME), toml.dumps(bs_conf)) def _build_control_service_conf(self, topo_id, ia, base, name, infra_elem): - sciond = "[%s]:%d" % (sciond_ip(self.args.docker, topo_id, self.args.networks), SD_API_PORT) config_dir = '/share/conf' if self.args.docker else os.path.join( base, name) raw_entry = { @@ -132,9 +131,6 @@ def _build_control_service_conf(self, topo_id, ia, base, name, infra_elem): 'tracing': self._tracing_entry(), 'metrics': self._metrics_entry(name, infra_elem, CS_PROM_PORT), 'quic': self._quic_conf_entry(CS_QUIC_PORT, self.args.svcfrac, infra_elem), - 'sd_client': { - 'address': sciond, - }, 'cs': { 'LeafReissueLeadTime': "6h", 'IssuerReissueLeadTime': "3d", From d4528313bee49593c1ed135e6db99bef77d2d481 Mon Sep 17 00:00:00 2001 From: Matthias Frei Date: Mon, 17 Feb 2020 16:22:57 +0100 Subject: [PATCH 3/3] Remove unused option EnableQUICTest --- go/cs/config/config.go | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/go/cs/config/config.go b/go/cs/config/config.go index db77d45fa2..a851546c69 100644 --- a/go/cs/config/config.go +++ b/go/cs/config/config.go @@ -80,18 +80,17 @@ var _ config.Config = (*Config)(nil) // Config is the beacon server configuration. type Config struct { - General env.General - Features env.Features - Logging env.Logging - Metrics env.Metrics - Tracing env.Tracing - QUIC env.QUIC `toml:"quic"` - TrustDB truststorage.TrustDBConf - BeaconDB beaconstorage.BeaconDBConf - BS BSConfig - CS CSConfig - PS PSConfig - EnableQUICTest bool + General env.General + Features env.Features + Logging env.Logging + Metrics env.Metrics + Tracing env.Tracing + QUIC env.QUIC `toml:"quic"` + TrustDB truststorage.TrustDBConf + BeaconDB beaconstorage.BeaconDBConf + BS BSConfig + CS CSConfig + PS PSConfig } // InitDefaults initializes the default values for all parts of the config.