From cd9de4f14528f06706fe3d844d64a09202e09434 Mon Sep 17 00:00:00 2001
From: Siva Bavanasi <kbsiva@juniper.net>
Date: Wed, 20 May 2015 16:29:45 +0530
Subject: [PATCH] Closes-bug: #1447273 - Use Router instead of Peer when
 referring to bgp-router object

Change-Id: I18c6c727f8b9420afb2417a3c8977411aa075416
---
 webroot/config/bgp/ui/js/bgp_config.js      | 24 ++++++++++-----------
 webroot/config/bgp/ui/views/bgp_config.view |  6 +++---
 webroot/menu.xml                            |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/webroot/config/bgp/ui/js/bgp_config.js b/webroot/config/bgp/ui/js/bgp_config.js
index 86c1cc4ce..019d298fe 100644
--- a/webroot/config/bgp/ui/js/bgp_config.js
+++ b/webroot/config/bgp/ui/js/bgp_config.js
@@ -99,7 +99,7 @@ function handleltor(left, right, options) {
                 if (globalData[j].name == selected[i].value) {
                     if (type == "external") {
                         if (!isJuniperControlNode(globalData[j].vendor)) {
-                            showInfoWindow("BGP peer(" +
+                            showInfoWindow("BGP router(" +
                                 globalData[j].name +
                                 ") can be paired only with Control Nodes.",
                                 "Selection Error");
@@ -216,7 +216,7 @@ function validate() {
         return false;
     }
     if ("" == addr || !validip(addr) || addr.indexOf("/") != -1) {
-        showInfoWindow("Enter a valid BGP peer address in the format xxx.xxx.xxx.xxx", "Invalid input");
+        showInfoWindow("Enter a valid BGP router address in the format xxx.xxx.xxx.xxx", "Invalid input");
         return false;
     }
     if (authType != 'none' && $('#txtAuthKey').val().trim() == '') {
@@ -257,7 +257,7 @@ function validate() {
         }
     }
     if ("" == family || family.length <= 0) {
-        showInfoWindow("Enter BGP peer address family", "Input required");
+        showInfoWindow("Enter BGP router address family", "Input required");
         return false;
     }
 
@@ -464,7 +464,7 @@ function addEditBgp(data) {
             tmp_availablelist = [],
             tmp_selectlist = [];
         bgpwindow.modal('show');
-        bgpwindow.find('h6').text("Edit BGP Peer");
+        bgpwindow.find('h6').text("Edit BGP Router");
         if (data.role.indexOf("Control") != -1) {
             $("#chkjnpr").click();
         } else {
@@ -615,7 +615,7 @@ function fetchData() {
                         if (isJuniperControlNode(d.vendor)) {
                             append = "Control Node";
                         } else {
-                            append = "BGP Peer";
+                            append = "BGP Router";
                         }
                         roles = type.split(", ");
                         roles.forEach(function (e) {
@@ -797,7 +797,7 @@ function initComponents() {
     $("#gridBGP").contrailGrid({
         header : {
             title : {
-                text : 'BGP Peers',
+                text : 'BGP Routers',
                 //cssClass : 'blue',
                 //icon : 'icon-list',
                 //iconCssClass : 'blue'
@@ -809,8 +809,8 @@ function initComponents() {
             //    searchable: true
             //},
             customControls: [
-                '<a id="btndelbgp" class="disabled-link" title="Delete BGP Peer(s)"><i class="icon-trash"></i></a>',
-                '<a id="btnaddbgp" class="disabled-link" onclick="btnaddbgpClick();return false;" title="Create BGP Peer"><i class="icon-plus"></i></a>'
+                '<a id="btndelbgp" class="disabled-link" title="Delete BGP Router(s)"><i class="icon-trash"></i></a>',
+                '<a id="btnaddbgp" class="disabled-link" onclick="btnaddbgpClick();return false;" title="Create BGP Router"><i class="icon-plus"></i></a>'
             ]
         },
         columnHeader : {
@@ -878,15 +878,15 @@ function initComponents() {
             },
             statusMessages: {
                 loading: {
-                    text: 'Loading BGP Peers..',
+                    text: 'Loading BGP Routers..',
                 },
                 empty: {
-                    text: 'No BGP Peers Found.'
+                    text: 'No BGP Routers Found.'
                 }, 
                 errorGettingData: {
                     type: 'error',
                     iconClasses: 'icon-warning',
-                    text: 'Error in getting BGP Peers.'
+                    text: 'Error in getting BGP Routers.'
                 }
             }
         }
@@ -1012,7 +1012,7 @@ function btnaddbgpClick() {
     mode = "add";
     populatePhysicalRouters();
     bgpwindow.modal('show');
-    bgpwindow.find('h6').text("Create BGP Peer");
+    bgpwindow.find('h6').text("Create BGP Router");
     $("#txtasn").val(ggasn);
     $("#txtport").val("179");
     $("#txtname").focus();
diff --git a/webroot/config/bgp/ui/views/bgp_config.view b/webroot/config/bgp/ui/views/bgp_config.view
index 243ad1320..3255f6f6c 100644
--- a/webroot/config/bgp/ui/views/bgp_config.view
+++ b/webroot/config/bgp/ui/views/bgp_config.view
@@ -28,7 +28,7 @@
                       </div>                       
                   </div>
                   <div class="control-group">
-                      <label class="control-label">Peer Type</label>
+                      <label class="control-label">Router Type</label>
                       <div class="controls">
                           <div class="row-fluid padding-top-5">
                                <div class="pull-left">
@@ -51,7 +51,7 @@
                                </div>
                                <label
                                    onclick="$('\#chkextern').click()" class="hyperlink-active">
-                                   BGP Peer
+                                   BGP Router
                                </label>
                           </div>
                       </div>
@@ -252,7 +252,7 @@
         </div>
         <div class="modal-body">
             <div class="row-fluid text-center" >
-                <h6>Confirm BGP Peer(s) delete</h6>
+                <h6>Confirm BGP Router(s) delete</h6>
             </div>       
         </div>
         <div class="modal-footer">
diff --git a/webroot/menu.xml b/webroot/menu.xml
index 34e6b69b8..1026a1521 100644
--- a/webroot/menu.xml
+++ b/webroot/menu.xml
@@ -361,7 +361,7 @@ and need to add the iconClass tag wherever we need to show some icons
               <searchStrings>Configure Global Config</searchStrings>
             </item>
             <item>
-              <label>BGP Peers</label>
+              <label>BGP Routers</label>
               <hash>config_infra_bgp</hash>
               <resources>
                 <resource>
@@ -371,7 +371,7 @@ and need to add the iconClass tag wherever we need to show some icons
                   <class>bgpConfigObj</class>
                 </resource>
               </resources>
-              <searchStrings>Configure BGP Peers</searchStrings>
+              <searchStrings>Configure BGP Routers</searchStrings>
             </item>
             <item>
               <label>Link Local Services</label>