diff --git a/webroot/config/infra/globalconfig/ui/js/globalConfigFormatters.js b/webroot/config/infra/globalconfig/ui/js/globalConfigFormatters.js
index a2008d10b..9d23ccb49 100644
--- a/webroot/config/infra/globalconfig/ui/js/globalConfigFormatters.js
+++ b/webroot/config/infra/globalconfig/ui/js/globalConfigFormatters.js
@@ -119,13 +119,9 @@
grEnable = getValueByJsonPath(val, "enable", "-"),
bgpHelperEnable = getValueByJsonPath(val,
"bgp_helper_enable", "-"),
- xmppHelperEnable = getValueByJsonPath(val,
- "xmpp_helper_enable", "-"),
formattedGR='', grStr='';
bgpHelperEnable = bgpHelperEnable === true ?
"Enabled" : "Disabled";
- xmppHelperEnable = xmppHelperEnable === true ?
- "Enabled" : "Disabled";
dispStr = "";
if(grEnable == false || grEnable == "false" || grEnable == '-') {
dispStr = "Disabled";
@@ -134,14 +130,12 @@
dispStr = "Enabled
";
grStr += "
BGP Helper | " + - "XMPP Helper | " + "Restart Time (secs) | " + "LLGR Time (secs) | " + "End of RIB (secs) | " + diff --git a/webroot/config/infra/globalconfig/ui/js/models/bgpOptionsModel.js b/webroot/config/infra/globalconfig/ui/js/models/bgpOptionsModel.js index b9a5e9297..c5af2eaa5 100644 --- a/webroot/config/infra/globalconfig/ui/js/models/bgpOptionsModel.js +++ b/webroot/config/infra/globalconfig/ui/js/models/bgpOptionsModel.js @@ -19,8 +19,7 @@ define([ "restart_time": 60, "long_lived_restart_time": 300, "end_of_rib_timeout": 30, - "bgp_helper_enable": false, - "xmpp_helper_enable": false + "bgp_helper_enable": false }, "graceful_restart_enable": false }, @@ -94,14 +93,10 @@ define([ "graceful_restart_parameters;enable", false); var bgpHelperEnble = getValueByJsonPath(modelConfig, "graceful_restart_parameters;bgp_helper_enable", - false, false), - xmppHelperEnble = getValueByJsonPath(modelConfig, - "graceful_restart_parameters;xmpp_helper_enable", - false, false); + false, false); modelConfig["graceful_restart_parameters"]["bgp_helper_enable"] = bgpHelperEnble.toString(); - modelConfig["graceful_restart_parameters"]["xmpp_helper_enable"] = - xmppHelperEnble.toString(); + return modelConfig; }, getIPSubnetList: function(attr) { @@ -204,12 +199,6 @@ define([ newBGPOptionsConfig["graceful_restart_parameters"] ["bgp_helper_enable"].toString() == "true" ? true : false; - //xmpp helper enable - globalSysConfigData['global-system-config'] - ["graceful_restart_parameters"]["xmpp_helper_enable"] = - newBGPOptionsConfig["graceful_restart_parameters"] - ["xmpp_helper_enable"].toString() == "true" ? true : false; - if (null != newBGPOptionsConfig['uuid']) { globalSysConfigData['global-system-config']['uuid'] = newBGPOptionsConfig['uuid']; diff --git a/webroot/config/infra/globalconfig/ui/js/views/bgpOptionsEditView.js b/webroot/config/infra/globalconfig/ui/js/views/bgpOptionsEditView.js index 772273c98..48e7d2943 100644 --- a/webroot/config/infra/globalconfig/ui/js/views/bgpOptionsEditView.js +++ b/webroot/config/infra/globalconfig/ui/js/views/bgpOptionsEditView.js @@ -126,10 +126,7 @@ define([ {text: "Disabled", value: "false"}] } } - }] - }, - { - columns:[{ + }, { elementId: "restart_time", view: "FormInputView", @@ -144,8 +141,10 @@ define([ "restart_time", class: "col-xs-6" } - }, - { + }] + }, + { + columns:[{ elementId: "long_lived_restart_time", view: "FormInputView", viewConfig: { @@ -159,10 +158,7 @@ define([ "long_lived_restart_time", class: "col-xs-6" } - }] - }, - { - columns:[{ + }, { elementId: "end_of_rib_timeout", view: "FormInputView", viewConfig: {
---|