Refactor path for configuration file, option(s) and Docker image (#344)

* Refactor path for configuration file, option(s) and Docker image

Signed-off-by: Arrobo, Gabriel <[email protected]>

* Remove unused variable

Signed-off-by: Arrobo, Gabriel <[email protected]>

* Add suggestion

Signed-off-by: Arrobo, Gabriel <[email protected]>

---------

Signed-off-by: Arrobo, Gabriel <[email protected]>

Author: gab-arrobo

Dockerfile

@@ -6,8 +6,6 @@
 
 FROM golang:1.23.2-bookworm AS builder
 
-LABEL maintainer="Aether SD-Core <[email protected]>"
-
 RUN apt-get update && \
     apt-get -y install --no-install-recommends \
     apt-transport-https \
@@ -27,7 +25,8 @@ RUN make all
 
 FROM alpine:3.20 AS smf
 
-LABEL description="ONF open source 5G Core Network" \
+LABEL maintainer="Aether SD-Core <[email protected]>" \
+    description="ONF open source 5G Core Network" \
     version="Stage 3"
 
 ARG DEBUG_TOOLS
@@ -39,8 +38,5 @@ RUN if [ "$DEBUG_TOOLS" = "true" ]; then \
         apk update && apk add --no-cache -U vim strace net-tools curl netcat-openbsd bind-tools tcpdump; \
         fi
 
-# Set working dir
-WORKDIR /free5gc/smf
-
-# Copy executable and default certs
-COPY --from=builder /go/src/smf/bin/* .
+# Copy executable
+COPY --from=builder /go/src/smf/bin/* /usr/local/bin/.

context/context.go

@@ -22,7 +22,6 @@ import (
 	"github.com/omec-project/smf/factory"
 	"github.com/omec-project/smf/logger"
 	"github.com/omec-project/smf/metrics"
-	"github.com/omec-project/smf/util"
 	"github.com/omec-project/util/drsm"
 )
 
@@ -159,8 +158,6 @@ func InitSmfContext(config *factory.Config) *SMFContext {
 		smfContext.URIScheme = models.UriScheme(sbi.Scheme)
 		smfContext.RegisterIPv4 = factory.SMF_DEFAULT_IPV4 // default localhost
 		smfContext.SBIPort = factory.SMF_DEFAULT_PORT_INT  // default port
-		smfContext.Key = util.SmfKeyPath                   // default key path
-		smfContext.PEM = util.SmfPemPath                   // default PEM path
 
 		if sbi.RegisterIPv4 != "" {
 			// smfContext.RegisterIPv4 = sbi.RegisterIPv4

factory/config.go

@@ -33,6 +33,7 @@ type Config struct {
 	Info          *Info              `yaml:"info"`
 	Configuration *Configuration     `yaml:"configuration"`
 	Logger        *utilLogger.Logger `yaml:"logger"`
+	CfgLocation   string
 }
 
 type UpdateSmfConfig struct {

pdusession/dummy_server.go

@@ -12,7 +12,6 @@ import (
 	"github.com/omec-project/smf/pfcp/udp"
 	"github.com/omec-project/util/http2_util"
 	utilLogger "github.com/omec-project/util/logger"
-	"github.com/omec-project/util/path_util"
 )
 
 func DummyServer() {
@@ -22,9 +21,9 @@ func DummyServer() {
 
 	go udp.Run(pfcp.Dispatch)
 
-	smfKeyLogPath := path_util.Free5gcPath("free5gc/smfsslkey.log")
-	smfPemPath := path_util.Free5gcPath("free5gc/support/TLS/smf.pem")
-	smfkeyPath := path_util.Free5gcPath("free5gc/support/TLS/smf.key")
+	smfKeyLogPath := "/opt/sslkey.log"
+	smfPemPath := "/var/run/certs/tls.pem"
+	smfkeyPath := "/var/run/certs/tls.key"
 
 	var server *http.Server
 	if srv, err := http2_util.NewServer(":29502", smfKeyLogPath, router); err != nil {

service/init.go

@@ -12,6 +12,7 @@ import (
 	_ "net/http/pprof" // Using package only for invoking initialization.
 	"os"
 	"os/signal"
+	"path/filepath"
 	"sync"
 	"sync/atomic"
 	"syscall"
@@ -38,10 +39,8 @@ import (
 	"github.com/omec-project/smf/pfcp/message"
 	"github.com/omec-project/smf/pfcp/udp"
 	"github.com/omec-project/smf/pfcp/upf"
-	"github.com/omec-project/smf/util"
 	"github.com/omec-project/util/http2_util"
 	utilLogger "github.com/omec-project/util/logger"
-	"github.com/omec-project/util/path_util"
 	"github.com/urfave/cli"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -52,7 +51,7 @@ type SMF struct{}
 type (
 	// Config information.
 	Config struct {
-		smfcfg    string
+		cfg       string
 		uerouting string
 	}
 )
@@ -63,16 +62,14 @@ var config Config
 
 var smfCLi = []cli.Flag{
 	cli.StringFlag{
-		Name:  "cfg",
-		Usage: "common config file",
+		Name:     "cfg",
+		Usage:    "smf config file",
+		Required: true,
 	},
 	cli.StringFlag{
-		Name:  "smfcfg",
-		Usage: "config file",
-	},
-	cli.StringFlag{
-		Name:  "uerouting",
-		Usage: "config file",
+		Name:     "uerouting",
+		Usage:    "uerouting config file",
+		Required: true,
 	},
 }
 
@@ -98,30 +95,30 @@ func (*SMF) GetCliCmd() (flags []cli.Flag) {
 
 func (smf *SMF) Initialize(c *cli.Context) error {
 	config = Config{
-		smfcfg:    c.String("smfcfg"),
+		cfg:       c.String("cfg"),
 		uerouting: c.String("uerouting"),
 	}
 
-	if config.smfcfg != "" {
-		if err := factory.InitConfigFactory(config.smfcfg); err != nil {
-			return err
-		}
-	} else {
-		DefaultSmfConfigPath := path_util.Free5gcPath("omec-project/smf/config/smfcfg.yaml")
-		if err := factory.InitConfigFactory(DefaultSmfConfigPath); err != nil {
-			return err
-		}
+	absPath, err := filepath.Abs(config.cfg)
+	if err != nil {
+		logger.CfgLog.Errorln(err)
+		return err
 	}
 
-	if config.uerouting != "" {
-		if err := factory.InitRoutingConfigFactory(config.uerouting); err != nil {
-			return err
-		}
-	} else {
-		DefaultUERoutingPath := path_util.Free5gcPath("omec-project/smf/config/uerouting.yaml")
-		if err := factory.InitRoutingConfigFactory(DefaultUERoutingPath); err != nil {
-			return err
-		}
+	if err = factory.InitConfigFactory(absPath); err != nil {
+		return err
+	}
+
+	factory.SmfConfig.CfgLocation = absPath
+
+	ueRoutingPath, err := filepath.Abs(config.uerouting)
+	if err != nil {
+		logger.CfgLog.Errorln(err)
+		return err
+	}
+
+	if err := factory.InitRoutingConfigFactory(ueRoutingPath); err != nil {
+		return err
 	}
 
 	smf.setLogLevel()
@@ -408,7 +405,8 @@ func (smf *SMF) Start() {
 	time.Sleep(1000 * time.Millisecond)
 
 	HTTPAddr := fmt.Sprintf("%s:%d", context.SMF_Self().BindingIPv4, context.SMF_Self().SBIPort)
-	server, err := http2_util.NewServer(HTTPAddr, util.SmfLogPath, router)
+	sslLog := filepath.Dir(factory.SmfConfig.CfgLocation) + "/sslkey.log"
+	server, err := http2_util.NewServer(HTTPAddr, sslLog, router)
 
 	if server == nil {
 		logger.InitLog.Errorln("initialize HTTP server failed:", err)

smf.go

@@ -29,12 +29,13 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "smf"
 	logger.AppLog.Infoln(app.Name)
-	app.Usage = "-cfg common configuration file -smfcfg smf_configuration_file"
+	app.Usage = "Session Management Function"
+	app.UsageText = "smf -cfg <smf_config_file.conf> -uerouting <uerouting_config_file.conf>"
 	app.Action = action
 	app.Flags = SMF.GetCliCmd()
 
 	if err := app.Run(os.Args); err != nil {
-		logger.AppLog.Errorf("SMF run error: %v", err)
+		logger.AppLog.Fatalf("SMF run error: %v", err)
 	}
 }