commit c11074df77a6305009fd78dd17862e347bfd87e4
author Matteo Scandolo <matteo.scandolo@gmail.com> Mon Sep 14 14:59:24 2020 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Tue Sep 15 11:26:50 2020 -0700
tree 57c0e5efe7f4f9d685d45f96b83de5955e82120f
parent f380a971d73c812881a130ad3514e1b6a73e5f96

Fixing BBR logging

Change-Id: Iac274dcc12a711fdbc1454fcf36b6b9fdd2c61ed

internal/common/options.go

diff --git a/internal/common/options.go b/internal/common/options.go
index 8505de2..0f14eec 100644
--- a/internal/common/options.go
+++ b/internal/common/options.go
@@ -212,7 +212,7 @@
 
 func readCliParams() *GlobalConfig {
 
-	conf := GlobalConfig{}
+	conf := getDefaultOps()
 
 	configFile := flag.String("config", conf.BBSim.ConfigFile, "Configuration file path")
 	servicesFile := flag.String("services", conf.BBSim.ServiceConfigFile, "Service Configuration file path")
@@ -268,7 +268,7 @@
 		conf.Olt.DeviceId = net.HardwareAddr{0xA, 0xA, 0xA, 0xA, 0xA, byte(conf.Olt.ID)}.String()
 	}
 
-	return &conf
+	return conf
 }
 
 func getDefaultOps() *GlobalConfig {
@@ -375,14 +375,12 @@
 // This is only used by BBR
 func GetBBROpts() BBRCliOptions {
 
-	LoadConfig()
-
 	bbsimIp := flag.String("bbsimIp", "127.0.0.1", "BBSim IP")
 	bbsimPort := flag.String("bbsimPort", "50060", "BBSim Port")
 	bbsimApiPort := flag.String("bbsimApiPort", "50070", "BBSim API Port")
 	logFile := flag.String("logfile", "", "Log to a file")
 
-	flag.Parse()
+	LoadConfig()
 
 	bbrOptions := BBRCliOptions{
 		Config,