openstack/horizon
Code Issues Proposed changes

Merge "Fix for few small mistakes with QoS"

Browse Source
This commit is contained in:
Zuul 2025-05-06 14:12:47 +00:00 committed by Gerrit Code Review
commit 231c874b18
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/static/app/core/network_qos/actions/edit-rule.action.service.js
View File

@ -52,17 +52,17 @@
type: 'object',
properties: {
qospolicy: {
title: gettext('QoSPolicyId'),
title: gettext('QoS Policy ID'),
type: 'string',
readOnly: true
},
qospolicyname: {
title: gettext('QoSPolicyName'),
title: gettext('QoS Policy Name'),
type: 'string',
readOnly: true
},
ruleid: {
title: gettext('RuleId'),
title: gettext('Rule ID'),
type: 'string'
}
},
@ -163,7 +163,7 @@
function onEditRule(response) {
var qosrule = response.data;
toast.add('success', interpolate(
gettext('Qos Policy Rule %s was successfully updated.'),[qosrule.id]));
gettext('QoS Policy Rule %s was successfully updated.'),[qosrule.id]));
return actionResultService.getActionResult()
.result;

8
openstack_dashboard/static/app/core/network_qos/actions/edit-rule.action.service.spec.js
View File

@ -190,7 +190,7 @@
expect(neutronAPI.updateDSCPMarkingRule).toHaveBeenCalledWith(
qosPolicy.id, [dscpRule.model.ruleid], data);
expect(toast.add).toHaveBeenCalledWith(
'success', 'Qos Policy Rule 2 was successfully updated.'
'success', 'QoS Policy Rule 2 was successfully updated.'
);
});
@ -206,7 +206,7 @@
expect(neutronAPI.updateBandwidthRule).toHaveBeenCalledWith(
qosPolicy.id, [bwdLmtRule.model.ruleid], data);
expect(toast.add).toHaveBeenCalledWith(
'success', 'Qos Policy Rule 2 was successfully updated.'
'success', 'QoS Policy Rule 2 was successfully updated.'
);
});
@ -221,7 +221,7 @@
expect(neutronAPI.updateMinimumBandwidthRule).toHaveBeenCalledWith(
qosPolicy.id, [minBwdRule.model.ruleid], data);
expect(toast.add).toHaveBeenCalledWith(
'success', 'Qos Policy Rule 2 was successfully updated.'
'success', 'QoS Policy Rule 2 was successfully updated.'
);
});
@ -236,7 +236,7 @@
expect(neutronAPI.updateMinimumPacketRateRule).toHaveBeenCalledWith(
qosPolicy.id, [minPckRtRule.model.ruleid], data);
expect(toast.add).toHaveBeenCalledWith(
'success', 'Qos Policy Rule 2 was successfully updated.'
'success', 'QoS Policy Rule 2 was successfully updated.'
);
});

24
openstack_dashboard/static/app/core/openstack-service-api/neutron.service.js
View File

