scionproto · lukedirtwalker · Mar 10, 2020 · Mar 5, 2020
diff --git a/acceptance/brutil/common.sh b/acceptance/brutil/common.sh
@@ -57,7 +57,7 @@ test_config() {
     cp -Lr "acceptance/${TEST_DIR}/conf/." "$TEST_ARTIFACTS_DIR/conf"
 
     # Replace BR ID
-    sed -i "s/ID = .*$/ID = \"${BRID}\"/g" "$BR_TOML"
+    sed -i "s/id = .*$/id = \"${BRID}\"/g" "$BR_TOML"
     sed -i "s/path = .*$/path = \"\/share\/logs\/${BRID}.log\"/g" "$BR_TOML"
 }
 

diff --git a/acceptance/brutil/conf/br.toml b/acceptance/brutil/conf/br.toml
@@ -1,6 +1,6 @@
 [general]
-ConfigDir = "/share/conf"
-ID = <AUTOFILLED>
+config_dir = "/share/conf"
+id = <AUTOFILLED>
 
 [log.file]
 level = "debug"

diff --git a/acceptance/brutil/conf/disp.toml b/acceptance/brutil/conf/disp.toml
@@ -1,5 +1,5 @@
 [dispatcher]
-ID = "dispatcher"
+id = "dispatcher"
 
 [log.file]
 level = "debug"

diff --git a/acceptance/sig_failover/testdata/1-ff00_0_110/dispatcher/disp.toml b/acceptance/sig_failover/testdata/1-ff00_0_110/dispatcher/disp.toml
@@ -1,8 +1,8 @@
 [dispatcher]
-ID = "disp_1-ff00_0_110"
+id = "disp_1-ff00_0_110"
 
 [features]
-AllowRunAsRoot = true
+allow_run_as_root = true
 
 [log.file]
 level = "trace"

diff --git a/acceptance/sig_failover/testdata/1-ff00_0_110/sig/sig.toml b/acceptance/sig_failover/testdata/1-ff00_0_110/sig/sig.toml
@@ -1,14 +1,14 @@
 [sig]
-ID = "sig1-ff00_0_110"
-SIGConfig = "/cfg.json"
-IA = "1-ff00:0:110"
-IP = "242.254.100.2"
+id = "sig1-ff00_0_110"
+sig_config = "/cfg.json"
+isd_as = "1-ff00:0:110"
+ip = "242.254.100.2"
 
 [features]
-AllowRunAsRoot = true
+allow_run_as_root = true
 
-[sd_client]
-FakeData = "/fake_sciond.json"
+[sciond_connection]
+fake_data = "/fake_sciond.json"
 
 [log.file]
 flush_interval = 1

diff --git a/acceptance/sig_failover/testdata/1-ff00_0_111/dispatcher/disp.toml b/acceptance/sig_failover/testdata/1-ff00_0_111/dispatcher/disp.toml
@@ -1,8 +1,8 @@
 [dispatcher]
-ID = "disp_1-ff00_0_111"
+id = "disp_1-ff00_0_111"
 
 [features]
-AllowRunAsRoot = true
+allow_run_as_root = true
 
 [log.file]
 level = "trace"

diff --git a/acceptance/sig_failover/testdata/1-ff00_0_111/sig/sig.toml b/acceptance/sig_failover/testdata/1-ff00_0_111/sig/sig.toml
@@ -1,14 +1,14 @@
 [sig]
-ID = "sig1-ff00_0_111"
-SIGConfig = "/cfg.json"
-IA = "1-ff00:0:111"
-IP = "242.254.200.2"
+id = "sig1-ff00_0_111"
+sig_config = "/cfg.json"
+isd_as = "1-ff00:0:111"
+ip = "242.254.200.2"
 
 [features]
-AllowRunAsRoot = true
+allow_run_as_root = true
 
