From 78b950af6d5666744895ff3b787acb0c818b3897 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Mon, 21 Aug 2023 18:25:41 +0800 Subject: [PATCH] d --- config/mml/system/amf_sys_mml_config.yaml | 6 +++++- config/mml/system/ausf_sys_mml_config.yaml | 4 ++++ config/mml/system/smf_sys_mml_config.yaml | 6 +++++- config/mml/system/udm_sys_mml_config.yaml | 4 ++++ config/mml/system/upf_sys_mml_config.yaml | 6 +++++- features/mml/mml.go | 9 +++++---- lib/routes/routes.go | 1 + 7 files changed, 29 insertions(+), 7 deletions(-) diff --git a/config/mml/system/amf_sys_mml_config.yaml b/config/mml/system/amf_sys_mml_config.yaml index fa4f4430..13bb3f6d 100644 --- a/config/mml/system/amf_sys_mml_config.yaml +++ b/config/mml/system/amf_sys_mml_config.yaml @@ -127,7 +127,11 @@ amf: optional: "false" filter: "" display: "CMD" - comment: "" + comment: "" + - operation: "reload" + object: "" + display: "Reload Config" + params: subsManagement: display: "Subscriber Management" mml: diff --git a/config/mml/system/ausf_sys_mml_config.yaml b/config/mml/system/ausf_sys_mml_config.yaml index 173cffa4..bc4e0242 100644 --- a/config/mml/system/ausf_sys_mml_config.yaml +++ b/config/mml/system/ausf_sys_mml_config.yaml @@ -42,3 +42,7 @@ ausf: filter: "" display: "SUPI Range" comment: "" + - operation: "reload" + object: "" + display: "Reload Config" + params: diff --git a/config/mml/system/smf_sys_mml_config.yaml b/config/mml/system/smf_sys_mml_config.yaml index 45b6aaac..1dc2fbec 100644 --- a/config/mml/system/smf_sys_mml_config.yaml +++ b/config/mml/system/smf_sys_mml_config.yaml @@ -359,4 +359,8 @@ smf: optional: "false" filter: "" display: "CMD" - comment: "" \ No newline at end of file + comment: "" + - operation: "reload" + object: "" + display: "Reload Config" + params: \ No newline at end of file diff --git a/config/mml/system/udm_sys_mml_config.yaml b/config/mml/system/udm_sys_mml_config.yaml index a69fe445..82f0cba7 100644 --- a/config/mml/system/udm_sys_mml_config.yaml +++ b/config/mml/system/udm_sys_mml_config.yaml @@ -115,3 +115,7 @@ udm: filter: "" display: "SUPI Range" comment: "" + - operation: "reload" + object: "" + display: "Reload Config" + params: diff --git a/config/mml/system/upf_sys_mml_config.yaml b/config/mml/system/upf_sys_mml_config.yaml index 262e0ac2..203ec868 100644 --- a/config/mml/system/upf_sys_mml_config.yaml +++ b/config/mml/system/upf_sys_mml_config.yaml @@ -235,4 +235,8 @@ upf: optional: "false" filter: "" display: "CMD" - comment: "" \ No newline at end of file + comment: "" + - operation: "reload" + object: "" + display: "Reload Config" + params: \ No newline at end of file diff --git a/features/mml/mml.go b/features/mml/mml.go index 4fd33d25..c49dccc3 100644 --- a/features/mml/mml.go +++ b/features/mml/mml.go @@ -41,10 +41,11 @@ var ( UriOmMmlExt = config.DefaultUriPrefix + "/{managementModule}/{apiVersion}/elementType/OMC/objectType/mml" UriOmMmlInt = config.DefaultUriPrefix + "/omManagement/{apiVersion}/mml/{neType}/{neId}" - CustomUriMML = config.UriPrefix + "/opeartionManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/mml" - CustomUriNeOmMml = config.UriPrefix + "/omManagement/{apiVersion}/mml/{netype}/{neid}" - CustomUriOmMmlExt = config.UriPrefix + "/opeartionManagement/{apiVersion}/elementType/OMC/objectType/mml" - CustomUriOmMmlInt = config.UriPrefix + "/omManagement/{apiVersion}/mml/{neType}/{neId}" + CustomUriMML = config.UriPrefix + "/operationManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/mml" + CustomUriMMLDiscard = config.UriPrefix + "/opeartionManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/mml" + CustomUriNeOmMml = config.UriPrefix + "/omManagement/{apiVersion}/mml/{netype}/{neid}" + CustomUriOmMmlExt = config.UriPrefix + "/opeartionManagement/{apiVersion}/elementType/OMC/objectType/mml" + CustomUriOmMmlInt = config.UriPrefix + "/omManagement/{apiVersion}/mml/{neType}/{neId}" ) func PostMMLToNF(w http.ResponseWriter, r *http.Request) { diff --git a/lib/routes/routes.go b/lib/routes/routes.go index b4bf8c02..8a8edc71 100644 --- a/lib/routes/routes.go +++ b/lib/routes/routes.go @@ -152,6 +152,7 @@ func init() { Register("POST", mml.UriOmMmlExt, mml.PostMMLToOMC, nil) Register("POST", mml.CustomUriMML, mml.PostMMLToNF, nil) + Register("POST", mml.CustomUriMMLDiscard, mml.PostMMLToNF, nil) Register("POST", mml.CustomUriOmMmlExt, mml.PostMMLToOMC, nil) // Northbound Get NRM Register("GET", nbi.GetNRMUri, nbi.NBIGetNRMFromNF, nil)