Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support to modify a subscriber. #9

Merged
merged 1 commit into from
Aug 2, 2021
Merged

Support to modify a subscriber. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions backend/WebUI/api_webui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ func GetSubscriberByID(c *gin.Context) {
smfSelDataInterface := MongoDBLibrary.RestfulAPIGetOne(smfSelDataColl, filter)
amPolicyDataInterface := MongoDBLibrary.RestfulAPIGetOne(amPolicyDataColl, filterUeIdOnly)
smPolicyDataInterface := MongoDBLibrary.RestfulAPIGetOne(smPolicyDataColl, filterUeIdOnly)
flowRuleDataInterface := MongoDBLibrary.RestfulAPIGetMany(flowRuleDataColl, filter)

var authSubsData models.AuthenticationSubscription
json.Unmarshal(mapToByte(authSubsDataInterface), &authSubsData)
Expand All @@ -315,6 +316,8 @@ func GetSubscriberByID(c *gin.Context) {
json.Unmarshal(mapToByte(amPolicyDataInterface), &amPolicyData)
var smPolicyData models.SmPolicyData
json.Unmarshal(mapToByte(smPolicyDataInterface), &smPolicyData)
var flowRules []FlowRule
json.Unmarshal(sliceToByte(flowRuleDataInterface), &flowRules)

subsData = SubsData{
PlmnID: servingPlmnId,
Expand All @@ -325,6 +328,7 @@ func GetSubscriberByID(c *gin.Context) {
SmfSelectionSubscriptionData: smfSelData,
AmPolicyData: amPolicyData,
SmPolicyData: smPolicyData,
FlowRules: flowRules,
}

c.JSON(http.StatusOK, subsData)
Expand Down Expand Up @@ -427,6 +431,17 @@ func PutSubscriberByID(c *gin.Context) {
smPolicyDataBsonM := toBsonM(subsData.SmPolicyData)
smPolicyDataBsonM["ueId"] = ueId

flowRulesBsonA := make([]interface{}, 0, len(subsData.FlowRules))
for _, flowRule := range subsData.FlowRules {
flowRuleBsonM := toBsonM(flowRule)
flowRuleBsonM["ueId"] = ueId
flowRuleBsonM["servingPlmnId"] = servingPlmnId
flowRulesBsonA = append(flowRulesBsonA, flowRuleBsonM)
}
// Replace all data with new one
MongoDBLibrary.RestfulAPIDeleteMany(flowRuleDataColl, filter)
MongoDBLibrary.RestfulAPIPostMany(flowRuleDataColl, filter, flowRulesBsonA)

MongoDBLibrary.RestfulAPIPutOne(authSubsDataColl, filterUeIdOnly, authSubsBsonM)
MongoDBLibrary.RestfulAPIPutOne(amDataColl, filter, amDataBsonM)
MongoDBLibrary.RestfulAPIPutOne(smfSelDataColl, filter, smfSelSubsBsonM)
Expand Down
13 changes: 8 additions & 5 deletions frontend/src/pages/Subscribers/SubscriberOverview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,17 @@ class SubscriberOverview extends Component {
// }

/**
* @param subscriber {Subscriber}
* @param subscriberData
*/
async updateSubscriber(subscriber) {
const result = await ApiHelper.updateSubscriber(subscriber.id, subscriber.plmn);
async updateSubscriber(subscriberData) {
this.setState({ subscriberModalOpen: false });

const result = await ApiHelper.updateSubscriber(subscriberData);

if (!result) {
alert("Error updating subscriber: " + subscriber.id);
alert("Error updating subscriber: " + subscriberData["ueId"]);
}
ApiHelper.fetchSubscribers().then();
}

/**
Expand Down Expand Up @@ -107,7 +110,7 @@ class SubscriberOverview extends Component {
<td style={{ textAlign: 'center' }}>
<Button variant="danger" onClick={this.deleteSubscriber.bind(this, subscriber)}>Delete</Button>
&nbsp;&nbsp;&nbsp;&nbsp;
<Button variant="info" onClick={this.openEditSubscriber.bind(this)}>Modify</Button>
<Button variant="info" onClick={this.openEditSubscriber.bind(this, subscriber.id, subscriber.plmn)}>Modify</Button>
</td>
</tr>
))}
Expand Down
66 changes: 65 additions & 1 deletion frontend/src/pages/Subscribers/components/SubscriberModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,65 @@ function flowRulesFromSliceConfiguration(sliceConfigurations) {
return flowRules
}

function sliceConfigurationsFromSubscriber(subscriber) {
const defaultSingleNssais = subscriber["AccessAndMobilitySubscriptionData"]["nssai"]["defaultSingleNssais"] ? subscriber["AccessAndMobilitySubscriptionData"]["nssai"]["defaultSingleNssais"].map(nssai => {
return {
snssai: {
sst: nssai.sst,
sd: nssai.sd,
isDefault: true
}
}
}) : [];
const singleNssais = subscriber["AccessAndMobilitySubscriptionData"]["nssai"]["singleNssais"] ? subscriber["AccessAndMobilitySubscriptionData"]["nssai"]["singleNssais"].map(nssai => {
return {
snssai: {
sst: nssai.sst,
sd: nssai.sd,
isDefault: false
}
}
}) : [];

let sliceConfigurations = [ // merge
...defaultSingleNssais,
...singleNssais
];

const sessionManagementSubscriptionData = subscriber["SessionManagementSubscriptionData"];

sliceConfigurations.forEach(sliceConf => {
const dnnConfigs = sessionManagementSubscriptionData.find(data => data.singleNssai.sst === sliceConf.snssai.sst && data.singleNssai.sd === sliceConf.snssai.sd).dnnConfigurations;
sliceConf.dnnConfigurations = Object.keys(dnnConfigs).map(dnn => {
let flowRules = [];
const flowRulesData = subscriber["FlowRules"];
if(flowRulesData && flowRulesData.length !== 0) {
flowRules = flowRulesData
.filter(rule => rule.snssai === snssaiToString(sliceConf.snssai) && dnn === rule.dnn)
.map(rule => {
return {
filter: rule.filter,
"5qi": rule["5qi"],
gbrUL: rule.gbrUL,
gbrDL: rule.gbrDL,
mbrUL: rule.mbrUL,
mbrDL: rule.mbrDL
}
})
}
return {
dnn: dnn,
uplinkAmbr: dnnConfigs[dnn].sessionAmbr.uplink,
downlinkAmbr: dnnConfigs[dnn].sessionAmbr.downlink,
"5qi": dnnConfigs[dnn]["5gQosProfile"]["5qi"],
flowRules: flowRules
};
});
});

return sliceConfigurations;
}

class SubscriberModal extends Component {
static propTypes = {
open: PropTypes.bool.isRequired,
Expand Down Expand Up @@ -331,6 +390,7 @@ class SubscriberModal extends Component {
OPOPcSelect: isOp ? "OP" : "OPc",
OPOPc: isOp ? subscriber['AuthenticationSubscription']["milenage"]["op"]["opValue"] :
subscriber['AuthenticationSubscription']["opc"]["opcValue"],
sliceConfigurations: sliceConfigurationsFromSubscriber(subscriber),
};

this.updateFormData(formData).then();
Expand Down Expand Up @@ -455,7 +515,11 @@ class SubscriberModal extends Component {
"FlowRules": flowRulesFromSliceConfiguration(formData["sliceConfigurations"])
};

this.props.onSubmit(subscriberData);
if(this.state.editMode) {
this.props.onModify(subscriberData);
} else {
this.props.onSubmit(subscriberData);
}
}

render() {
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/util/ApiHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ class ApiHelper {

static async updateSubscriber(subscriberData) {
try {
let response = await Http.patch(
let response = await Http.put(
`subscriber/${subscriberData["ueId"]}/${subscriberData["plmnID"]}`, subscriberData);
if (response.status === 201)
if (response.status === 204)
return true;
} catch (error) {
console.error(error);
Expand Down