Skip to content

Commit

Permalink
fix api_management + nfmanagement & fix some errors from conversation…
Browse files Browse the repository at this point in the history 
… comments
  • Loading branch information
@KunLee76
KunLee76 committed Jun 11, 2024
1 parent 8cc9275 commit 6b8a2ac
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 149 deletions.
2 changes: 1 addition & 1 deletion internal/context/management_data.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ func nnrfUriList(originalUL *UriList, UL *UriList, location []string) {
UL.Link = *b
}

func GetNofificationUri(nfProfile models.NfProfile) []string {
func GetNotificationUri(nfProfile models.NfProfile) []string {
var uriList []string

// nfTypeCond
Expand Down
4 changes: 2 additions & 2 deletions internal/sbi/api_accesstoken.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

// Index is the index handler.
func Index(c *gin.Context) {
c.String(http.StatusOK, "Hello World!")
c.String(http.StatusOK, "msg")
}

func (s *Server) getAccessTokenRoutes() []Route {
Expand All @@ -32,7 +32,7 @@ func (s *Server) getAccessTokenRoutes() []Route {
Method: http.MethodGet,
Pattern: "/",
APIFunc: func(ctx *gin.Context) {
ctx.JSON(http.StatusOK, gin.H{"status": "Hello World!"})
ctx.JSON(http.StatusOK, gin.H{"status": "msg"})
},
},
{
Expand Down
131 changes: 6 additions & 125 deletions internal/sbi/api_management.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"go.mongodb.org/mongo-driver/bson"

"github.com/free5gc/nrf/internal/logger"
//"github.com/free5gc/nrf/internal/sbi/processor"
"github.com/free5gc/openapi"
"github.com/free5gc/openapi/models"
timedecode "github.com/free5gc/util/mapstruct"
Expand Down Expand Up @@ -72,7 +71,7 @@ func (s *Server) getNFManagementRoutes() []Route {
}

// DeregisterNFInstance - Deregisters a given NF Instance
func (s *Server) DeregisterNFInstance(c *gin.Context) {
func (s *Server) DeregisterNFInstance(c *gin.Context) { //OK

Check failure on line 74 in internal/sbi/api_management.go

View workflow job for this annotation

GitHub Actions / lint (1.21) 

File is not `gci`-ed with --skip-generated -s standard -s default -s prefix(github.com/free5gc) (gci)
auth_err := authorizationCheck(c, "nnrf-nfm")
if auth_err != nil {
c.JSON(http.StatusUnauthorized, gin.H{"error": auth_err.Error()})
Expand All @@ -87,60 +86,25 @@ func (s *Server) DeregisterNFInstance(c *gin.Context) {
// if problemDetails != nil {
// c.JSON(http.StatusInternalServerError, problemDetails)
// } else {
// c.JSON(http.StatusNoContent, nil)
// c.JSON(http.StatusNoContent, nil) //這個沒用到，確認一下
// }
}

// GetNFInstance - Read the profile of a given NF Instance
func (s *Server) NFInstance(c *gin.Context) {
func (s *Server) NFInstance(c *gin.Context) { //OK

Check failure on line 94 in internal/sbi/api_management.go

View workflow job for this annotation

GitHub Actions / lint (1.21) 

File is not `gci`-ed with --skip-generated -s standard -s default -s prefix(github.com/free5gc) (gci)
auth_err := authorizationCheck(c, "nnrf-nfm")
if auth_err != nil {
c.JSON(http.StatusUnauthorized, gin.H{"error": auth_err.Error()})
return
}

//---------------------
logger.NfmLog.Infoln("Handle GetNFInstanceRequest")
nfInstanceId := c.Params.ByName("nfInstanceID")

// response := s.processor.GetNFInstanceProcedure(nfInstanceId)
s.Processor().GetNFInstanceProcedure(c, nfInstanceId)

// if response != nil {
// //return httpwrapper.NewResponse(http.StatusOK, nil, response)
// c.JSON(http.StatusOK, response)
// } else {
// problemDetails := &models.ProblemDetails{
// Status: http.StatusNotFound,
// Cause: "UNSPECIFIED",
// }
// //return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails)
// c.JSON(int(problemDetails.Status), problemDetails)
}

//--------------------

// req := httpwrapper.NewRequest(c.Request, nil)
// req.Params["nfInstanceID"] = c.Params.ByName("nfInstanceID")
// //nfInstanceID := c.Params.ByName("nfInstanceID")
// httpResponse := s.processor.HandleGetNFInstanceRequest(req)
// //s.processor.HandleGetNFInstanceRequest(c, nfInstanceID)

// responseBody, err := openapi.Serialize(httpResponse.Body, "application/json")
// if err != nil {
// logger.NfmLog.Warnln(err)
// problemDetails := models.ProblemDetails{
// Status: http.StatusInternalServerError,
// Cause: "SYSTEM_FAILURE",
// Detail: err.Error(),
// }
// c.JSON(http.StatusInternalServerError, problemDetails)
// } else {
// c.Data(httpResponse.Status, "application/json", responseBody)
// }

// RegisterNFInstance - Register a new NF Instance
func (s *Server) RegisterNFInstance(c *gin.Context) {
func (s *Server) RegisterNFInstance(c *gin.Context) { //OK
auth_err := authorizationCheck(c, "nnrf-nfm")
if auth_err != nil {
c.JSON(http.StatusUnauthorized, gin.H{"error": auth_err.Error()})
Expand Down Expand Up @@ -176,10 +140,8 @@ func (s *Server) RegisterNFInstance(c *gin.Context) {
c.JSON(http.StatusBadRequest, rsp)
return
}
//--------------------

logger.NfmLog.Infoln("Handle NFRegisterRequest")
// nfProfile := request.Body.(models.NfProfile)

nfProfile := models.NfProfile{}
header, response, isUpdate, problemDetails := s.Processor().NFRegisterProcedure(c, nfProfile)
Expand All @@ -191,50 +153,24 @@ func (s *Server) RegisterNFInstance(c *gin.Context) {
if isUpdate {
logger.NfmLog.Traceln("update success")

// return httpwrapper.NewResponse(http.StatusOK, header, response)
c.JSON(http.StatusOK, response)
}
logger.NfmLog.Traceln("register success")
// return httpwrapper.NewResponse(http.StatusCreated, header, response)
c.JSON(http.StatusCreated, response)
} else if problemDetails != nil {
logger.NfmLog.Traceln("register failed")
// return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails)
c.JSON(int(problemDetails.Status), problemDetails)
}
problemDetails = &models.ProblemDetails{
Status: http.StatusForbidden,
Cause: "UNSPECIFIED",
}
logger.NfmLog.Traceln("register failed")
// return httpwrapper.NewResponse(http.StatusForbidden, nil, problemDetails)
c.JSON(http.StatusForbidden, problemDetails)
}

//-------------------
// step 3: encapsulate the request by http_wrapper package
//req := httpwrapper.NewRequest(c.Request, nfprofile)
//s.processor.HandleNFRegisterRequest(c, nfprofile)

// for key, val := range httpResponse.Header {
// c.Header(key, val[0])
// }

// responseBody, err := openapi.Serialize(httpResponse.Body, "application/json")
// if err != nil {
// logger.NfmLog.Warnln(err)
// problemDetails := models.ProblemDetails{
// Status: http.StatusInternalServerError,
// Cause: "SYSTEM_FAILURE",
// Detail: err.Error(),
// }
// c.JSON(http.StatusInternalServerError, problemDetails)
// } else {
// c.Data(httpResponse.Status, "application/json", responseBody)
// }

// UpdateNFInstance - Update NF Instance profile
func (s *Server) getUpdateNFInstance(c *gin.Context) {
func (s *Server) getUpdateNFInstance(c *gin.Context) { //OK
auth_err := authorizationCheck(c, "nnrf-nfm")
if auth_err != nil {
c.JSON(http.StatusUnauthorized, gin.H{"error": auth_err.Error()})
Expand All @@ -255,12 +191,6 @@ func (s *Server) getUpdateNFInstance(c *gin.Context) {
return
}

// req := httpwrapper.NewRequest(c.Request, nil)
// req.Params["nfInstanceID"] = c.Params.ByName("nfInstanceID")
// req.Body = requestBody

// httpResponse := s.processor.HandleUpdateNFInstanceRequest(req)

nfInstanceID := c.Params.ByName("nfInstanceID")
s.Processor().UpdateNFInstanceProcedure(c, nfInstanceID, requestBody)
}
Expand All @@ -273,22 +203,12 @@ func (s *Server) getNFInstances(c *gin.Context) {
return
}

// req := httpwrapper.NewRequest(c.Request, nil)
// req.Query = c.Request.URL.Query()
// httpResponse := s.processor.HandleGetNFInstancesRequest(req) //82

// query := c.Request.URL.Query()
// values := processor.Values(query) // Convert query to processor.Values

logger.NfmLog.Infoln("Handle GetNFInstancesRequest")
// nfType := request.Query.Get("nf-type")
nfType := c.Request.URL.Query().Get("nf-type")
// limit_param := request.Query.Get("limit")
limit_param := c.Request.URL.Query().Get("limit")
limit := 0
if limit_param != "" {
var err error
// limit, err = strconv.Atoi(request.Query.Get("limit"))
limit, err = strconv.Atoi(limit_param)
if err != nil {
logger.NfmLog.Errorln("Error in string conversion: ", limit)
Expand All @@ -297,8 +217,6 @@ func (s *Server) getNFInstances(c *gin.Context) {
Status: http.StatusBadRequest,
Detail: err.Error(),
}

// return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails)
c.JSON(int(problemDetails.Status), problemDetails)
}
if limit < 1 {
Expand All @@ -307,35 +225,12 @@ func (s *Server) getNFInstances(c *gin.Context) {
Status: http.StatusBadRequest,
Detail: "limit must be greater than 0",
}
// return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails)
c.JSON(int(problemDetails.Status), problemDetails)
}
}

s.Processor().GetNFInstancesProcedure(c, nfType, limit)

//---------------------
// response, problemDetails := GetNFInstancesProcedure(c , nfType, limit)

// if response != nil {
// logger.NfmLog.Traceln("GetNFInstances success")
// //return httpwrapper.NewResponse(http.StatusOK, nil, response)
// c.JSON(http.StatusOK, response)
// } else if problemDetails != nil {
// logger.NfmLog.Traceln("GetNFInstances failed")
// //return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails)
// c.JSON(int(problemDetails.Status), problemDetails)
// }
// problemDetails = &models.ProblemDetails{
// Status: http.StatusForbidden,
// Cause: "UNSPECIFIED",
// }
// logger.NfmLog.Traceln("GetNFInstances failed")
// //return httpwrapper.NewResponse(http.StatusForbidden, nil, problemDetails)
// c.JSON(http.StatusForbidden, problemDetails)

//----------------------

// responseBody, err := openapi.Serialize(httpResponse.Body, "application/json")
// if err != nil {
// logger.NfmLog.Warnln(err)
Expand Down Expand Up @@ -427,7 +322,7 @@ func (s *Server) UpdateSubscription(c *gin.Context) {
// Provide SubsciptionId for each request (add by one each time)

// CreateSubscription - Create a new subscription
func (s *Server) CreateSubscription(c *gin.Context) {
func (s *Server) CreateSubscription(c *gin.Context) { //OK
auth_err := authorizationCheck(c, "nnrf-nfm")
if auth_err != nil {
c.JSON(http.StatusUnauthorized, gin.H{"error": auth_err.Error()})
Expand Down Expand Up @@ -464,21 +359,7 @@ func (s *Server) CreateSubscription(c *gin.Context) {
return
}

// req := httpwrapper.NewRequest(c.Request, subscription)
s.Processor().HandleCreateSubscriptionRequest(c, subscription)
// httpResponse := s.processor.HandleCreateSubscriptionRequest(req)
// responseBody, err := openapi.Serialize(httpResponse.Body, "application/json")
// if err != nil {
// logger.NfmLog.Errorln(err)
// problemDetails := models.ProblemDetails{
// Status: http.StatusInternalServerError,
// Cause: "SYSTEM_FAILURE",
// Detail: err.Error(),
// }
// c.JSON(http.StatusInternalServerError, problemDetails)
// } else {
// c.Data(httpResponse.Status, "application/json", responseBody)
// }
}

func (s *Server) GetLocalIp() string {
Expand Down
Loading

0 comments on commit 6b8a2ac

Please sign in to comment.