VOL-2629 Modified Makefile to use containerized tools.
Modified existing containers to build internally, rather than bind-mounting the whole project & running make targets.
This repo has C dependencies, which must be made available, which complicates the usage of containerized tools. Some tool containers are augmented before use.
"build-" targets will continue to use locally installed golang.
"release-" targets will use containerized tools, and will cross-compile only bbsimctl.
Change-Id: I02c999a29361d26aa9198d1f03b2b050febfe954
diff --git a/internal/bbsimctl/commands/oltalarms.go b/internal/bbsimctl/commands/oltalarms.go
index f251b83..b68ca83 100755
--- a/internal/bbsimctl/commands/oltalarms.go
+++ b/internal/bbsimctl/commands/oltalarms.go
@@ -20,13 +20,13 @@
import (
"context"
"fmt"
+ "github.com/opencord/bbsim/internal/common"
"os"
"strings"
"github.com/jessevdk/go-flags"
"github.com/olekukonko/tablewriter"
pb "github.com/opencord/bbsim/api/bbsim"
- "github.com/opencord/bbsim/internal/bbsim/alarmsim"
"github.com/opencord/bbsim/internal/bbsimctl/config"
log "github.com/sirupsen/logrus"
)
@@ -79,12 +79,12 @@
InterfaceID: uint32(o.Args.IntfID),
Status: "on"}
- if string(o.Args.Name) == "PonLossOfSignal" {
+ if string(o.Args.Name) == common.OltPonLos {
req.InterfaceType = "pon"
- } else if string(o.Args.Name) == "NniLossOfSignal" {
+ } else if string(o.Args.Name) == common.OltNniLos {
req.InterfaceType = "nni"
} else {
- return fmt.Errorf("Unknown alarm type")
+ return fmt.Errorf("Unknown OLT alarm type")
}
res, err := client.SetOltAlarmIndication(ctx, &req)
@@ -109,12 +109,12 @@
InterfaceID: uint32(o.Args.IntfID),
Status: "off"}
- if string(o.Args.Name) == "PonLossOfSignal" {
+ if string(o.Args.Name) == common.OltPonLos {
req.InterfaceType = "pon"
- } else if string(o.Args.Name) == "NniLossOfSignal" {
+ } else if string(o.Args.Name) == common.OltNniLos {
req.InterfaceType = "nni"
} else {
- return fmt.Errorf("Unknown alarm type")
+ return fmt.Errorf("Unknown OLT alarm type")
}
res, err := client.SetOltAlarmIndication(ctx, &req)
@@ -135,9 +135,9 @@
fmt.Fprintf(os.Stdout, "OLT Alarms List:\n")
OltAlarmstable.SetHeader([]string{"OLT Alarms"})
- alarmNames := make([]AlarmListOutput, len(alarmsim.OltAlarmNameMap))
+ alarmNames := make([]AlarmListOutput, len(common.OLTAlarms))
i := 0
- for k := range alarmsim.OltAlarmNameMap {
+ for k := range common.OLTAlarms {
alarmNames[i] = AlarmListOutput{Name: k}
OltAlarmsValue = append(OltAlarmsValue, []string{k})
i++
@@ -151,7 +151,7 @@
func (o *OltAlarmNameString) Complete(match string) []flags.Completion {
list := make([]flags.Completion, 0)
- for k := range alarmsim.OltAlarmNameMap {
+ for k := range common.OLTAlarms {
if strings.HasPrefix(k, match) {
list = append(list, flags.Completion{Item: k})
}
diff --git a/internal/bbsimctl/commands/onualarms.go b/internal/bbsimctl/commands/onualarms.go
index dcf53a3..fb1d00e 100755
--- a/internal/bbsimctl/commands/onualarms.go
+++ b/internal/bbsimctl/commands/onualarms.go
@@ -20,13 +20,13 @@
import (
"context"
"fmt"
+ "github.com/opencord/bbsim/internal/common"
"os"
"strings"
"github.com/jessevdk/go-flags"
"github.com/olekukonko/tablewriter"
pb "github.com/opencord/bbsim/api/bbsim"
- "github.com/opencord/bbsim/internal/bbsim/alarmsim"
"github.com/opencord/bbsim/internal/bbsimctl/config"
log "github.com/sirupsen/logrus"
)
@@ -129,16 +129,16 @@
return nil
}
-// Execute OLT alarm list
+// Execute ONU alarm list
func (o *AlarmList) Execute(args []string) error {
OnuAlarmsValue := [][]string{}
OnuAlarmstable := tablewriter.NewWriter(os.Stdout)
fmt.Fprintf(os.Stdout, "ONU Alarms List:\n")
OnuAlarmstable.SetHeader([]string{"ONU Alarms"})
- alarmNames := make([]AlarmListOutput, len(alarmsim.OnuAlarmNameMap))
+ alarmNames := make([]AlarmListOutput, len(common.ONUAlarms))
i := 0
- for k := range alarmsim.OnuAlarmNameMap {
+ for k := range common.ONUAlarms {
alarmNames[i] = AlarmListOutput{Name: k}
OnuAlarmsValue = append(OnuAlarmsValue, []string{k})
i++
@@ -152,7 +152,7 @@
func (onuSn *AlarmNameString) Complete(match string) []flags.Completion {
list := make([]flags.Completion, 0)
- for k := range alarmsim.OnuAlarmNameMap {
+ for k := range common.ONUAlarms {
if strings.HasPrefix(k, match) {
list = append(list, flags.Completion{Item: k})
}