Skip to content

Commit

Permalink
refactor packages and NFs
Browse files Browse the repository at this point in the history 
- upgrade some 3rd-party packages to fix potential security vulnerabilities
- refactor packages: move common packages to new util package
- restruct NF's folders
- add config validator
- modify default DNN IP pool's cidr to 10.60.0.0/16
- move TLS folder into config folder
- move consumerTestdata and nasTestpacket into test folder
- update all scripts
- drop NFProfiles in db when executing force_kill.sh
  • Loading branch information
@free5gc-org
free5gc-org committed Mar 30, 2022
1 parent aa3b1f6 commit 6d33658
Show file tree
Hide file tree
Showing 112 changed files with 5,235 additions and 2,246 deletions.
0 LICENSE.txt → LICENSE
View file
File renamed without changes.
24 changes: 12 additions & 12 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ VERSION = $(shell git describe --tags)
BUILD_TIME = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
COMMIT_HASH = $(shell git submodule status | grep $(GO_SRC_PATH)/$(@F) | awk '{print $$(1)}' | cut -c1-8)
COMMIT_TIME = $(shell cd $(GO_SRC_PATH)/$(@F) && git log --pretty="@%at" -1 | xargs date -u +"%Y-%m-%dT%H:%M:%SZ" -d)
LDFLAGS = -X github.com/free5gc/version.VERSION=$(VERSION) \
-X github.com/free5gc/version.BUILD_TIME=$(BUILD_TIME) \
-X github.com/free5gc/version.COMMIT_HASH=$(COMMIT_HASH) \
-X github.com/free5gc/version.COMMIT_TIME=$(COMMIT_TIME)
LDFLAGS = -X github.com/free5gc/util/version.VERSION=$(VERSION) \
-X github.com/free5gc/util/version.BUILD_TIME=$(BUILD_TIME) \
-X github.com/free5gc/util/version.COMMIT_HASH=$(COMMIT_HASH) \
-X github.com/free5gc/util/version.COMMIT_TIME=$(COMMIT_TIME)

WEBCONSOLE_COMMIT_HASH = $(shell git submodule status | grep $(WEBCONSOLE) | awk '{print $$(1)}' | cut -c1-8)
WEBCONSOLE_COMMIT_TIME = $(shell cd $(WEBCONSOLE) && git log --pretty="@%at" -1 | xargs date -u +"%Y-%m-%dT%H:%M:%SZ" -d)
WEBCONSOLE_LDFLAGS = -X github.com/free5gc/version.VERSION=$(VERSION) \
-X github.com/free5gc/version.BUILD_TIME=$(BUILD_TIME) \
-X github.com/free5gc/version.COMMIT_HASH=$(WEBCONSOLE_COMMIT_HASH) \
-X github.com/free5gc/version.COMMIT_TIME=$(WEBCONSOLE_COMMIT_TIME)
WEBCONSOLE_LDFLAGS = -X github.com/free5gc/util/version.VERSION=$(VERSION) \
-X github.com/free5gc/util/version.BUILD_TIME=$(BUILD_TIME) \
-X github.com/free5gc/util/version.COMMIT_HASH=$(WEBCONSOLE_COMMIT_HASH) \
-X github.com/free5gc/util/version.COMMIT_TIME=$(WEBCONSOLE_COMMIT_TIME)

.PHONY: $(NF) $(WEBCONSOLE) clean

Expand All @@ -37,15 +37,15 @@ nfs: $(NF)
all: $(NF) $(WEBCONSOLE)

debug: GCFLAGS += -N -l
debug: clean all
debug: all

$(GO_NF): % : $(GO_BIN_PATH)/%

$(GO_BIN_PATH)/%: %.go $(NF_GO_FILES)
$(GO_BIN_PATH)/%: $(NF_GO_FILES)
# $(@F): The file-within-directory part of the file name of the target.
@echo "Start building $(@F)...."
cd $(GO_SRC_PATH)/$(@F) && \
CGO_ENABLED=0 go build -gcflags "$(GCFLAGS)" -ldflags "$(LDFLAGS)" -o $(ROOT_PATH)/$@ $(@F).go
cd $(GO_SRC_PATH)/$(@F)/cmd && \
CGO_ENABLED=0 go build -gcflags "$(GCFLAGS)" -ldflags "$(LDFLAGS)" -o $(ROOT_PATH)/$@ main.go

vpath %.go $(addprefix $(GO_SRC_PATH)/, $(GO_NF))

