sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[PCF] Always expose SNSSAI label (#2320)

This commit is contained in:
Sukchan Lee 2023-05-25 21:15:01 +09:00
parent 99f7da154e
commit 34f3faba47
4 changed files with 39 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/pcf/metrics.c
View File

@ -63,87 +63,6 @@ int pcf_metrics_free_inst_global(void)
return pcf_metrics_free_inst(pcf_metrics_inst_global, _PCF_METR_GLOB_MAX);
}
/* BY_PLMN */
const char *labels_plmn[] = {
"plmnid"
};
#define PCF_METR_BY_PLMN_CTR_ENTRY(_id, _name, _desc) \
[_id] = { \
.type = OGS_METRICS_METRIC_TYPE_COUNTER, \
.name = _name, \
.description = _desc, \
.num_labels = OGS_ARRAY_SIZE(labels_plmn), \
.labels = labels_plmn, \
},
ogs_metrics_spec_t *pcf_metrics_spec_by_plmn[_PCF_METR_BY_PLMN_MAX];
ogs_hash_t *metrics_hash_by_plmn = NULL; /* hash table for PLMN label */
pcf_metrics_spec_def_t pcf_metrics_spec_def_by_plmn[_PCF_METR_BY_PLMN_MAX] = {
/* Counters: */
PCF_METR_BY_PLMN_CTR_ENTRY(
PCF_METR_CTR_PA_POLICYAMASSOREQ,
"fivegs_pcffunction_pa_policyamassoreq",
"Number of AM policy association requests")
PCF_METR_BY_PLMN_CTR_ENTRY(
PCF_METR_CTR_PA_POLICYAMASSOSUCC,
"fivegs_pcffunction_pa_policyamassosucc",
"Number of successful AM policy associations")
};
void pcf_metrics_init_by_plmn(void);
int pcf_metrics_free_inst_by_plmn(ogs_metrics_inst_t **inst);
typedef struct pcf_metric_key_by_plmn_s {
ogs_plmn_id_t plmn_id;
pcf_metric_type_by_plmn_t t;
} pcf_metric_key_by_plmn_t;
void pcf_metrics_init_by_plmn(void)
{
metrics_hash_by_plmn = ogs_hash_make();
ogs_assert(metrics_hash_by_plmn);
}
void pcf_metrics_inst_by_plmn_add(ogs_plmn_id_t *plmn,
pcf_metric_type_by_plmn_t t, int val)
{
ogs_metrics_inst_t *metrics = NULL;
pcf_metric_key_by_plmn_t *plmn_key;
plmn_key = ogs_calloc(1, sizeof(*plmn_key));
ogs_assert(plmn_key);
if (plmn) {
plmn_key->plmn_id = *plmn;
}
plmn_key->t = t;
metrics = ogs_hash_get(metrics_hash_by_plmn,
plmn_key, sizeof(*plmn_key));
if (!metrics) {
char plmn_id[OGS_PLMNIDSTRLEN] = "";
if (plmn) {
ogs_plmn_id_to_string(plmn, plmn_id);
}
metrics = ogs_metrics_inst_new(pcf_metrics_spec_by_plmn[t],
pcf_metrics_spec_def_by_plmn->num_labels,
(const char *[]){ plmn_id });
ogs_assert(metrics);
ogs_hash_set(metrics_hash_by_plmn,
plmn_key, sizeof(*plmn_key), metrics);
} else {
ogs_free(plmn_key);
}
ogs_metrics_inst_add(metrics, val);
}
int pcf_metrics_free_inst_by_plmn(ogs_metrics_inst_t **inst)
{
return pcf_metrics_free_inst(inst, _PCF_METR_BY_PLMN_MAX);
}
/* BY_SLICE */
const char *labels_slice[] = {
"plmnid",
@ -170,6 +89,14 @@ ogs_metrics_spec_t *pcf_metrics_spec_by_slice[_PCF_METR_BY_SLICE_MAX];
ogs_hash_t *metrics_hash_by_slice = NULL; /* hash table for SLICE labels */
pcf_metrics_spec_def_t pcf_metrics_spec_def_by_slice[_PCF_METR_BY_SLICE_MAX] = {
/* Counters: */
PCF_METR_BY_SLICE_CTR_ENTRY(
PCF_METR_CTR_PA_POLICYAMASSOREQ,
"fivegs_pcffunction_pa_policyamassoreq",
"Number of AM policy association requests")
PCF_METR_BY_SLICE_CTR_ENTRY(
PCF_METR_CTR_PA_POLICYAMASSOSUCC,
"fivegs_pcffunction_pa_policyamassosucc",
"Number of successful AM policy associations")
PCF_METR_BY_SLICE_CTR_ENTRY(
PCF_METR_CTR_PA_POLICYSMASSOREQ,
"fivegs_pcffunction_pa_policysmassoreq",
@ -266,13 +193,10 @@ void pcf_metrics_init(void)
pcf_metrics_init_spec(ctx, pcf_metrics_spec_global,
pcf_metrics_spec_def_global, _PCF_METR_GLOB_MAX);
pcf_metrics_init_spec(ctx, pcf_metrics_spec_by_plmn,
pcf_metrics_spec_def_by_plmn, _PCF_METR_BY_PLMN_MAX);
pcf_metrics_init_spec(ctx, pcf_metrics_spec_by_slice,
pcf_metrics_spec_def_by_slice, _PCF_METR_BY_SLICE_MAX);
pcf_metrics_init_inst_global();
pcf_metrics_init_by_plmn();
pcf_metrics_init_by_slice();
}
@ -295,21 +219,6 @@ void pcf_metrics_final(void)
}
ogs_hash_destroy(metrics_hash_by_slice);
}
if (metrics_hash_by_plmn) {
for (hi = ogs_hash_first(metrics_hash_by_plmn); hi; hi = ogs_hash_next(hi)) {
pcf_metric_key_by_plmn_t *key =
(pcf_metric_key_by_plmn_t *)ogs_hash_this_key(hi);
//void *val = ogs_hash_this_val(hi);
ogs_hash_set(metrics_hash_by_plmn, key, sizeof(*key), NULL);
ogs_free(key);
/* don't free val (metric ifself) -
* it will be free'd by ogs_metrics_context_final() */
//ogs_free(val);
}
ogs_hash_destroy(metrics_hash_by_plmn);
}
ogs_metrics_context_final();
}