@ -402,7 +402,7 @@
return response;
})
.catch(function onError() {
toastService.add('error', gettext('Unable to retrieve the qos policies.'));
toastService.add('error', gettext('Unable to retrieve the QoS policies.'));
});
}
@ -452,7 +452,7 @@
function deletePolicy(policyId, suppressError) {
var promise = apiService.delete('/api/neutron/qos_policies/' + policyId + '/');
promise = suppressError ? promise : promise.catch(function onError() {
var msg = gettext('Unable to delete qos policy %(id)s');
var msg = gettext('Unable to delete QoS Policy %(id)s');
toastService.add('error', interpolate(msg, { id: policyId }, true));
});
return promise;
@ -501,7 +501,7 @@
return apiService.post('/api/neutron/qos/policies/' + policyId +
'/bandwidth_limit_rules/', ruleId)
.catch(function onError() {
toastService.add('error', gettext('Unable to add the bandwidthrule .'));
toastService.add('error', gettext('Unable to add the bandwidth rule.'));
});
}
@ -538,7 +538,7 @@
return apiService.post('/api/neutron/qos/policies/' + policyId +
'/dscp_marking_rules/', ruleId)
.catch(function onError() {
toastService.add('error', gettext('Unable to add the dscp_marking_rule .'));
toastService.add('error', gettext('Unable to add the DSCP marking rule.'));
});
}
@ -580,7 +580,7 @@
return apiService.post('/api/neutron/qos/policies/' + policyId +
'/minimum_bandwidth_rules/', ruleId)
.catch(function onError() {
toastService.add('error', gettext('Unable to add the minimum_bandwidth_rule .'));
toastService.add('error', gettext('Unable to add the minimum bandwidth rule.'));
});
}
@ -622,7 +622,7 @@
return apiService.post('/api/neutron/qos/policies/' + policyId +
'/minimum_packet_rate_rules/', ruleId)
.catch(function onError() {
toastService.add('error', gettext('Unable to add the minimum_packet_rate_rule.'));
toastService.add('error', gettext('Unable to add the minimum packet rate rule.'));
});
}
@ -646,7 +646,7 @@
return apiService.patch('/api/neutron/qos/policies/' + policyId +
'/bandwidth_limit_rules/' + ruleId , updateRuleId)
.catch(function onError() {
toastService.add('error', gettext('Unable to update the bandwidthrule.'));
toastService.add('error', gettext('Unable to update the bandwidth rule.'));
});
}
@ -670,7 +670,7 @@
return apiService.patch('/api/neutron/qos/policies/' + policyId +
'/dscp_marking_rules/' + ruleId , updateRuleId)
.catch(function onError() {
toastService.add('error', gettext('Unable to update the dscp marking rule.'));
toastService.add('error', gettext('Unable to update the DSCP marking rule.'));
});
}
@ -737,7 +737,7 @@
function deleteBandwidthLimitRule(policyId, deleteRuleId) {
return apiService.delete('/api/neutron/qos/policies/' + policyId +
'/bandwidth_limit_rules/' + deleteRuleId).catch(function onError() {
toastService.add('error', gettext('Unable to delete the bandwidth_limit_rule.'));
toastService.add('error', gettext('Unable to delete the bandwidth limit rule.'));
});
}
@ -755,7 +755,7 @@
function deleteDSCPMarkingRule(policyId, deleteRuleId) {
return apiService.delete('/api/neutron/qos/policies/' + policyId +
'/dscp_marking_rules/' + deleteRuleId).catch(function onError() {
toastService.add('error', gettext('Unable to delete the dscp_marking_rule.'));
toastService.add('error', gettext('Unable to delete the DSCP marking rule.'));
});
}
@ -773,7 +773,7 @@
function deleteMinimumBandwidthRule(policyId, deleteRuleId) {
return apiService.delete('/api/neutron/qos/policies/' + policyId +
'/minimum_bandwidth_rules/' + deleteRuleId).catch(function onError() {
toastService.add('error', gettext('Unable to delete the minimum_bandwidth_rule .'));
toastService.add('error', gettext('Unable to delete the minimum bandwidth rule.'));
});
}
@ -791,7 +791,7 @@
function deleteMinimumPacketRateRule(policyId, deleteRuleId) {
return apiService.delete('/api/neutron/qos/policies/' + policyId +
'/minimum_packet_rate_rules/' + deleteRuleId).catch(function onError() {
toastService.add('error', gettext('Unable to delete the minimum_packet_rate_rule .'));
toastService.add('error', gettext('Unable to delete the minimum packet rate rule.'));
});
}

26
openstack_dashboard/static/app/core/openstack-service-api/neutron.service.spec.js
View File