-[sd_client]
-FakeData = "/fake_sciond.json"
+[sciond_connection]
+fake_data = "/fake_sciond.json"
 
 [log.file]
 flush_interval = 1

diff --git a/acceptance/sig_short_exp_time/testdata/1-ff00_0_110/dispatcher/disp.toml b/acceptance/sig_short_exp_time/testdata/1-ff00_0_110/dispatcher/disp.toml
@@ -1,8 +1,8 @@
 [dispatcher]
-ID = "disp_1-ff00_0_110"
+id = "disp_1-ff00_0_110"
 
 [features]
-AllowRunAsRoot = true
+allow_run_as_root = true
 
 [log.file]
 level = "trace"

diff --git a/acceptance/sig_short_exp_time/testdata/1-ff00_0_110/sig/sig.toml b/acceptance/sig_short_exp_time/testdata/1-ff00_0_110/sig/sig.toml
@@ -1,14 +1,14 @@
 [sig]
-ID = "sig1-ff00_0_110"
-SIGConfig = "/cfg.json"
-IA = "1-ff00:0:110"
-IP = "242.254.100.2"
+id = "sig1-ff00_0_110"
+sig_config = "/cfg.json"
+isd_as = "1-ff00:0:110"
+ip = "242.254.100.2"
 
 [features]
-AllowRunAsRoot = true
+allow_run_as_root = true
 
-[sd_client]
-FakeData = "/fake_sciond.json"
+[sciond_connection]
+fake_data = "/fake_sciond.json"
 
 [log.file]
 flush_interval = 1

diff --git a/acceptance/sig_short_exp_time/testdata/1-ff00_0_111/dispatcher/disp.toml b/acceptance/sig_short_exp_time/testdata/1-ff00_0_111/dispatcher/disp.toml
@@ -1,8 +1,8 @@
 [dispatcher]
-ID = "disp_1-ff00_0_111"
+id = "disp_1-ff00_0_111"
 
 [features]
-AllowRunAsRoot = true
+allow_run_as_root = true
 
 [log.file]
 level = "trace"

diff --git a/acceptance/sig_short_exp_time/testdata/1-ff00_0_111/sig/sig.toml b/acceptance/sig_short_exp_time/testdata/1-ff00_0_111/sig/sig.toml
@@ -1,14 +1,14 @@
 [sig]
-ID = "sig1-ff00_0_111"
-SIGConfig = "/cfg.json"
-IA = "1-ff00:0:111"
-IP = "242.254.200.2"
+id = "sig1-ff00_0_111"
+sig_config = "/cfg.json"
+isd_as = "1-ff00:0:111"
+ip = "242.254.200.2"
 
 [features]
-AllowRunAsRoot = true
+allow_run_as_root = true
 
-[sd_client]
-FakeData = "/fake_sciond.json"
+[sciond_connection]
+fake_data = "/fake_sciond.json"
 
 [log.file]
 flush_interval = 1

diff --git a/acceptance/topo_cs_reload/BUILD.bazel b/acceptance/topo_cs_reload/BUILD.bazel
@@ -30,7 +30,6 @@ container_image(
         "-config",
         "/disp.toml",
     ],
