Removed XMPP GR Helper mode from Web-UI as the feature is not supported

Change-Id: I12a10e08f599958687be950d04d465c4e09f04e2 Related-bug: #1640268 (cherry picked from commit 791fda9)
Juniper · Nov 22, 2016 · 55f7700 · 55f7700
1 parent ea612ca
commit 55f7700
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 30 deletions.
diff --git 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<br><br>";
                     grStr += "<tr style='vertical-align:top'><td>";
                     grStr += bgpHelperEnable + "</td><td>";
-                    grStr += xmppHelperEnable + "</td><td>";
                     grStr += grTime + "</td><td>";
                     grStr += llgTime + "</td><td>";
                     grStr += eorRecTime + "</td></tr>";
 
                     formattedGR = "<table style='width:100%'><thead><tr>" +
                     "<th style='width:20%'>BGP Helper</th>" +
-                    "<th style='width:20%'>XMPP Helper</th>" +
                     "<th style='width:20%'>Restart Time (secs)</th>" +
                     "<th style='width:20%'>LLGR Time (secs)</th>" +
                     "<th style='width:20%'>End of RIB (secs)</th>" +

diff --git 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
@@ -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: {