Skip to content

Commit

Permalink
1454086 BUM traffic behavior in VN page.
Browse files Browse the repository at this point in the history
Added a checkbox for updating "flood-unknown-unicast" field inside
virtual-network.

It is added in Advance tab of create and edit popup.

Also shown in expandtion of the grid.

Change-Id: Ib536edf5e4a5346c94057833597eff63d349eab9
Closes-Bug: #1454086
  • Loading branch information
balamurugang committed May 19, 2015
1 parent d46db04 commit ec0aa7d
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
3 changes: 2 additions & 1 deletion webroot/common/api/jsonDiff.helper.js
Expand Up @@ -13,7 +13,8 @@ var configJsonModifyObj = {
'optFields': ['virtual_network_properties',
'network_ipam_refs', 'network_policy_refs',
'route_target_list', 'is_shared',
'router_external', 'id_perms:enable'],
'router_external', 'id_perms:enable',
'flood_unknown_unicast' ],
'mandateFields': ['fq_name', 'uuid', 'display_name'],
'subType': {
'project': {
Expand Down
18 changes: 18 additions & 0 deletions webroot/config/vn/ui/js/vn_config.js
Expand Up @@ -734,6 +734,11 @@ function initActions() {
vnConfig["virtual-network"]["virtual_network_properties"]["allow_transit"] = true;
else
vnConfig["virtual-network"]["virtual_network_properties"]["allow_transit"] = false;
if($("#chk_flood_unknown_unicast")[0].checked === true)
vnConfig["virtual-network"]["flood_unknown_unicast"] = true;
else
vnConfig["virtual-network"]["flood_unknown_unicast"] = false;

//vnConfig["virtual-network"]["display_name"] = vnConfig["virtual-network"]["fq_name"][vnConfig["virtual-network"]["fq_name"].length-1];

selectedProuters = $("#msPhysicalRouters").data('contrailMultiselect').value();
Expand Down Expand Up @@ -2177,6 +2182,12 @@ function successHandlerForGridVNRow(result) {
}
}
}
var flood_unknown_unicast = "Disabled";
if(vn["flood_unknown_unicast"] != undefined) {
if(String(vn["flood_unknown_unicast"]) == "true") {
flood_unknown_unicast = "Enabled";
}
}
//if(vn.fq_name[1] == selectedProject){
vnData.push({
"id": idCount++,
Expand All @@ -2198,6 +2209,7 @@ function successHandlerForGridVNRow(result) {
"ForwardingMode": fwdMode,
"VxLanId": vxlanid,
"AllowTransit": AllowTransit,
"flood_unknown_unicast": flood_unknown_unicast,
"staticIPAddressing" : staticIPAddressing,
"NetworkUUID": uuid,
"parent_uuid": parent_uuid,
Expand Down Expand Up @@ -2531,6 +2543,7 @@ function showVNEditWindow(mode, rowIndex) {
$('#btnCommonAddIpam').trigger('click');
$('#btnCommonAddIpam').hide();
}
$("#chk_flood_unknown_unicast")[0].checked = false;
} else if (mode === "edit") {
if(isVCenter()) {
$('#btnCommonAddIpam').hide();
Expand Down Expand Up @@ -2660,10 +2673,15 @@ function showVNEditWindow(mode, rowIndex) {
//place to add edid of AdminState, Extend/Shared,DNS Server
var AdminState = selectedVN["id_perms"]["enable"];
var isShared = selectedVN["is_shared"];
var isflood_unknown_unicast = false;
if(selectedVN["flood_unknown_unicast"] != null && selectedVN["flood_unknown_unicast"] != undefined) {
isflood_unknown_unicast = selectedVN["flood_unknown_unicast"];
}
var isExternal = selectedVN["router_external"];
$("#ddAdminState").data("contrailDropdown").value(String(AdminState));
$("#is_shared")[0].checked = isShared;
$("#router_external")[0].checked = isExternal;
$("#chk_flood_unknown_unicast")[0].checked = isflood_unknown_unicast;

if(null !== selectedVN["virtual_network_properties"] &&
typeof selectedVN["virtual_network_properties"] !== "undefined") {
Expand Down
12 changes: 12 additions & 0 deletions webroot/config/vn/ui/views/vn_config.view
Expand Up @@ -105,6 +105,10 @@
<span class="span2"><label>Allow Transit</label></span>
<span class="span10">: {{AllowTransit}}</span>
</div>
<div class="row-fluid">
<span class="span2"><label>Flood unknown unicast</label></span>
<span class="span10">: {{flood_unknown_unicast}}</span>
</div>
{{{showStaticIPAddressing staticIPAddressing}}}
{{#IfCompare display_physical_routers '-' operator="!="}}
<div class="row-fluid">
Expand Down Expand Up @@ -345,6 +349,14 @@
</div>
</div>
</div>
<div class="control-group">
<label class="control-label"></label>
<div class="controls">
<div class="row-fluid">
<div><input class="ace-input" type="checkbox" id="chk_flood_unknown_unicast"><span class="ace-lbl">Flood unknown unicast</span></div>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label"></label>
<div class="controls">
Expand Down

0 comments on commit ec0aa7d

Please sign in to comment.