From 41359e34b0ddb3d6e8b357fb926c299d3b6ded27 Mon Sep 17 00:00:00 2001 From: balamurugang Date: Mon, 18 May 2015 20:18:55 +0530 Subject: [PATCH] 1454086 BUM traffic behavior in VN page. 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 --- webroot/common/api/jsonDiff.helper.js | 3 ++- webroot/config/vn/ui/js/vn_config.js | 18 ++++++++++++++++++ webroot/config/vn/ui/views/vn_config.view | 12 ++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/webroot/common/api/jsonDiff.helper.js b/webroot/common/api/jsonDiff.helper.js index c82ff3edc..8c6611d43 100644 --- a/webroot/common/api/jsonDiff.helper.js +++ b/webroot/common/api/jsonDiff.helper.js @@ -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': { diff --git a/webroot/config/vn/ui/js/vn_config.js b/webroot/config/vn/ui/js/vn_config.js index c91f78fbd..35e60dc5f 100644 --- a/webroot/config/vn/ui/js/vn_config.js +++ b/webroot/config/vn/ui/js/vn_config.js @@ -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(); @@ -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++, @@ -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, @@ -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(); @@ -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") { diff --git a/webroot/config/vn/ui/views/vn_config.view b/webroot/config/vn/ui/views/vn_config.view index 4e70cd9ee..7f5c19e3b 100644 --- a/webroot/config/vn/ui/views/vn_config.view +++ b/webroot/config/vn/ui/views/vn_config.view @@ -105,6 +105,10 @@ : {{AllowTransit}} +
+ + : {{flood_unknown_unicast}} +
{{{showStaticIPAddressing staticIPAddressing}}} {{#IfCompare display_physical_routers '-' operator="!="}}
@@ -345,6 +349,14 @@
+
+ +
+
+
Flood unknown unicast
+
+
+