@ -295,7 +295,7 @@
"method": "get",
"path": "/api/neutron/qos_policies/",
"data": {},
"error": "Unable to retrieve the qos policies."
"error": "Unable to retrieve the QoS policies."
},
{
"func": "getQoSPolicies",
@ -309,7 +309,7 @@
"testInput": [
{"project_id": 1}
],
"error": "Unable to retrieve the qos policies."
"error": "Unable to retrieve the QoS policies."
},
{
"func": "createNetworkQoSPolicy",
@ -325,7 +325,7 @@
"func": "deletePolicy",
"method": "delete",
"path": "/api/neutron/qos_policies/63/",
"error": "Unable to delete qos policy 63",
"error": "Unable to delete QoS Policy 63",
"testInput": [
63
]
@ -335,7 +335,7 @@
"method": "post",
"path": "/api/neutron/qos/policies/63/dscp_marking_rules/",
"data": {"dscp_marking_rule":{"dscp_mark":16}},
"error": "Unable to add the dscp_marking_rule .",
"error": "Unable to add the DSCP marking rule.",
"testInput": [63,
{"dscp_marking_rule":{"dscp_mark": 16}}
]
@ -345,7 +345,7 @@
"method": "post",
"path": "/api/neutron/qos/policies/63/bandwidth_limit_rules/",
"data": {"bandwidth_limit_rule": {"max_kbps": 10000}},
"error": "Unable to add the bandwidthrule .",
"error": "Unable to add the bandwidth rule.",
"testInput": [63,
{"bandwidth_limit_rule": {"max_kbps": 10000}}
]
@ -355,7 +355,7 @@
"method": "post",
"path": "/api/neutron/qos/policies/63/minimum_bandwidth_rules/",
"data": {"minimum_banwdiwth_rule": {"min_kbps": 1000, "direction": "egress"}},
"error": "Unable to add the minimum_bandwidth_rule .",
"error": "Unable to add the minimum bandwidth rule.",
"testInput": [63,
{"minimum_banwdiwth_rule": {"min_kbps": 1000, "direction": "egress"}}
]
@ -365,7 +365,7 @@
"method": "post",
"path": "/api/neutron/qos/policies/63/minimum_packet_rate_rules/",
"data": {"minimum_packet_rate_rule": {"min_kpps": 1000, "direction": "ingress"}},
"error": "Unable to add the minimum_packet_rate_rule.",
"error": "Unable to add the minimum packet rate rule.",
"testInput": [63,
{"minimum_packet_rate_rule": {"min_kpps": 1000, "direction": "ingress"}}
]
@ -375,7 +375,7 @@
"method": "patch",
"path": "/api/neutron/qos/policies/63/dscp_marking_rules/1",
"data": {"dscp_marking_rule":{"dscp_mark":16}},
"error": "Unable to update the dscp marking rule.",
"error": "Unable to update the DSCP marking rule.",
"testInput": [63, 1,
{"dscp_marking_rule":{"dscp_mark": 16}}
]
@ -385,7 +385,7 @@
"method": "patch",
"path": "/api/neutron/qos/policies/63/bandwidth_limit_rules/1",
"data": {"bandwidth_limit_rule": {"max_kbps": "11000"}},
"error": "Unable to update the bandwidthrule.",
"error": "Unable to update the bandwidth rule.",
"testInput": [63, 1,
{"bandwidth_limit_rule": {"max_kbps": "11000"}}
]
@ -414,28 +414,28 @@
"func": "deleteDSCPMarkingRule",
"method": "delete",
"path": "/api/neutron/qos/policies/63/dscp_marking_rules/1",
"error": "Unable to delete the dscp_marking_rule.",
"error": "Unable to delete the DSCP marking rule.",
"testInput": [63, 1]
},
{
"func": "deleteBandwidthLimitRule",
"method": "delete",
"path": "/api/neutron/qos/policies/63/bandwidth_limit_rules/1",
"error": "Unable to delete the bandwidth_limit_rule.",
"error": "Unable to delete the bandwidth limit rule.",
"testInput": [63, 1]
},
{
"func": "deleteMinimumBandwidthRule",
"method": "delete",
"path": "/api/neutron/qos/policies/63/minimum_bandwidth_rules/1",
"error": "Unable to delete the minimum_bandwidth_rule .",
"error": "Unable to delete the minimum bandwidth rule.",
"testInput": [63, 1]
},
{
"func": "deleteMinimumPacketRateRule",
"method": "delete",
"path": "/api/neutron/qos/policies/63/minimum_packet_rate_rules/1",
"error": "Unable to delete the minimum_packet_rate_rule .",
"error": "Unable to delete the minimum packet rate rule.",
"testInput": [63, 1]
}
];