Expand Down
2 changes: 1 addition & 1 deletion NFs/amf
Submodule amf updated 93 files
+14 −4 .gitignore
+6 −11 .golangci.yml
+0 −9 CHANGELOG.md
+0 −0 LICENSE
+0 −46 amf.go
+87 −0 cmd/main.go
+0 −161 factory/config.go
+12 −21 go.mod
+118 −83 go.sum
+0 −0 internal/context/3gpp_types.go
+4 −2 internal/context/amf_ran.go
+38 −18 internal/context/amf_ue.go
+1 −1 internal/context/common_function.go
+3 −3 internal/context/context.go
+1 −1 internal/context/ran_ue.go
+0 −0 internal/context/sm_context.go
+0 −0 internal/context/timer.go
+3 −0 internal/gmm/.gitignore
+1 −1 internal/gmm/common/timer.go
+3 −3 internal/gmm/common/user_profile.go
+8 −8 internal/gmm/handler.go
+3 −3 internal/gmm/init.go
+2 −2 internal/gmm/init_test.go
+5 −5 internal/gmm/message/build.go
+5 −5 internal/gmm/message/send.go
+5 −5 internal/gmm/sm.go
+39 −12 internal/logger/logger.go
+3 −3 internal/nas/dispatch.go
+3 −3 internal/nas/handler.go
+1 −1 internal/nas/nas_security/security.go
+2 −2 internal/ngap/dispatcher.go
+7 −7 internal/ngap/handler.go
+4 −4 internal/ngap/message/build.go
+2 −2 internal/ngap/message/forward_ie.go
+3 −3 internal/ngap/message/send.go
+5 −5 internal/ngap/message/send_test.go.test
+1 −1 internal/ngap/service/service.go
+5 −5 internal/sbi/communication/api_individual_subscription_document.go
+8 −8 internal/sbi/communication/api_individual_ue_context_document.go
+4 −4 internal/sbi/communication/api_n1_n2_individual_subscription_document.go
+5 −5 internal/sbi/communication/api_n1_n2_message_collection_document.go
+4 −4 internal/sbi/communication/api_n1_n2_subscriptions_collection_for_individual_ue_contexts_document.go
+1 −1 internal/sbi/communication/api_non_uen2_message_notification_individual_subscription_document.go
+1 −1 internal/sbi/communication/api_non_uen2_messages_collection_document.go
+1 −1 internal/sbi/communication/api_non_uen2_messages_subscriptions_collection_document.go
+4 −4 internal/sbi/communication/api_subscriptions_collection_document.go
+2 −2 internal/sbi/communication/routers.go
+2 −2 internal/sbi/consumer/am_policy.go
+2 −2 internal/sbi/consumer/communication.go
+3 −3 internal/sbi/consumer/nf_discovery.go
+4 −4 internal/sbi/consumer/nf_mangement.go
+2 −2 internal/sbi/consumer/nsselection.go
+2 −2 internal/sbi/consumer/sm_context.go
+1 −1 internal/sbi/consumer/subscriber_data_management.go
+2 −2 internal/sbi/consumer/ue_authentication.go
+1 −1 internal/sbi/consumer/ue_context_management.go
+5 −5 internal/sbi/eventexposure/api_individual_subscription_document.go
+4 −4 internal/sbi/eventexposure/api_subscriptions_collection_document.go
+2 −2 internal/sbi/eventexposure/routers.go
+5 −5 internal/sbi/httpcallback/api_am_policy_control_update_notify.go
+4 −4 internal/sbi/httpcallback/api_n1_message_notify.go
+4 −4 internal/sbi/httpcallback/api_sm_context_status_notify.go
+2 −2 internal/sbi/httpcallback/router.go
+4 −4 internal/sbi/location/api_individual_ue_context_document.go
+2 −2 internal/sbi/location/routers.go
+4 −4 internal/sbi/mt/api_ue_context_document.go
+1 −1 internal/sbi/mt/api_ue_reach_ind_document.go
+2 −2 internal/sbi/mt/routers.go
+7 −5 internal/sbi/oam/api_registered_ue_context.go
+7 −4 internal/sbi/oam/routers.go
+21 −21 internal/sbi/producer/callback.go
+2 −2 internal/sbi/producer/callback/n1n2message.go
+2 −2 internal/sbi/producer/callback/subscription.go
+1 −1 internal/sbi/producer/callback/ue_context.go
+14 −14 internal/sbi/producer/event_exposure.go
+6 −6 internal/sbi/producer/location_info.go
+6 −6 internal/sbi/producer/mt.go
+21 −21 internal/sbi/producer/n1n2message.go
+6 −6 internal/sbi/producer/oam.go
+12 −12 internal/sbi/producer/subscription.go
+22 −22 internal/sbi/producer/ue_context.go
+1 −1 internal/util/convert.go
+3 −3 internal/util/init_context.go
+10 −0 internal/util/path.go
+10 −0 internal/util/path_debug.go
+0 −0 internal/util/search_nf_service.go
+0 −0 internal/util/test/testAmfcfg.yaml
+0 −0 internal/util/test/testAmfcfg2.yaml
+518 −0 pkg/factory/config.go
+1 −1 pkg/factory/factory.go
+101 −95 pkg/service/init.go
+0 −14 util/path.go
+0 −14 util/path_debug.go
2 changes: 1 addition & 1 deletion NFs/ausf
Submodule ausf updated 30 files
+14 −4 .gitignore
+6 −11 .golangci.yml
+0 −9 CHANGELOG.md
+0 −0 LICENSE
+0 −53 ausf.go
+93 −0 cmd/main.go
+0 −59 factory/config.go
+8 −14 go.mod
+112 −69 go.sum
+4 −5 internal/context/ausf_context_init.go
+1 −1 internal/context/context.go
+29 −14 internal/logger/logger.go
+1 −1 internal/sbi/consumer/nf_discovery.go
+2 −2 internal/sbi/consumer/nf_management.go
+6 −3 internal/sbi/producer/eapAkaPrimeKeyGen_test.go
+3 −3 internal/sbi/producer/functions.go
+34 −25 internal/sbi/producer/ue_authentication.go
+0 −0 internal/sbi/sorprotection/api_default.go
+2 −2 internal/sbi/sorprotection/routers.go
+6 −6 internal/sbi/ueauthentication/api_default.go
+2 −2 internal/sbi/ueauthentication/routers.go
+0 −0 internal/sbi/upuprotection/api_default.go
+2 −2 internal/sbi/upuprotection/routers.go
+8 −0 internal/util/path.go
+161 −0 pkg/factory/config.go
+1 −1 pkg/factory/factory.go
+267 −0 pkg/service/init.go
+0 −264 service/init.go
+0 −14 util/path.go
+0 −14 util/path_debug.go
2 changes: 1 addition & 1 deletion NFs/n3iwf
Submodule n3iwf updated 15 files
+14 −4 .gitignore
+6 −11 .golangci.yml
+0 −9 CHANGELOG.md
+0 −0 LICENSE
+69 −0 cmd/main.go
+4 −7 go.mod
+89 −46 go.sum
+35 −14 internal/logger/logger.go
+3 −4 internal/util/initContext.go
+7 −0 internal/util/path.go
+0 −45 n3iwf.go
+1 −1 pkg/context/context.go
+39 −16 pkg/context/types.go
+82 −20 pkg/factory/config.go
+43 −60 pkg/service/init.go
2 changes: 1 addition & 1 deletion NFs/nrf
Submodule nrf updated 39 files
+14 −4 .gitignore
+6 −11 .golangci.yml
+0 −9 CHANGELOG.md
+0 −0 LICENSE
+0 −73 accesstoken/api_access_token_request_test.go
+77 −0 cmd/main.go
+0 −116 factory/config.go
+10 −18 go.mod
+63 −94 go.sum
+2 −2 internal/context/context.go
+0 −0 internal/context/dataconv.go
+0 −0 internal/context/item.go
+0 −0 internal/context/link.go
+27 −17 internal/context/management_data.go
+0 −0 internal/context/search_nf_instance.go
+0 −0 internal/context/uri_list.go
+29 −14 internal/logger/logger.go
+4 −4 internal/sbi/accesstoken/api_access_token_request.go
+2 −2 internal/sbi/accesstoken/routers.go
+4 −4 internal/sbi/discovery/api_nf_instances_store.go
+4 −4 internal/sbi/discovery/routers.go
+76 −49 internal/sbi/management/api_management.go
+7 −7 internal/sbi/management/api_nf_instance_id_document.go
+4 −4 internal/sbi/management/api_nf_instances_store.go
+5 −5 internal/sbi/management/api_subscription_id_document.go
+4 −4 internal/sbi/management/api_subscriptions_collection.go
+4 −4 internal/sbi/management/routers.go
+8 −8 internal/sbi/producer/access_token.go
+29 −15 internal/sbi/producer/nf_discovery.go
+173 −90 internal/sbi/producer/nf_management.go
+10 −0 internal/util/util.go
+0 −51 nrf.go
+211 −0 pkg/factory/config.go
+3 −3 pkg/factory/factory.go
+275 −0 pkg/service/init.go
+0 −277 service/init.go
+0 −51 test/test_server2.go
+0 −15 util/util.go
+0 −15 util/util_debug.go
2 changes: 1 addition & 1 deletion NFs/nssf
Submodule nssf updated 34 files
+14 −4 .gitignore
+6 −11 .golangci.yml
+0 −9 CHANGELOG.md
+0 −0 LICENSE
+75 −0 cmd/main.go
+7 −15 go.mod
+114 −70 go.sum
+2 −2 internal/context/context.go
+29 −14 internal/logger/logger.go
+0 −0 internal/plugin/nsselection_query_parameter.go
+0 −0 internal/plugin/patch_document.go
+2 −2 internal/sbi/consumer/nf_management.go
+7 −7 internal/sbi/nssaiavailability/api_nf_instance_id_document.go
+4 −4 internal/sbi/nssaiavailability/api_subscription_id_document.go
+4 −4 internal/sbi/nssaiavailability/api_subscriptions_collection.go
+2 −2 internal/sbi/nssaiavailability/routers.go
+4 −4 internal/sbi/nsselection/api_network_slice_information_document.go
+2 −2 internal/sbi/nsselection/routers.go
+8 −8 internal/sbi/producer/network_slice_information_document.go
+14 −14 internal/sbi/producer/nf_instance_id_document.go
+4 −4 internal/sbi/producer/nssaiavailability_store.go
+3 −3 internal/sbi/producer/nssaiavailability_subscription.go
+2 −2 internal/sbi/producer/nsselection_for_pdu_session.go
+3 −3 internal/sbi/producer/nsselection_for_registration.go
+6 −6 internal/sbi/producer/subscription_id_document.go
+6 −6 internal/sbi/producer/subscriptions_collection.go
+8 −10 internal/util/util.go
+0 −55 nssf.go
+10 −4 pkg/factory/config.go
+1 −1 pkg/factory/factory.go
+85 −85 pkg/service/init.go
+0 −353 test/conf/test_nssf_config.yaml
+0 −44 test/param.go
+0 −20 test/util.go
2 changes: 1 addition & 1 deletion NFs/pcf
Submodule pcf updated 51 files
+14 −4 .gitignore
+6 −11 .golangci.yml
+0 −9 CHANGELOG.md
+0 −0 LICENSE
+96 −0 cmd/main.go
+0 −66 factory/config.go
+8 −16 go.mod
+59 −94 go.sum
+3 −3 internal/context/context.go
+2 −2 internal/context/ue.go
+29 −14 internal/logger/logger.go
+8 −8 internal/sbi/ampolicy/api_default.go
+2 −2 internal/sbi/ampolicy/routers.go
+8 −5 internal/sbi/bdtpolicy/api_bdt_policies_collection_routers.go
+9 −6 internal/sbi/bdtpolicy/api_individual_bdt_policy_document_routers.go
+6 −3 internal/sbi/bdtpolicy/routers.go
+3 −3 internal/sbi/consumer/communication.go
+2 −2 internal/sbi/consumer/nf_discovery.go
+2 −2 internal/sbi/consumer/nf_management.go
+4 −4 internal/sbi/httpcallback/amf_status_change_notify.go
+2 −2 internal/sbi/httpcallback/router.go
+4 −4 internal/sbi/httpcallback/sm_policy_notify.go
+1 −1 internal/sbi/notifyevent/dispatcher.go
+1 −1 internal/sbi/notifyevent/listener.go
+2 −2 internal/sbi/notifyevent/send_smpolicy_termination.go
+2 −2 internal/sbi/notifyevent/send_smpolicy_update.go
+7 −5 internal/sbi/oam/api_get_am_policy.go
+2 −2 internal/sbi/oam/routers.go
+5 −5 internal/sbi/policyauthorization/api_application_sessions_collection.go
+6 −6 internal/sbi/policyauthorization/api_events_subscription_document.go
+6 −6 internal/sbi/policyauthorization/api_individual_application_session_context_document.go
+2 −2 internal/sbi/policyauthorization/routers.go
+20 −20 internal/sbi/producer/ampolicy.go
+18 −18 internal/sbi/producer/bdtpolicy.go
+6 −6 internal/sbi/producer/callback.go
+7 −7 internal/sbi/producer/oam.go
+27 −27 internal/sbi/producer/policyauthorization.go
+24 −21 internal/sbi/producer/smpolicy.go
+7 −7 internal/sbi/smpolicy/api_default.go
+2 −2 internal/sbi/smpolicy/routers.go
+0 −0 internal/sbi/uepolicy/api_default.go
+2 −2 internal/sbi/uepolicy/routers.go
+0 −0 internal/util/convert.go
+10 −7 internal/util/init_context.go
+0 −0 internal/util/pcc_rule.go
+9 −7 internal/util/pcf_util.go
+0 −0 internal/util/search_nf_service.go
+0 −57 pcf.go
+230 −0 pkg/factory/config.go
+3 −3 pkg/factory/factory.go
+99 −93 pkg/service/init.go
2 changes: 1 addition & 1 deletion NFs/smf
Submodule smf updated 74 files
+14 −4 .gitignore
+6 −11 .golangci.yml
+0 −9 CHANGELOG.md
+0 −0 LICENSE
+89 −0 cmd/main.go
+0 −208 factory/config.go
+13 −20 go.mod
+121 −86 go.sum
+0 −0 internal/context/bp_manager.go
+1 −1 internal/context/config.go
+14 −8 internal/context/context.go
+6 −7 internal/context/datapath.go
+2 −4 internal/context/gsm_build.go
+1 −1 internal/context/gsm_handler.go
+0 −0 internal/context/ip_allocator.go
+3 −3 internal/context/nf_profile.go
+0 −0 internal/context/ngap_build.go
+1 −1 internal/context/ngap_handler.go
+0 −0 internal/context/pcc_rule.go
+0 −0 internal/context/pco.go
+2 −3 internal/context/pfcp_rules.go
+0 −0 internal/context/pfcp_session_context.go
+0 −0 internal/context/pool/lazyReusePool.go
+0 −0 internal/context/pool/lazyReusePool_test.go
+0 −0 internal/context/qos_rule.go
+0 −0 internal/context/session_rules.go
+1 −1 internal/context/sm_context.go
+1 −1 internal/context/snssai.go
+0 −0 internal/context/snssai_dnn_smf_info.go
+0 −0 internal/context/traffic_control_data.go
+3 −3 internal/context/ue_datapath.go
+2 −2 internal/context/ue_defaultPath.go
+0 −0 internal/context/ulcl_group.go
+4 −4 internal/context/upf.go
+9 −9 internal/context/user_plane_information.go
+2 −2 internal/context/user_plane_information_test.go
+46 −14 internal/logger/logger.go
+2 −2 internal/pfcp/dispatcher.go
+4 −4 internal/pfcp/handler/handler.go
+0 −0 internal/pfcp/handler/handler_test.go
+8 −8 internal/pfcp/message/build.go
+3 −3 internal/pfcp/message/send.go
+3 −3 internal/pfcp/message/send_test.go
+0 −0 internal/pfcp/reliable_pfcp_request_test.go
+2 −2 internal/pfcp/udp/udp.go
+10 −7 internal/pfcp/udp/udp_test.go
+17 −7 internal/sbi/callback/api_default.go
+2 −2 internal/sbi/callback/routers.go
+2 −2 internal/sbi/consumer/nnrf.go
+1 −1 internal/sbi/consumer/nsmf_pdusession_callback.go
+1 −1 internal/sbi/consumer/sm_policy.go
+0 −0 internal/sbi/eventexposure/api_default.go
+2 −2 internal/sbi/eventexposure/routers.go
+3 −3 internal/sbi/oam/api_get_ue_pdu_session_info.go
+2 −2 internal/sbi/oam/routers.go
+0 −0 internal/sbi/pdusession/api_individual_pdu_session_hsmf.go
+5 −5 internal/sbi/pdusession/api_individual_sm_context.go
+0 −0 internal/sbi/pdusession/api_pdu_sessions_collection.go
+4 −4 internal/sbi/pdusession/api_sm_contexts_collection.go
+2 −2 internal/sbi/pdusession/routers.go
+6 −6 internal/sbi/producer/callback.go
+3 −3 internal/sbi/producer/datapath.go
+5 −5 internal/sbi/producer/oam.go
+32 −32 internal/sbi/producer/pdu_session.go
+6 −6 internal/sbi/producer/ulcl_procedure.go
+9 −0 internal/util/path.go
+0 −0 internal/util/qos_convert.go
+0 −35 pdusession/dummy_server.go
+606 −0 pkg/factory/config.go
+1 −1 pkg/factory/factory.go
+79 −92 pkg/service/init.go
+0 −58 smf.go
+0 −14 util/path.go
+0 −14 util/path_debug.go
2 changes: 1 addition & 1 deletion NFs/udm
Submodule udm updated 75 files
+14 −4 .gitignore
+6 −11 .golangci.yml
+0 −9 CHANGELOG.md
+0 −0 LICENSE
+85 −0 cmd/main.go
+0 −61 factory/config.go
+8 −17 go.mod
+112 −75 go.sum
+2 −3 internal/context/context.go
+31 −14 internal/logger/logger.go
+3 −3 internal/sbi/consumer/nf_discovery.go
+2 −2 internal/sbi/consumer/nf_management.go
+4 −4 internal/sbi/eventexposure/api_create_ee_subscription.go
+3 −3 internal/sbi/eventexposure/api_delete_ee_subscription.go
+4 −4 internal/sbi/eventexposure/api_update_ee_subscription.go
+2 −2 internal/sbi/eventexposure/routers.go
+4 −4 internal/sbi/httpcallback/data_change_notification_to_nf.go
+2 −2 internal/sbi/httpcallback/router.go
+4 −4 internal/sbi/parameterprovision/api_subscription_data_update.go
+0 −0 internal/sbi/parameterprovision/api_subscription_data_update_test.go
+2 −2 internal/sbi/parameterprovision/routers.go
+6 −6 internal/sbi/producer/callback.go
+2 −2 internal/sbi/producer/callback/callback.go
+12 −12 internal/sbi/producer/event_exposure.go
+70 −74 internal/sbi/producer/generate_auth_data.go
+6 −6 internal/sbi/producer/parameter_provision.go
+68 −70 internal/sbi/producer/subscriber_data_management.go
+35 −35 internal/sbi/producer/ue_context_management.go
+4 −4 internal/sbi/subscriberdatamanagement/api_access_and_mobility_subscription_data_retrieval.go
+4 −4 internal/sbi/subscriberdatamanagement/api_gpsi_to_supi_translation.go
+0 −0 internal/sbi/subscriberdatamanagement/api_providing_acknowledgement_of_steering_of_roaming.go
+0 −0 internal/sbi/subscriberdatamanagement/api_providing_acknowledgement_of_ue_parameters_update.go
+4 −4 internal/sbi/subscriberdatamanagement/api_retrieval_of_multiple_data_sets.go
+4 −4 internal/sbi/subscriberdatamanagement/api_retrieval_of_shared_data.go
+4 −4 internal/sbi/subscriberdatamanagement/api_session_management_subscription_data_retrieval.go
+4 −4 internal/sbi/subscriberdatamanagement/api_slice_selection_subscription_data_retrieval.go
+4 −5 internal/sbi/subscriberdatamanagement/api_smf_selection_subscription_data_retrieval.go
+0 −0 internal/sbi/subscriberdatamanagement/api_sms_management_subscription_data_retrieval.go
+0 −0 internal/sbi/subscriberdatamanagement/api_sms_subscription_data_retrieval.go
+4 −4 internal/sbi/subscriberdatamanagement/api_subscription_creation.go
+4 −4 internal/sbi/subscriberdatamanagement/api_subscription_creation_for_shared_data.go
+4 −4 internal/sbi/subscriberdatamanagement/api_subscription_deletion.go
+4 −4 internal/sbi/subscriberdatamanagement/api_subscription_deletion_for_shared_data.go
+5 −5 internal/sbi/subscriberdatamanagement/api_subscription_modification.go
+4 −4 internal/sbi/subscriberdatamanagement/api_trace_configuration_data_retrieval.go
+4 −4 internal/sbi/subscriberdatamanagement/api_ue_context_in_smf_data_retrieval.go
+0 −0 internal/sbi/subscriberdatamanagement/api_ue_context_in_smsf_data_retrieval.go
+6 −2 internal/sbi/subscriberdatamanagement/routers.go
+4 −4 internal/sbi/ueauthentication/api_confirm_auth.go
+4 −5 internal/sbi/ueauthentication/api_generate_auth_data.go
+4 −2 internal/sbi/ueauthentication/routers.go
+4 −6 internal/sbi/uecontextmanagement/api_amf3_gpp_access_registration_info_retrieval.go
+4 −4 internal/sbi/uecontextmanagement/api_amf_non3_gpp_access_registration_info_retrieval.go
+4 −5 internal/sbi/uecontextmanagement/api_amf_registration_for3_gpp_access.go
+4 −4 internal/sbi/uecontextmanagement/api_amf_registration_for_non3_gpp_access.go
+4 −5 internal/sbi/uecontextmanagement/api_parameter_update_in_the_amf_registration_for3_gpp_access.go
+4 −5 internal/sbi/uecontextmanagement/api_parameter_update_in_the_amf_registration_for_non3_gpp_access.go
+4 −4 internal/sbi/uecontextmanagement/api_smf_deregistration.go
+4 −4 internal/sbi/uecontextmanagement/api_smf_registration.go
+0 −0 internal/sbi/uecontextmanagement/api_smsf3_gpp_access_registration_info_retrieval.go
+0 −0 internal/sbi/uecontextmanagement/api_smsf_deregistration_for3_gpp_access.go
+0 −0 internal/sbi/uecontextmanagement/api_smsf_deregistration_for_non3_gpp_access.go
+0 −0 internal/sbi/uecontextmanagement/api_smsf_non3_gpp_access_registration_info_retrieval.go
+0 −0 internal/sbi/uecontextmanagement/api_smsf_registration_for3_gpp_access.go
+0 −0 internal/sbi/uecontextmanagement/api_smsf_registration_for_non3_gpp_access.go
+2 −2 internal/sbi/uecontextmanagement/routers.go
+5 −8 internal/util/init_context.go
+0 −0 internal/util/search_nf_service.go
+7 −0 internal/util/util.go
+174 −0 pkg/factory/config.go
+3 −3 pkg/factory/factory.go
+89 −94 pkg/service/init.go
+383 −0 pkg/suci/suci.go
+46 −0 pkg/suci/suci_test.go
+0 −45 udm.go
2 changes: 1 addition & 1 deletion NFs/udr
Submodule udr updated 64 files
+14 −4 .gitignore
+6 −11 .golangci.yml
+0 −9 CHANGELOG.md
+0 −0 LICENSE
+85 −0 cmd/main.go
+0 −63 factory/config.go
+10 −17 go.mod
+59 −92 go.sum
+0 −0 internal/context/context.go
+29 −14 internal/logger/logger.go
+1 −1 internal/sbi/consumer/nf_discovery.go
+3 −3 internal/sbi/consumer/nf_managemant.go
+0 −0 internal/sbi/datarepository/api_access_and_mobility_data.go
+4 −4 internal/sbi/datarepository/api_access_and_mobility_subscription_data_document.go
+6 −6 internal/sbi/datarepository/api_amf3_gpp_access_registration_document.go
+6 −6 internal/sbi/datarepository/api_amf_non3_gpp_access_registration_document.go
+4 −4 internal/sbi/datarepository/api_amf_subscription_info_document.go
+5 −5 internal/sbi/datarepository/api_authentication_data_document.go
+5 −5 internal/sbi/datarepository/api_authentication_so_r_document.go
+5 −5 internal/sbi/datarepository/api_authentication_status_document.go
+26 −26 internal/sbi/datarepository/api_default.go
+5 −5 internal/sbi/datarepository/api_event_amf_subscription_info_document.go
+4 −4 internal/sbi/datarepository/api_event_exposure_data_document.go
+5 −5 internal/sbi/datarepository/api_event_exposure_group_subscription_document.go
+5 −5 internal/sbi/datarepository/api_event_exposure_group_subscriptions_collection.go
+5 −5 internal/sbi/datarepository/api_event_exposure_subscription_document.go
+5 −5 internal/sbi/datarepository/api_event_exposure_subscriptions_collection.go
+5 −5 internal/sbi/datarepository/api_operator_specific_data_container_document.go
+4 −4 internal/sbi/datarepository/api_parameter_provision_document.go
+6 −3 internal/sbi/datarepository/api_pdu_session_management_data.go
+4 −4 internal/sbi/datarepository/api_provisioned_data_document.go
+4 −4 internal/sbi/datarepository/api_provisioned_parameter_data_document.go
+5 −5 internal/sbi/datarepository/api_query_amf_subscription_info_document.go
+4 −4 internal/sbi/datarepository/api_query_identity_data_by_supi_or_gpsi_document.go
+4 −4 internal/sbi/datarepository/api_query_odb_data_by_supi_or_gpsi_document.go
+4 −4 internal/sbi/datarepository/api_retrieval_of_shared_data.go
+5 −5 internal/sbi/datarepository/api_sdm_subscription_document.go
+5 −5 internal/sbi/datarepository/api_sdm_subscriptions_collection.go
+4 −4 internal/sbi/datarepository/api_session_management_subscription_data.go
+6 −6 internal/sbi/datarepository/api_smf_registration_document.go
+4 −4 internal/sbi/datarepository/api_smf_registrations_collection.go
+4 −4 internal/sbi/datarepository/api_smf_selection_subscription_data_document.go
+4 −4 internal/sbi/datarepository/api_sms_management_subscription_data_document.go
+4 −4 internal/sbi/datarepository/api_sms_subscription_data_document.go
+6 −6 internal/sbi/datarepository/api_smsf3_gpp_registration_document.go
+6 −6 internal/sbi/datarepository/api_smsf_non3_gpp_registration_document.go
+4 −4 internal/sbi/datarepository/api_subs_to_nofify_collection.go
+4 −4 internal/sbi/datarepository/api_subs_to_notify_document.go
+4 −4 internal/sbi/datarepository/api_trace_data_document.go
+8 −4 internal/sbi/datarepository/routers.go
+1 −1 internal/sbi/producer/callback.go
+17 −2 internal/sbi/producer/callback/callback.go
+789 −754 internal/sbi/producer/data_repository.go
+1 −1 internal/util/convert.go
+3 −3 internal/util/init_context.go
+8 −0 internal/util/path.go
+0 −0 internal/util/util.go
+117 −0 pkg/factory/config.go
+1 −1 pkg/factory/factory.go
+291 −0 pkg/service/init.go
+0 −304 service/init.go
+0 −45 udr.go
+0 −14 util/path.go
+0 −14 util/path_debug.go
2 changes: 1 addition & 1 deletion NFs/upf
Submodule upf updated 7 files
+0 −0 LICENSE
+3 −3 config/upfcfg.example.yaml
+3 −3 config/upfcfg.test.example.yaml
+3 −3 config/upfcfg.ulcl.example.yaml
+1 −1 go.mod
+2 −2 go.sum
+1 −1 src/upf_init.c
0 support/TLS/amf.key → config/TLS/amf.key
View file
File renamed without changes.
0 support/TLS/amf.pem → config/TLS/amf.pem
View file
File renamed without changes.
0 support/TLS/ausf.key → config/TLS/ausf.key
View file
File renamed without changes.
0 support/TLS/ausf.pem → config/TLS/ausf.pem
View file
File renamed without changes.
0 support/TLS/n3iwf.key → config/TLS/n3iwf.key
View file
File renamed without changes.
0 support/TLS/n3iwf.pem → config/TLS/n3iwf.pem
View file
File renamed without changes.
0 support/TLS/nrf.key → config/TLS/nrf.key
View file
File renamed without changes.
0 support/TLS/nrf.pem → config/TLS/nrf.pem
View file
File renamed without changes.
0 support/TLS/nssf.key → config/TLS/nssf.key
View file
File renamed without changes.
0 support/TLS/nssf.pem → config/TLS/nssf.pem
View file
File renamed without changes.
0 support/TLS/pcf.key → config/TLS/pcf.key
View file
File renamed without changes.
0 support/TLS/pcf.pem → config/TLS/pcf.pem
View file
File renamed without changes.
0 support/TLS/smf.key → config/TLS/smf.key
View file
File renamed without changes.
0 support/TLS/smf.pem → config/TLS/smf.pem
View file
File renamed without changes.
0 support/TLS/udm.key → config/TLS/udm.key
View file
File renamed without changes.
0 support/TLS/udm.pem → config/TLS/udm.pem
View file
File renamed without changes.
0 support/TLS/udr.key → config/TLS/udr.key
View file
File renamed without changes.
0 support/TLS/udr.pem → config/TLS/udr.pem
View file
File renamed without changes.
116 changes: 0 additions & 116 deletions config/amfcfg.n3test.yaml
View file