-    stamp = True,
 )
 
 container_image(
@@ -50,7 +49,6 @@ container_image(
         "-config",
         "/cs.toml",
     ],
-    stamp = True,
 )
 
 genrule(

diff --git a/acceptance/topo_cs_reload/testdata/cs.toml b/acceptance/topo_cs_reload/testdata/cs.toml
@@ -1,22 +1,19 @@
 [general]
-ReconnectToDispatcher = true
-ConfigDir = "/"
-ID = "cs1-ff00_0_110-1"
+reconnect_to_dispatcher = true
+config_dir = "/"
+id = "cs1-ff00_0_110-1"
 
-[trustDB]
-Connection = "cs1-ff00_0_110-1.trust.db"
-Backend = "sqlite"
+[trust_db]
+connection = "cs1-ff00_0_110-1.trust.db"
 
 [log.console]
 level = "trace"
 
-[ps.pathDB]
-Connection = "cs1-ff00_0_110-1.path.db"
-Backend = "sqlite"
+[path_db]
+connection = "cs1-ff00_0_110-1.path.db"
 
-[beaconDB]
-Backend = "sqlite"
-Connection = "cs1-ff00_0_110-1.beacon.db"
+[beacon_db]
+connection = "cs1-ff00_0_110-1.beacon.db"
 
 [metrics]
-Prometheus = "242.253.100.2:30453"
+prometheus = "242.253.100.2:30453"
diff --git a/acceptance/topo_cs_reload/testdata/disp.toml b/acceptance/topo_cs_reload/testdata/disp.toml
@@ -1,8 +1,8 @@
 [dispatcher]
-ID = "disp_1-ff00_0_110"
+id = "disp_1-ff00_0_110"
 
 [features]
-AllowRunAsRoot = true
+allow_run_as_root = true
 
 [log.console]
 level = "trace"
diff --git a/acceptance/topo_cs_reload/testdata/sd.toml b/acceptance/topo_cs_reload/testdata/sd.toml
@@ -1,18 +1,16 @@
 [general]
-ReconnectToDispatcher = true
-ConfigDir = "/"
-ID = "sd1-ff00_0_110"
+reconnect_to_dispatcher = true
+config_dir = "/"
+id = "sd1-ff00_0_110"
 
-[trustDB]
-Connection = "sd1-ff00_0_110.trust.db"
-Backend = "sqlite"
+[trust_db]
+connection = "sd1-ff00_0_110.trust.db"
 
 [log.console]
 level = "trace"
 
 [sd]
-Address = "242.253.100.3:30255"
+address = "242.253.100.3:30255"
 
-[sd.pathDB]
-Connection = "sd1-ff00_0_110.path.db"
-Backend = "sqlite"
+[path_db]
+connection = "sd1-ff00_0_110.path.db"
diff --git a/acceptance/topo_sd_reload/BUILD.bazel b/acceptance/topo_sd_reload/BUILD.bazel
@@ -28,7 +28,6 @@ container_image(
         "-config",
         "/disp.toml",
     ],
-    stamp = True,
 )
 
 container_image(
@@ -45,5 +44,4 @@ container_image(
         "-config",
         "/sd.toml",
     ],
-    stamp = True,
 )
diff --git a/acceptance/topo_sd_reload/testdata/disp.toml b/acceptance/topo_sd_reload/testdata/disp.toml
@@ -1,8 +1,8 @@
 [dispatcher]
-ID = "disp_1-ff00_0_110"
+id = "disp_1-ff00_0_110"
 
 [features]
-AllowRunAsRoot = true
+allow_run_as_root = true
 
 [log.console]
 level = "trace"
diff --git a/acceptance/topo_sd_reload/testdata/sd.toml b/acceptance/topo_sd_reload/testdata/sd.toml
@@ -1,21 +1,19 @@
 [general]
-ReconnectToDispatcher = true
-ConfigDir = "/"
-ID = "sd1-ff00_0_110"
+reconnect_to_dispatcher = true
+config_dir = "/"
+id = "sd1-ff00_0_110"
 
-[trustDB]
-Connection = "sd1-ff00_0_110.trust.db"
-Backend = "sqlite"
+[trust_db]
+connection = "sd1-ff00_0_110.trust.db"
 
 [log.console]
 level = "trace"
 
 [sd]
-Public = "[242.254.100.2]:0"
+address = "[242.254.100.2]:0"
 
-[sd.pathDB]
-Connection = "sd1-ff00_0_110.path.db"
-Backend = "sqlite"
+[path_db]
+connection = "sd1-ff00_0_110.path.db"
 
 [metrics]
-Prometheus = "242.254.100.2:30455"
+prometheus = "242.254.100.2:30455"
diff --git a/docker/testimages/BUILD.bazel b/docker/testimages/BUILD.bazel
@@ -55,7 +55,6 @@ container_image(
         ":sig_entrypoint",
 
     ],
