Skip to content

Commit

Permalink
Fixed some bug in policy page.
Browse files Browse the repository at this point in the history 
1) Rule uuid was getting change in each put fixed it.
2) Delete with the row was not working - fixed it.
3) When User Enter as single value for network or policy they where not sent
with current domain and current project - Fixed it.
4) error text for cider is changed "Enter valid Subnet/Mask".
5) In rule Port validation is handled.
6) Added sort code for grid

Change-Id: I629d02c0864a616ff4f701383a28ea4925289aea
Related-Bug: #1537607
  • Loading branch information
@balamurugang
balamurugang committed Feb 1, 2016
1 parent c38f4b3 commit f12056a
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 10 deletions.
30 changes: 27 additions & 3 deletions webroot/config/networking/policy/ui/js/models/policyModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ define([
policeyRuleLen = policeyRule.length;
for (var i = 0; i < policeyRuleLen; i++){
newPoliceyRule[i] = {};
var ruleUuid = policeyRule[i].rule_uuid();
if (ruleUuid != '') {
newPoliceyRule[i].rule_uuid = ruleUuid;
}
newPoliceyRule[i].action_list =
policeyRule[i].action_list();
newPoliceyRule[i].action_list.simple_action =
Expand All @@ -161,8 +165,9 @@ define([
var desArr = policeyRule[i].dst_address().split("~");
//var desArr = policeyRule[i].dst_customValue().value.split("~");
if (desArr.length == 2 && desArr[1] !== 'subnet') {
var remoteAddrArr = desArr[0].split(':');
newPoliceyRule[i].dst_addresses[0][desArr[1]] = desArr[0];
newPoliceyRule[i].dst_addresses[0][desArr[1]] =
self.getPostAddressFormat(desArr[0], selectedDomain,
selectedProject);
} else {
newPoliceyRule[i].dst_addresses[0]["subnet"] = {};
var subnet = desArr[0].split("/");
Expand All @@ -180,7 +185,9 @@ define([
var srcArr = policeyRule[i].src_address().split("~");
//var srcArr = policeyRule[i].src_customValue().value.split("~");
if (srcArr.length == 2 && srcArr[1] != 'subnet') {
newPoliceyRule[i].src_addresses[0][srcArr[1]] = srcArr[0];
newPoliceyRule[i].src_addresses[0][srcArr[1]] =
self.getPostAddressFormat(srcArr[0], selectedDomain,
selectedProject);
} else {
newPoliceyRule[i].src_addresses[0]["subnet"] = {};
var subnet = srcArr[0].split("/");
Expand Down Expand Up @@ -299,6 +306,23 @@ define([
}
return returnFlag;
},
getPostAddressFormat: function(arr, selectedDomain, selectedProject) {
var array = arr.split(":");
var returnval = null;
if (array.length == 1) {
if (String(array[0]).toLowerCase() != "any" &&
String(array[0]).toLowerCase() != "local") {
returnval = selectedDomain + ":" +
selectedProject + ":" +
array[0];
} else {
returnval = array[0].toLowerCase();
}
} else if(array.length == 3) {
returnval = arr;
}
return returnval;
},
deletePolicy: function(selectedGridData, callbackObj) {
var ajaxConfig = {}, returnFlag = false,
delDataID = [];
Expand Down
43 changes: 41 additions & 2 deletions webroot/config/networking/policy/ui/js/models/ruleModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ define([
'simple_action': 'pass',
'service_instance':'',
'mirror':'',
'rule_uuid':'',
'analyzer_name':'',
'src_customValue':{
'text': 'ANY (All Networks in Current Project)',
Expand Down Expand Up @@ -235,8 +236,47 @@ define([
if(dscProt.toUpperCase() != "ANY") {
return "Only 'ANY' protocol allowed while mirroring services."
}
},
'src_ports_text' : function(val, attr, data) {
var result = self.validatePort(val);
if (result != "") {
return result;
}
},
'dst_ports_text' : function(val, attr, data) {
var result = self.validatePort(val);
if (result != "") {
return result;
}
}
}
},
validatePort: function(port) {
if (_.isString(port)) {
if (port.toUpperCase() != "ANY") {
var portArr = port.split(",");
for (var i = 0; i < portArr.length; i++) {
var portSplit = portArr[i].split("-");
if (portSplit.length > 2) {
return "Invalid Port Data";
}
for (var j = 0; j < portSplit.length; j++) {
if (portSplit[j] == "") {
return "Port has to be a number";
}
if (!isNumber(portSplit[j])) {
return "Port has to be a number";
}
if (portSplit[j] % 1 != 0) {
return "Port has to be a number";
}
}
}
}
} else if (!isNumber(port)) {
return "Port has to be a number";
}
return "";
},
isBothSrcDscCIDR: function(data) {
var msg = "";
Expand Down Expand Up @@ -329,8 +369,7 @@ define([
if (group == 'subnet') {
if (!isValidIP(value) ||
value.split("/").length != 2) {
return "Enter a valid CIDR in \
xxx.xxx.xxx.xxx/xx format for "+srcOrDesString;
return "Enter valid Subnet/Mask";
}
}
var addValue = value.split(":");
Expand Down
2 changes: 1 addition & 1 deletion webroot/config/networking/policy/ui/js/views/policyFormatters.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ define([
}
if (isSet(rule["action_list"]) && isSet(rule["action_list"]["log"]) &&
true === rule["action_list"]["log"])
rule_display += policyRuleFormat(", log ");
rule_display += policyRuleFormat(" log ");

if (isSet(rule["application"]) &&
rule["application"].length > 0) {
Expand Down
17 changes: 13 additions & 4 deletions webroot/config/networking/policy/ui/js/views/policyGridView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ define([
policyCreateEditView.model = policyModel;
policyCreateEditView.renderDeletePolicy({
"title": ctwl.TITLE_REMOVE,
selectedGridData: [dataItem.name],
selectedGridData: [dataItem],
callback: function() {
var dataView =
$(gridElId).data("contrailGrid")._dataView;
Expand Down Expand Up @@ -218,7 +218,10 @@ define([
label:'Display Name',
templateGenerator: 'TextGenerator',
templateGeneratorConfig:{
formatter: "PolicyNameFormatter"
formatter: "PolicyNameFormatter",
sortable: {
sortBy: 'formattedValue'
}
}
}, {
keyClass:'span3',
Expand All @@ -230,7 +233,10 @@ define([
label:'Connected networks',
templateGenerator: 'TextGenerator',
templateGeneratorConfig:{
formatter: "AssociatedNetworksFormatter"
formatter: "AssociatedNetworksFormatter",
sortable: {
sortBy: 'formattedValue'
}
}
}, {
keyClass:'span3',
Expand All @@ -239,7 +245,10 @@ define([
key: 'network_policy_entries',
templateGenerator: 'TextGenerator',
templateGeneratorConfig:{
formatter: "PolicyRulesExpandFormatter"
formatter: "PolicyRulesExpandFormatter",
sortable: {
sortBy: 'formattedValue'
}
}
}]
}]
Expand Down

0 comments on commit f12056a

Please sign in to comment.