This file was deleted.

16 changes: 7 additions & 9 deletions config/amfcfg.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
info:
version: 1.0.2
version: 1.0.3
description: AMF initial local configuration

configuration:
Expand All @@ -11,6 +11,9 @@ configuration:
registerIPv4: 127.0.0.18 # IP used to register to NRF
bindingIPv4: 127.0.0.18 # IP used to bind the service
port: 8000 # port used to bind the service
tls: # the local path of TLS key
pem: config/TLS/amf.pem # AMF TLS Certificate
key: config/TLS/amf.key # AMF TLS Private key
serviceNameList: # the SBI services provided by this AMF, refer to TS 29.518
- namf-comm # Namf_Communication service
- namf-evts # Namf_EventExposure service
Expand Down Expand Up @@ -53,6 +56,7 @@ configuration:
locality: area1 # Name of the location where a set of AMF, SMF and UPFs are located
networkFeatureSupport5GS: # 5gs Network Feature Support IE, refer to TS 24.501
enable: true # append this IE in Registration accept or not
length: 1 # IE content length (uinteger, range: 1~3)
imsVoPS: 0 # IMS voice over PS session indicator (uinteger, range: 0~1)
emc: 0 # Emergency service support indicator for 3GPP access (uinteger, range: 0~3)
emf: 0 # Emergency service fallback indicator for 3GPP access (uinteger, range: 0~3)
Expand Down Expand Up @@ -95,8 +99,8 @@ configuration:
maxRetryTimes: 4 # the max number of retransmission

