From 3955d9fe595f283fde17427ef88f202849a545d8 Mon Sep 17 00:00:00 2001
From: Malte Bauch <malte.bauch@extern.h-da.de>
Date: Mon, 18 Jul 2022 16:54:35 +0200
Subject: [PATCH] Add runtime.Goos to distinguish between operating systems
---
cmd/start.go | 2 --
gnmitarget/target.go | 7 ++++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/cmd/start.go b/cmd/start.go
index 92803af..f259102 100644
--- a/cmd/start.go
+++ b/cmd/start.go
@@ -79,13 +79,11 @@ func init() {
startCmd.Flags().StringVarP(&bindAddress, "bind_address", "a", ":7030", "address to bind to")
startCmd.Flags().StringVarP(&logLevel, "log", "l", "debug", "loglevel")
startCmd.Flags().Bool("tls", false, "Use Viper for configuration")
- startCmd.Flags().StringVarP(&osclient, "osclient", "o", "ubuntu", "os client to use by system")
viper.BindPFlag("bindAddress", startCmd.Flags().Lookup("bind_address"))
viper.BindPFlag("configFile", startCmd.Flags().Lookup("config"))
viper.BindPFlag("logLevel", startCmd.Flags().Lookup("log"))
viper.BindPFlag("useTLS", startCmd.Flags().Lookup("tls"))
- viper.BindPFlag("osclient", startCmd.Flags().Lookup("osclient"))
rootCmd.AddCommand(startCmd)
}
diff --git a/gnmitarget/target.go b/gnmitarget/target.go
index adc1b0f..998f1d4 100644
--- a/gnmitarget/target.go
+++ b/gnmitarget/target.go
@@ -2,6 +2,7 @@ package gnmitarget
import (
"fmt"
+ "runtime"
"code.fbi.h-da.de/danet/gnmi-target/gnmiserver"
"code.fbi.h-da.de/danet/gnmi-target/os_clients"
@@ -41,8 +42,8 @@ type GnmiTarget struct {
func NewGnmiTarget(osclient string) (*GnmiTarget, error) {
var os os_clients.Osclient
var err error
- switch osclient {
- case "ubuntu":
+ switch runtime.GOOS {
+ case "linux":
os, err = ubuntu.NewOsclientUbuntu()
if err != nil {
return nil, err
@@ -98,7 +99,7 @@ func (gt *GnmiTarget) Start(bindAddress string) error {
log.Fatalf("Failed to list due to: %v", err)
}
- log.Info("Target ist starting to serve requests")
+ log.Info("Target is starting to serve requests")
err = grpcServer.Serve(listener)
if err != nil {
log.Fatalf("Failed to serve requests due to: %v", err)
--
GitLab