Use latest ngap lib that combines ngap and aper in a single repo (#458)

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

Author: gab-arrobo

context/ngap_build.go

@@ -8,7 +8,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/omec-project/aper"
+	"github.com/omec-project/ngap/aper"
 	"github.com/omec-project/ngap/ngapConvert"
 	"github.com/omec-project/ngap/ngapType"
 	"github.com/omec-project/openapi/models"

context/ngap_handler.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/omec-project/aper"
+	"github.com/omec-project/ngap/aper"
 	"github.com/omec-project/ngap/ngapType"
 	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/smf/logger"

go.mod

@@ -7,9 +7,8 @@ require (
 	github.com/gin-gonic/gin v1.10.1
 	github.com/google/uuid v1.6.0
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
-	github.com/omec-project/aper v1.3.1
 	github.com/omec-project/nas v1.6.1
-	github.com/omec-project/ngap v1.5.0
+	github.com/omec-project/ngap v1.6.0
 	github.com/omec-project/openapi v1.6.3
 	github.com/omec-project/util v1.5.0
 	github.com/pkg/errors v0.9.1

go.sum

@@ -83,12 +83,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
-github.com/omec-project/aper v1.3.1 h1:3Vyqn2xQEulzsQ9JganXqxbR1E2IM7oUm4IW1HiPnr0=
-github.com/omec-project/aper v1.3.1/go.mod h1:W0i+XhbXHeeLQ4BhMmAS8h83yZ5pnD3w0sdIlnuPS70=
 github.com/omec-project/nas v1.6.1 h1:bAxEILchc9YJ4ZPkKA/cAXFq058/Iqq/6gw3Pp9MTpQ=
 github.com/omec-project/nas v1.6.1/go.mod h1:kjG5yLTQxlpHLjSauEXWrL+6Z1veyJmn/TA503Gflzc=
-github.com/omec-project/ngap v1.5.0 h1:Fu0JIDxDxuNnlz9iomehxn2ZSryqwcY0YS8a73cSIsM=
-github.com/omec-project/ngap v1.5.0/go.mod h1:xYB2+a2t1dAq6F2YTDUGHLuhWESBbOJQ3L1OJvcL0b8=
+github.com/omec-project/ngap v1.6.0 h1:u087zGco58yeZUyNhA9oCduLiaw8yTyAjpFC/cP3I1k=
+github.com/omec-project/ngap v1.6.0/go.mod h1:5XLDnaAiPODCVcjwkV5wDcZKa2oVwAB9Krk3DqN/Wj0=
 github.com/omec-project/openapi v1.6.3 h1:L3pMN8hnkHkbLOg9SsHpRlivyBSZHiW8Lt8oX/q3yvU=
 github.com/omec-project/openapi v1.6.3/go.mod h1:hUzU8E/QxzsDS7a6RakqQlvl6fjI/a67KndPP1PKMGY=
 github.com/omec-project/util v1.5.0 h1:56/25nm0niqildbgcR+BMRxF56LMP+AasURI9o+KXJg=

service/init.go

@@ -18,7 +18,6 @@ import (
 	"syscall"
 	"time"
 
-	aperLogger "github.com/omec-project/aper/logger"
 	nasLogger "github.com/omec-project/nas/logger"
 	ngapLogger "github.com/omec-project/ngap/logger"
 	openapiLogger "github.com/omec-project/openapi/logger"
@@ -175,21 +174,6 @@ func (smf *SMF) setLogLevel() {
 		}
 	}
 
-	if factory.SmfConfig.Logger.Aper != nil {
-		if factory.SmfConfig.Logger.Aper.DebugLevel != "" {
-			if level, err := zapcore.ParseLevel(factory.SmfConfig.Logger.Aper.DebugLevel); err != nil {
-				aperLogger.AperLog.Warnf("Aper Log level [%s] is invalid, set to [info] level",
-					factory.SmfConfig.Logger.Aper.DebugLevel)
-				aperLogger.SetLogLevel(zap.InfoLevel)
-			} else {
-				aperLogger.SetLogLevel(level)
-			}
-		} else {
-			aperLogger.AperLog.Warnln("Aper Log level not set. Default set to [info] level")
-			aperLogger.SetLogLevel(zap.InfoLevel)
-		}
-	}
-
 	if factory.SmfConfig.Logger.OpenApi != nil {
 		if factory.SmfConfig.Logger.OpenApi.DebugLevel != "" {
 			if level, err := zapcore.ParseLevel(factory.SmfConfig.Logger.OpenApi.DebugLevel); err != nil {