# the kind of log output
# debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
# ReportCaller: enable the caller report or not, value: true or false
# debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
# ReportCaller: enable the caller report or not, value: true or false
logger:
AMF:
debugLevel: info
Expand All @@ -113,9 +117,3 @@ logger:
Aper:
debugLevel: info
ReportCaller: false
PathUtil:
debugLevel: info
ReportCaller: false
OpenApi:
debugLevel: info
ReportCaller: false
15 changes: 6 additions & 9 deletions config/ausfcfg.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
info:
version: 1.0.0
version: 1.0.2
description: AUSF initial local configuration

configuration:
Expand All @@ -8,6 +8,9 @@ configuration:
registerIPv4: 127.0.0.9 # IP used to register to NRF
bindingIPv4: 127.0.0.9 # IP used to bind the service
port: 8000 # Port used to bind the service
tls: # the local path of TLS key
pem: config/TLS/ausf.pem # AUSF TLS Certificate
key: config/TLS/ausf.key # AUSF TLS Private key
serviceNameList: # the SBI services provided by this AUSF, refer to TS 29.509
- nausf-auth # Nausf_UEAuthentication service
nrfUri: http://127.0.0.10:8000 # a valid URI of NRF
Expand All @@ -20,15 +23,9 @@ configuration:
eapAkaSupiImsiPrefix: false # including "imsi-" prefix or not when using the SUPI to do EAP-AKA' authentication

# the kind of log output
# debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
# ReportCaller: enable the caller report or not, value: true or false
# debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
# ReportCaller: enable the caller report or not, value: true or false
logger:
AUSF:
debugLevel: info
ReportCaller: false
PathUtil:
debugLevel: info
ReportCaller: false
OpenApi:
debugLevel: info
ReportCaller: false
Loading

0 comments on commit 6d33658

Please sign in to comment.