SEBA-947: Expose bbsim command line params and IP param in OLT struct
manual rebase
Add IP to bbsimctl get OLT
Change-Id: Id610762ba0560b1ecb83aa4b7a7ddb861f6adfb2
diff --git a/internal/bbsim/api/grpc_api_server.go b/internal/bbsim/api/grpc_api_server.go
index 7191c2e..c17c6a9 100644
--- a/internal/bbsim/api/grpc_api_server.go
+++ b/internal/bbsim/api/grpc_api_server.go
@@ -19,6 +19,7 @@
import (
"context"
"fmt"
+ "strings"
"github.com/opencord/bbsim/api/bbsim"
"github.com/opencord/bbsim/internal/bbsim/alarmsim"
@@ -73,11 +74,17 @@
pons = append(pons, &p)
}
+ oltAddress := strings.Split(common.Options.BBSim.OpenOltAddress, ":")[0]
+ if oltAddress == "" {
+ oltAddress = getOltIP().String()
+ }
+
res := bbsim.Olt{
ID: int32(olt.ID),
SerialNumber: olt.SerialNumber,
OperState: olt.OperState.Current(),
InternalState: olt.InternalState.Current(),
+ IP: oltAddress,
NNIPorts: nnis,
PONPorts: pons,
}