-    stamp = True,
     workdir = "/share",
     entrypoint = ["./sig.sh"],
 )
@@ -118,7 +117,6 @@ container_image(
         ":tester_integration_scripts",
         ":tester_binaries",
     ],
-    stamp = True,
     workdir = "/share",
     cmd = "tail -f /dev/null"
 )

diff --git a/go/border/BUILD.bazel b/go/border/BUILD.bazel
@@ -30,7 +30,6 @@ go_library(
         "//go/lib/layers:go_default_library",
         "//go/lib/log:go_default_library",
         "//go/lib/overlay/conn:go_default_library",
-        "//go/lib/profile:go_default_library",
         "//go/lib/prom:go_default_library",
         "//go/lib/ringbuf:go_default_library",
         "//go/lib/scmp:go_default_library",

diff --git a/go/border/brconf/params.go b/go/border/brconf/params.go
@@ -16,6 +16,7 @@ package brconf
 
 import (
 	"io"
+	"strings"
 
 	"github.com/scionproto/scion/go/lib/common"
 	"github.com/scionproto/scion/go/lib/config"
@@ -27,11 +28,11 @@ var _ config.Config = (*Config)(nil)
 
 // Config is the border router configuration that is loaded from file.
 type Config struct {
-	General  env.General
-	Features env.Features
-	Logging  log.Config `toml:"log,omitempty"`
-	Metrics  env.Metrics
-	BR       BR
+	General  env.General  `toml:"general,omitempty"`
+	Features env.Features `toml:"features,omitempty"`
+	Logging  log.Config   `toml:"log,omitempty"`
+	Metrics  env.Metrics  `toml:"metrics,omitempty"`
+	BR       BR           `toml:"br,omitempty"`
 }
 
 func (cfg *Config) InitDefaults() {
@@ -72,11 +73,9 @@ var _ config.Config = (*BR)(nil)
 
 // BR contains the border router specific parts of the configuration.
 type BR struct {
-	// Profile enables cpu and memory profiling.
-	Profile bool
 	// RollbackFailAction indicates the action that should be taken
 	// if the rollback fails.
-	RollbackFailAction FailAction
+	RollbackFailAction FailAction `toml:"rollback_fail_action,omitempty"`
 }
 
 func (cfg *BR) InitDefaults() {
@@ -101,9 +100,9 @@ type FailAction string
 
 const (
 	// FailActionFatal indicates that the process exits on error.
-	FailActionFatal FailAction = "Fatal"
+	FailActionFatal FailAction = "fatal"
 	// FailActionContinue indicates that the process continues on error.
-	FailActionContinue FailAction = "Continue"
+	FailActionContinue FailAction = "continue"
 )
 
 func (f *FailAction) Validate() error {
@@ -116,7 +115,7 @@ func (f *FailAction) Validate() error {
 }
 
 func (f *FailAction) UnmarshalText(text []byte) error {
-	switch FailAction(text) {
+	switch FailAction(strings.ToLower(string(text))) {
 	case FailActionFatal:
 		*f = FailActionFatal
 	case FailActionContinue:

diff --git a/go/border/brconf/params_test.go b/go/border/brconf/params_test.go
@@ -44,7 +44,6 @@ func InitTestConfig(cfg *Config) {
 }
 
 func InitTestBRConfig(cfg *BR) {
-	cfg.Profile = true
 }
 
 func CheckTestConfig(t *testing.T, cfg *Config, id string) {
@@ -54,6 +53,5 @@ func CheckTestConfig(t *testing.T, cfg *Config, id string) {
 }
 
 func CheckTestBRConfig(t *testing.T, cfg *BR) {
-	assert.False(t, cfg.Profile)
 	assert.Equal(t, FailActionFatal, cfg.RollbackFailAction)
 }