14
src/pcf/metrics.h
View File

@ -24,19 +24,11 @@ static inline void pcf_metrics_inst_global_inc(pcf_metric_type_global_t t)
static inline void pcf_metrics_inst_global_dec(pcf_metric_type_global_t t)
{ ogs_metrics_inst_dec(pcf_metrics_inst_global[t]); }
/* BY_PLMN */
typedef enum pcf_metric_type_by_plmn_s {
PCF_METR_CTR_PA_POLICYAMASSOREQ = 0,
PCF_METR_CTR_PA_POLICYAMASSOSUCC,
_PCF_METR_BY_PLMN_MAX,
} pcf_metric_type_by_plmn_t;
void pcf_metrics_inst_by_plmn_add(
ogs_plmn_id_t *plmn, pcf_metric_type_by_plmn_t t, int val);
/* BY_SLICE */
typedef enum pcf_metric_type_by_slice_s {
PCF_METR_CTR_PA_POLICYSMASSOREQ = 0,
PCF_METR_CTR_PA_POLICYAMASSOREQ = 0,
PCF_METR_CTR_PA_POLICYAMASSOSUCC,
PCF_METR_CTR_PA_POLICYSMASSOREQ,
PCF_METR_CTR_PA_POLICYSMASSOSUCC,
PCF_METR_GAUGE_PA_SESSIONNBR,
_PCF_METR_BY_SLICE_MAX,

20
src/pcf/npcf-handler.c
View File

@ -29,6 +29,7 @@ bool pcf_npcf_am_policy_contrtol_handle_create(pcf_ue_t *pcf_ue,
OpenAPI_policy_association_request_t *PolicyAssociationRequest = NULL;
OpenAPI_guami_t *Guami = NULL;
OpenAPI_lnode_t *node = NULL;
uint64_t supported_features = 0;
@ -36,8 +37,6 @@ bool pcf_npcf_am_policy_contrtol_handle_create(pcf_ue_t *pcf_ue,
OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
ogs_sockaddr_t *addr = NULL;
pcf_metrics_inst_by_plmn_add(NULL, PCF_METR_CTR_PA_POLICYAMASSOREQ, 1);
ogs_assert(pcf_ue);
ogs_assert(stream);
ogs_assert(message);
@ -141,8 +140,19 @@ bool pcf_npcf_am_policy_contrtol_handle_create(pcf_ue_t *pcf_ue,
ogs_sbi_parse_guami(&pcf_ue->guami, PolicyAssociationRequest->guami);
}
pcf_metrics_inst_by_plmn_add(&pcf_ue->guami.plmn_id,
PCF_METR_CTR_PA_POLICYAMASSOREQ, 1);
OpenAPI_list_for_each(PolicyAssociationRequest->allowed_snssais, node) {
struct OpenAPI_snssai_s *Snssai = node->data;
if (Snssai) {
ogs_s_nssai_t s_nssai;
s_nssai.sst = Snssai->sst;
s_nssai.sd = ogs_s_nssai_sd_from_string(Snssai->sd);
pcf_metrics_inst_by_slice_add(&pcf_ue->guami.plmn_id,
&s_nssai, PCF_METR_CTR_PA_POLICYAMASSOREQ, 1);
} else {
ogs_error("[%s] No Snssai", pcf_ue->supi);
}
}
if (PolicyAssociationRequest->rat_type)
pcf_ue->rat_type = PolicyAssociationRequest->rat_type;
@ -180,8 +190,6 @@ bool pcf_npcf_smpolicycontrol_handle_create(pcf_sess_t *sess,
OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
ogs_sockaddr_t *addr = NULL;
pcf_metrics_inst_by_slice_add(NULL, NULL, PCF_METR_CTR_PA_POLICYSMASSOREQ, 1);
ogs_assert(sess);
pcf_ue = sess->pcf_ue;
ogs_assert(stream);

16
src/pcf/nudr-handler.c
View File

@ -48,6 +48,7 @@ bool pcf_nudr_dr_handle_query_am_data(
OpenAPI_policy_association_t PolicyAssociation;
OpenAPI_ambr_t UeAmbr;
OpenAPI_list_t *TriggerList = NULL;
OpenAPI_lnode_t *node = NULL;
if (!recvmsg->AmPolicyData) {
strerror = ogs_msprintf("[%s] No AmPolicyData", pcf_ue->supi);
@ -147,8 +148,19 @@ bool pcf_nudr_dr_handle_query_am_data(
ogs_subscription_data_free(&subscription_data);
pcf_metrics_inst_by_plmn_add(&pcf_ue->guami.plmn_id,
PCF_METR_CTR_PA_POLICYAMASSOSUCC, 1);
OpenAPI_list_for_each(PolicyAssociation.request->allowed_snssais, node) {
struct OpenAPI_snssai_s *Snssai = node->data;
if (Snssai) {
ogs_s_nssai_t s_nssai;
s_nssai.sst = Snssai->sst;
s_nssai.sd = ogs_s_nssai_sd_from_string(Snssai->sd);
pcf_metrics_inst_by_slice_add(&pcf_ue->guami.plmn_id,
&s_nssai, PCF_METR_CTR_PA_POLICYAMASSOSUCC, 1);
} else {
ogs_error("[%s] No Snssai", pcf_ue->supi);
}
}
return true;