From bec61b68f97916041f6116aecc33542ff29be3ef Mon Sep 17 00:00:00 2001 From: AshithaCDAC Date: Tue, 12 May 2026 06:35:03 +0000 Subject: [PATCH 1/4] openapi added --- consumer/nf_discovery.go | 14 +++++++++----- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/consumer/nf_discovery.go b/consumer/nf_discovery.go index 4cb807a..54e5c5d 100644 --- a/consumer/nf_discovery.go +++ b/consumer/nf_discovery.go @@ -51,11 +51,15 @@ var SendNfDiscoveryToNrf = func(nrfUri string, targetNfType, requesterNfType mod if res != nil && res.StatusCode == http.StatusTemporaryRedirect { err = fmt.Errorf("temporary redirect for non NRF consumer") } - defer func() { - if bodyCloseErr := res.Body.Close(); bodyCloseErr != nil { - err = fmt.Errorf("SearchNFInstances' response body cannot close: %w", bodyCloseErr) - } - }() + if res != nil && res.Body != nil { + defer func() { + if bodyCloseErr := res.Body.Close(); bodyCloseErr != nil { + err = fmt.Errorf("SearchNFInstances' response body cannot close: %w", bodyCloseErr) + } + }() + } else { + logger.ConsumerLog.Error("---Response nil from NRF for SearchNFInstances") + } udmSelf := udmContext.UDM_Self() var nrfSubData models.NrfSubscriptionData diff --git a/go.mod b/go.mod index 4bcd925..6115422 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/omec-project/udm go 1.24.0 require ( - github.com/5GC-DEV/openapi-cdac v0.4.1 github.com/antihax/optional v1.0.0 github.com/gin-gonic/gin v1.10.1 github.com/google/uuid v1.6.0 @@ -17,6 +16,7 @@ require ( ) require ( + github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260512061633-0236599ddf98 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bytedance/sonic v1.13.3 // indirect diff --git a/go.sum b/go.sum index 7ecd212..4be9e5a 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ -github.com/5GC-DEV/openapi-cdac v0.4.1 h1:EFGYKz6D+k2tI4fEvSDAJseVo3amgoZEK3tVrp5znec= -github.com/5GC-DEV/openapi-cdac v0.4.1/go.mod h1:KLX5UeLe67E9SQC/vVNArCa4KK4luoDNAS0kRGkdE74= github.com/5GC-DEV/openapi-cdac v1.0.0/go.mod h1:TFxV/NlwA7waEk3BqH6baTQ8oWpPMRDFC1YCEpPjl04= +github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260512061633-0236599ddf98 h1:rT43VfYdfFoDVn3lEiuZDzpXc3YwKGyFHlJnUuk9DrA= +github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260512061633-0236599ddf98/go.mod h1:KLX5UeLe67E9SQC/vVNArCa4KK4luoDNAS0kRGkdE74= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= From d03aa5263e3a505ab15a3a33f8b5e1128b4a9140 Mon Sep 17 00:00:00 2001 From: AshithaCDAC Date: Tue, 12 May 2026 08:32:18 +0000 Subject: [PATCH 2/4] logs added --- consumer/nf_discovery.go | 1 + 1 file changed, 1 insertion(+) diff --git a/consumer/nf_discovery.go b/consumer/nf_discovery.go index 54e5c5d..10b9a57 100644 --- a/consumer/nf_discovery.go +++ b/consumer/nf_discovery.go @@ -86,6 +86,7 @@ var SendNfDiscoveryToNrf = func(nrfUri string, targetNfType, requesterNfType mod } func SendNFInstancesUDR(id string, types int) string { + logger.ConsumerLog.Infof("---Sending NRF discovery for SUPI=%s", id) self := udmContext.UDM_Self() targetNfType := models.NfType_UDR requestNfType := models.NfType_UDM From 342e8cf1b090995c48aed82bc596b14459e8f9f9 Mon Sep 17 00:00:00 2001 From: AshithaCDAC Date: Wed, 13 May 2026 10:39:49 +0000 Subject: [PATCH 3/4] Used the OpenAPI library with added logs --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6115422..b916dcb 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( ) require ( - github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260512061633-0236599ddf98 // indirect + github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260513103149-72b74fcab840 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bytedance/sonic v1.13.3 // indirect diff --git a/go.sum b/go.sum index 4be9e5a..542dd05 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ github.com/5GC-DEV/openapi-cdac v1.0.0/go.mod h1:TFxV/NlwA7waEk3BqH6baTQ8oWpPMRDFC1YCEpPjl04= -github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260512061633-0236599ddf98 h1:rT43VfYdfFoDVn3lEiuZDzpXc3YwKGyFHlJnUuk9DrA= -github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260512061633-0236599ddf98/go.mod h1:KLX5UeLe67E9SQC/vVNArCa4KK4luoDNAS0kRGkdE74= +github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260513103149-72b74fcab840 h1:atGt/LMCFvkwaJlsilXkr9V+30NJvR8/oz1xg7HdFdc= +github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260513103149-72b74fcab840/go.mod h1:KLX5UeLe67E9SQC/vVNArCa4KK4luoDNAS0kRGkdE74= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= From 661120a21b4b94d0927516b40eb50cbd3d88d5d9 Mon Sep 17 00:00:00 2001 From: AshithaCDAC Date: Tue, 19 May 2026 05:29:13 +0000 Subject: [PATCH 4/4] added openapi v0.4.2 --- consumer/nf_discovery.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/consumer/nf_discovery.go b/consumer/nf_discovery.go index 10b9a57..6468368 100644 --- a/consumer/nf_discovery.go +++ b/consumer/nf_discovery.go @@ -58,7 +58,7 @@ var SendNfDiscoveryToNrf = func(nrfUri string, targetNfType, requesterNfType mod } }() } else { - logger.ConsumerLog.Error("---Response nil from NRF for SearchNFInstances") + logger.ConsumerLog.Error("Response nil from NRF for SearchNFInstances") } udmSelf := udmContext.UDM_Self() @@ -86,7 +86,7 @@ var SendNfDiscoveryToNrf = func(nrfUri string, targetNfType, requesterNfType mod } func SendNFInstancesUDR(id string, types int) string { - logger.ConsumerLog.Infof("---Sending NRF discovery for SUPI=%s", id) + logger.ConsumerLog.Infof("Sending NRF discovery for SUPI=%s", id) self := udmContext.UDM_Self() targetNfType := models.NfType_UDR requestNfType := models.NfType_UDM diff --git a/go.mod b/go.mod index b916dcb..edd5483 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( ) require ( - github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260513103149-72b74fcab840 // indirect + github.com/5GC-DEV/openapi-cdac v0.4.2 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bytedance/sonic v1.13.3 // indirect diff --git a/go.sum b/go.sum index 542dd05..4cf8499 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ +github.com/5GC-DEV/openapi-cdac v0.4.2 h1:nHHusGmBkFOqjyJgvf8JOlJ2GlrF71aFD+HRzjGg904= +github.com/5GC-DEV/openapi-cdac v0.4.2/go.mod h1:KLX5UeLe67E9SQC/vVNArCa4KK4luoDNAS0kRGkdE74= github.com/5GC-DEV/openapi-cdac v1.0.0/go.mod h1:TFxV/NlwA7waEk3BqH6baTQ8oWpPMRDFC1YCEpPjl04= -github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260513103149-72b74fcab840 h1:atGt/LMCFvkwaJlsilXkr9V+30NJvR8/oz1xg7HdFdc= -github.com/5GC-DEV/openapi-cdac v1.0.1-0.20260513103149-72b74fcab840/go.mod h1:KLX5UeLe67E9SQC/vVNArCa4KK4luoDNAS0kRGkdE74= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=