SEBA-927 implemenation of controlled PON and ONU activation
updated controlledActivation to enum
Change-Id: Ie505c491755d3890a2ea4a86a9c74f17a5eab484
diff --git a/cmd/bbr/bbr.go b/cmd/bbr/bbr.go
index 6ffcce6..4c83789 100644
--- a/cmd/bbr/bbr.go
+++ b/cmd/bbr/bbr.go
@@ -77,6 +77,7 @@
true, // this parameter is not important in the BBR Case
true, // this parameter is not important in the BBR Case
0, // this parameter does not matter in the BBR case
+ options.BBSim.ControlledActivation,
true,
)
oltMock := bbrdevices.OltMock{
diff --git a/cmd/bbsim/bbsim.go b/cmd/bbsim/bbsim.go
index 8ffb941..f2a1c37 100644
--- a/cmd/bbsim/bbsim.go
+++ b/cmd/bbsim/bbsim.go
@@ -146,14 +146,15 @@
}
log.WithFields(log.Fields{
- "OltID": options.Olt.ID,
- "NumNniPerOlt": options.Olt.NniPorts,
- "NumPonPerOlt": options.Olt.PonPorts,
- "NumOnuPerPon": options.Olt.OnusPonPort,
- "TotalOnus": options.Olt.PonPorts * options.Olt.OnusPonPort,
- "EnableAuth": options.BBSim.EnableAuth,
- "Dhcp": options.BBSim.EnableDhcp,
- "Delay": options.BBSim.Delay,
+ "OltID": options.Olt.ID,
+ "NumNniPerOlt": options.Olt.NniPorts,
+ "NumPonPerOlt": options.Olt.PonPorts,
+ "NumOnuPerPon": options.Olt.OnusPonPort,
+ "TotalOnus": options.Olt.PonPorts * options.Olt.OnusPonPort,
+ "EnableAuth": options.BBSim.EnableAuth,
+ "Dhcp": options.BBSim.EnableDhcp,
+ "Delay": options.BBSim.Delay,
+ "ControlledActivation": options.BBSim.ControlledActivation,
}).Info("BroadBand Simulator is on")
// control channels, they are only closed when the goroutine needs to be terminated
@@ -169,6 +170,7 @@
options.BBSim.EnableAuth,
options.BBSim.EnableDhcp,
options.BBSim.Delay,
+ options.BBSim.ControlledActivation,
false,
)