acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[#240] WebUI changes to apply default value

This commit is contained in:
Sukchan Lee 2019-07-30 20:51:50 +09:00
parent 4f9a2e94fc
commit dac2bd2e4f
7 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hss/hss-fd-path.c
View File

@ -344,6 +344,7 @@ static int hss_s6a_ulr_cb( struct msg **msg, struct avp *avp,
struct avp *avp_access_restriction_data; struct avp *avp_access_restriction_data;
struct avp *avp_subscriber_status, *avp_network_access_mode; struct avp *avp_subscriber_status, *avp_network_access_mode;
struct avp *avp_ambr, *avp_max_bandwidth_ul, *avp_max_bandwidth_dl; struct avp *avp_ambr, *avp_max_bandwidth_ul, *avp_max_bandwidth_dl;
struct avp *avp_rau_tau_timer;
int i; int i;
/* Set the Subscription Data */ /* Set the Subscription Data */
@ -387,20 +388,23 @@ static int hss_s6a_ulr_cb( struct msg **msg, struct avp *avp,
val.u32 = subscription_data.ambr.uplink; val.u32 = subscription_data.ambr.uplink;
ret = fd_msg_avp_setvalue(avp_max_bandwidth_ul, &val); ret = fd_msg_avp_setvalue(avp_max_bandwidth_ul, &val);
ogs_assert(ret == 0); ogs_assert(ret == 0);
ret = fd_msg_avp_add(avp_ambr, MSG_BRW_LAST_CHILD, avp_max_bandwidth_ul); ret = fd_msg_avp_add(
avp_ambr, MSG_BRW_LAST_CHILD, avp_max_bandwidth_ul);
ogs_assert(ret == 0); ogs_assert(ret == 0);
ret = fd_msg_avp_new(s6a_max_bandwidth_dl, 0, &avp_max_bandwidth_dl); ret = fd_msg_avp_new(s6a_max_bandwidth_dl, 0, &avp_max_bandwidth_dl);
ogs_assert(ret == 0); ogs_assert(ret == 0);
val.u32 = subscription_data.ambr.downlink; val.u32 = subscription_data.ambr.downlink;
ret = fd_msg_avp_setvalue(avp_max_bandwidth_dl, &val); ret = fd_msg_avp_setvalue(avp_max_bandwidth_dl, &val);
ogs_assert(ret == 0); ogs_assert(ret == 0);
ret = fd_msg_avp_add(avp_ambr, MSG_BRW_LAST_CHILD, avp_max_bandwidth_dl); ret = fd_msg_avp_add(
avp_ambr, MSG_BRW_LAST_CHILD, avp_max_bandwidth_dl);
ogs_assert(ret == 0); ogs_assert(ret == 0);
ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avp_ambr); ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avp_ambr);
ogs_assert(ret == 0); ogs_assert(ret == 0);
/* Set the Subscribed RAU TAU Timer */ /* Set the Subscribed RAU TAU Timer */
ret = fd_msg_avp_new(s6a_subscribed_rau_tau_timer, 0, &avp_rau_tau_timer); ret = fd_msg_avp_new(
s6a_subscribed_rau_tau_timer, 0, &avp_rau_tau_timer);
ogs_assert(ret == 0); ogs_assert(ret == 0);
val.i32 = subscription_data.subscribed_rau_tau_timer * 60; /* seconds */ val.i32 = subscription_data.subscribed_rau_tau_timer * 60; /* seconds */
ret = fd_msg_avp_setvalue(avp_rau_tau_timer, &val); ret = fd_msg_avp_setvalue(avp_rau_tau_timer, &val);

6
src/mme/mme-fd-path.c
View File

@ -818,7 +818,8 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg)
pdn->qos.arp.pre_emption_capability = pdn->qos.arp.pre_emption_capability =
hdr->avp_value->i32; hdr->avp_value->i32;
} else { } else {
pdn->qos.arp.pre_emption_capability = 1; /* disabled */ pdn->qos.arp.pre_emption_capability =
PDN_PRE_EMPTION_CAPABILITY_DISABLED;
} }
ret = fd_avp_search_avp(avpch4, ret = fd_avp_search_avp(avpch4,
@ -830,7 +831,8 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg)
pdn->qos.arp.pre_emption_vulnerability = pdn->qos.arp.pre_emption_vulnerability =
hdr->avp_value->i32; hdr->avp_value->i32;
} else { } else {
pdn->qos.arp.pre_emption_vulnerability = 0; /* enabled */ pdn->qos.arp.pre_emption_vulnerability =
PDN_PRE_EMPTION_VULNERABILITY_ENABLED;
} }
} else { } else {

4
webui/server/models/subscriber.js
View File

@ -50,7 +50,7 @@ const Subscriber = new Schema({
$type: Number, default: 1 // Capability Disabled $type: Number, default: 1 // Capability Disabled
}, },
pre_emption_vulnerability: { pre_emption_vulnerability: {
$type : Number, default: 1 // Vulnerability Disabled $type : Number, default: 0 // Vulnerability Disabled
} }
} }
}, },
@ -75,7 +75,7 @@ const Subscriber = new Schema({
$type: Number, default: 1 // Capability Disabled $type: Number, default: 1 // Capability Disabled
}, },
pre_emption_vulnerability: { pre_emption_vulnerability: {
$type : Number, default: 1 // Vulnerability Disabled $type : Number, default: 0 // Vulnerability Disabled
} }
}, },
mbr: { mbr: {

4
webui/src/components/Profile/Edit.js
View File

@ -121,7 +121,7 @@ const schema = {
"title": "Vulnerability*", "title": "Vulnerability*",
"enum": [1, 0], "enum": [1, 0],
"enumNames": ["Disabled", "Enabled"], "enumNames": ["Disabled", "Enabled"],
"default": 1, "default": 0,
}, },
} }
} }
@ -234,7 +234,7 @@ const schema = {
"maximum": 1, "maximum": 1,
"enum": [1, 0], "enum": [1, 0],
"enumNames": ["Disabled", "Enabled"], "enumNames": ["Disabled", "Enabled"],
"default": 1, "default": 0,
}, },
} }
}, },

4
webui/src/components/Subscriber/Edit.js
View File

@ -127,7 +127,7 @@ const schema = {
"title": "Vulnerability*", "title": "Vulnerability*",
"enum": [1, 0], "enum": [1, 0],
"enumNames": ["Disabled", "Enabled"], "enumNames": ["Disabled", "Enabled"],
"default": 1, "default": 0,
}, },
} }
} }
@ -240,7 +240,7 @@ const schema = {
"maximum": 1, "maximum": 1,
"enum": [1, 0], "enum": [1, 0],
"enumNames": ["Disabled", "Enabled"], "enumNames": ["Disabled", "Enabled"],
"default": 1, "default": 0,
}, },
} }
}, },

2
webui/src/containers/Profile/Document.js
View File

@ -31,7 +31,7 @@ const formData = {
"arp": { "arp": {
"priority_level": 8, "priority_level": 8,
"pre_emption_capability": 1, "pre_emption_capability": 1,
"pre_emption_vulnerability": 1 "pre_emption_vulnerability": 0
} }
}, },
} }

4
webui/src/containers/Subscriber/Document.js
View File

@ -32,7 +32,7 @@ const formData = {
"arp": { "arp": {
"priority_level": 8, "priority_level": 8,
"pre_emption_capability": 1, "pre_emption_capability": 1,
"pre_emption_vulnerability": 1 "pre_emption_vulnerability": 0
} }
}, },
} }
@ -260,4 +260,4 @@ Document = connect(
}) })
)(Document); )(Document);
export default Document; export default Document;