diff --git a/html/includes/forms/routing-update.inc.php b/html/includes/forms/routing-update.inc.php
new file mode 100644
index 0000000000..89ccd3d101
--- /dev/null
+++ b/html/includes/forms/routing-update.inc.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2018 TheGreatDoc
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+use LibreNMS\Authentication\Auth;
+
+header('Content-type: application/json');
+
+if (!Auth::user()->hasGlobalAdmin()) {
+    $response = array(
+        'status'  => 'error',
+        'message' => 'Need to be admin',
+    );
+    echo _json_encode($response);
+    exit;
+}
+
+$status  = 'error';
+$message = 'Error updating routing information';
+
+$device_id = $_POST['device_id'];
+$routing_id = $_POST['routing_id'];
+$data = $_POST['data'];
+
+if (!is_numeric($device_id)) {
+    $message = 'Missing device id';
+} elseif (!is_numeric($routing_id)) {
+    $message = 'Missing routing id';
+} else {
+    if (dbUpdate(array('bgpPeerDescr'=>$data), 'bgpPeers', '`bgpPeer_id`=? AND `device_id`=?', array($routing_id,$device_id)) >= 0) {
+        $message = 'Routing information updated';
+        $status = 'ok';
+    } else {
+        $message = 'Could not update Routing information';
+    }
+}
+
+$response = array(
+    'status'        => $status,
+    'message'       => $message,
+    'extra'         => $extra,
+);
+echo _json_encode($response);
diff --git a/html/includes/table/routing-edit.inc.php b/html/includes/table/routing-edit.inc.php
new file mode 100644
index 0000000000..74bb735729
--- /dev/null
+++ b/html/includes/table/routing-edit.inc.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2018 TheGreatDoc
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+$device_id = $vars['device_id'];
+
+$sql = " FROM `bgpPeers` AS `B` LEFT JOIN `devices` AS `D` ON `B`.`device_id` = `D`.`device_id` WHERE `D`.`device_id`=?";
+$param[] = $device_id;
+
+if (isset($searchPhrase) && !empty($searchPhrase)) {
+    $sql .= " AND (`D`.`hostname` LIKE '%$searchPhrase%' OR `B`.`bgpPeerRemoteAs` LIKE '%$searchPhrase%' OR `B`.`bgpPeerIdentifier` LIKE '%$searchPhrase%' OR `B`.`bgpPeerDescr` LIKE '%$searchPhrase%')";
+}
+
+$count_sql = "SELECT COUNT(`bgpPeer_id`) $sql";
+
+$total = dbFetchCell($count_sql, $param);
+if (empty($total)) {
+    $total = 0;
+}
+
+if (!isset($sort) || empty($sort)) {
+    $sort = '`D`.`hostname`, `B`.`bgpPeerRemoteAs`';
+}
+
+$sql .= " ORDER BY $sort";
+
+if (isset($current)) {
+    $limit_low = ($current * $rowCount) - ($rowCount);
+    $limit_high = $rowCount;
+}
+
+if ($rowCount != -1) {
+    $sql .= " LIMIT $limit_low,$limit_high";
+}
+
+$sql = "SELECT * $sql";
+
+foreach (dbFetchRows($sql, $param) as $routing) {
+    $response[] = array(
+        'routing_id' => $routing['bgpPeer_id'],
+        'hostname' => generate_device_link($routing),
+        'bgpPeerIdentifier' => $routing['bgpPeerIdentifier'],
+        'bgpPeerRemoteAs' => $routing['bgpPeerRemoteAs'],
+        'bgpPeerDescr' => $routing['bgpPeerDescr']);
+}
+
+$output = array('current'=>$current,'rowCount'=>$rowCount,'rows'=>$response,'total'=>$total);
+echo _json_encode($output);
diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php
index b5bcacc000..6583fc7f67 100644
--- a/html/pages/device/edit.inc.php
+++ b/html/pages/device/edit.inc.php
@@ -17,6 +17,10 @@ if (!Auth::user()->hasGlobalAdmin()) {
         $panes['ports']    = 'Port Settings';
     }
 
+    if (dbFetchCell("SELECT COUNT(*) FROM `bgpPeers` WHERE `device_id` = ? LIMIT 1", array($device['device_id'])) > 0) {
+        $panes['routing'] = 'Routing';
+    }
+
     if (count($config['os'][$device['os']]['icons'])) {
         $panes['icon']  = 'Icon';
     }
diff --git a/html/pages/device/edit/routing.inc.php b/html/pages/device/edit/routing.inc.php
new file mode 100644
index 0000000000..2f041d94ae
--- /dev/null
+++ b/html/pages/device/edit/routing.inc.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2018 TheGreatDoc
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+?>
+<h3>Routing settings</h3>
+
+<div class="table-responsive">
+    <table id="routing" class="table table-hover table-condensed routing">
+        <thead>
+        <tr>
+            <th data-column-id="hostname">Device</th>
+            <th data-column-id="bgpPeerIdentifier">Peer address</th>
+            <th data-column-id="bgpPeerRemoteAs">Remote AS</th>
+            <th data-column-id="bgpPeerDescr" data-formatter="descr_update" data-header-css-class="edit-routing-input">Description</th>
+        </tr>
+        </thead>
+    </table>
+</div>
+
+<script>
+    var grid = $("#routing").bootgrid({
+        ajax: true,
+        rowCount: [50, 100, 250, -1],
+        post: function ()
+        {
+            return {
+                id: "routing-edit",
+                device_id: <?php echo $device['device_id']; ?>,
+            };
+        },
+        url: "ajax_table.php",
+        formatters: {
+            "descr_update": function(column,row) {
+                return "<div class='form-group'><input type='text' class='form-control input-sm routing' data-device_id='<?php echo $device['device_id']; ?>' data-routing_id='"+row.routing_id+"' value='"+row.bgpPeerDescr+"'></div>";
+            }
+        },
+        templates: {
+        }
+    }).on("loaded.rs.jquery.bootgrid", function() {
+
+        grid.find(".routing").blur(function(event) {
+            event.preventDefault();
+            var device_id = $(this).data("device_id");
+            var routing_id = $(this).data("routing_id");
+            var data = $(this).val();
+            var $this = $(this);
+            $.ajax({
+                type: 'POST',
+                url: 'ajax_form.php',
+                data: {type: "routing-update", device_id: device_id, data: data, routing_id: routing_id},
+                dataType: "json",
+                success: function (data) {
+                    if (data.status == 'ok') {
+                        toastr.success(data.message);
+                    } else {
+                        toastr.error(data.message);
+                    }
+                },
+                error: function () {
+                    toastr.error(data.message);
+                }
+            });
+        });
+    });
+</script>
diff --git a/html/pages/device/routing/bgp.inc.php b/html/pages/device/routing/bgp.inc.php
index 3500ed7411..e5de193e44 100644
--- a/html/pages/device/routing/bgp.inc.php
+++ b/html/pages/device/routing/bgp.inc.php
@@ -98,7 +98,7 @@ if ($vars['view'] == 'macaccounting_pkts') {
 print_optionbar_end();
 
 echo '<table border="0" cellspacing="0" cellpadding="5" width="100%">';
-echo '<tr style="height: 30px"><th>Peer address</th><th>Type</th><th>Family</th><th>Remote AS</th><th>State</th><th>Uptime</th></tr>';
+echo '<tr style="height: 30px"><th>Peer address</th><th>Type</th><th>Family</th><th>Remote AS</th><th>Peer description</th><th>State</th><th>Uptime</th></tr>';
 
 $i = '1';
 
@@ -225,6 +225,7 @@ foreach (dbFetchRows("SELECT * FROM `bgpPeers` WHERE `device_id` = ? $extra_sql
         <td>$peer_type</td>
         <td style='font-size: 10px; font-weight: bold; line-height: 10px;'>".(isset($peer['afi']) ? $peer['afi'] : '').'</td>
         <td><strong>AS'.$peer['bgpPeerRemoteAs'].'</strong><br />'.$peer['astext']."</td>
+        <td>".$peer['bgpPeerDescr']."</td>
         <td><strong><span style='color: $admin_col;'>".$peer['bgpPeerAdminStatus']."<span><br /><span style='color: $col;'>".$peer['bgpPeerState'].'</span></strong></td>
         <td>'.formatUptime($peer['bgpPeerFsmEstablishedTime'])."<br />
         Updates <i class='fa fa-arrow-down icon-theme' aria-hidden='true'></i> ".$peer['bgpPeerInUpdates']."
diff --git a/html/pages/routing/bgp.inc.php b/html/pages/routing/bgp.inc.php
index e4c6b07272..ae20221acd 100644
--- a/html/pages/routing/bgp.inc.php
+++ b/html/pages/routing/bgp.inc.php
@@ -195,7 +195,7 @@ if (!Auth::user()->hasGlobalRead()) {
     print_optionbar_end();
 
     echo "<table border=0 cellspacing=0 cellpadding=5 width=100% class='table sortable'>";
-    echo '<tr style="height: 30px"><td width=1></td><th>Local address</th><th></th><th>Peer address</th><th>Type</th><th>Family</th><th>Remote AS</th><th>State</th><th width=200>Uptime / Updates</th></tr>';
+    echo '<tr style="height: 30px"><td width=1></td><th>Local address</th><th></th><th>Peer address</th><th>Type</th><th>Family</th><th>Remote AS</th><th>Peer description</th><th>State</th><th width=200>Uptime / Updates</th></tr>';
 
     if ($vars['type'] == 'external') {
         $where = 'AND D.bgpLocalAs != B.bgpPeerRemoteAs';
@@ -302,6 +302,7 @@ if (!Auth::user()->hasGlobalRead()) {
             <td width=50><b>$peer_type</b></td>
             <td width=50>".$peer['afi'].'</td>
             <td><strong>AS'.$peer['bgpPeerRemoteAs'].'</strong><br />'.$peer['astext']."</td>
+            <td>".$peer['bgpPeerDescr']."</td>
             <td><strong><span style='color: $admin_col;'>".$peer['bgpPeerAdminStatus']."</span><br /><span style='color: $col;'>".$peer['bgpPeerState'].'</span></strong></td>
             <td>'.formatUptime($peer['bgpPeerFsmEstablishedTime'])."<br />
             Updates <i class='fa fa-arrow-down icon-theme' aria-hidden='true'></i> ".format_si($peer['bgpPeerInUpdates'])."
diff --git a/misc/db_schema.yaml b/misc/db_schema.yaml
index 52d65ce19d..3577daf4fb 100644
--- a/misc/db_schema.yaml
+++ b/misc/db_schema.yaml
@@ -192,6 +192,7 @@ bgpPeers:
     - { Field: bgpPeerAdminStatus, Type: text, 'Null': false, Extra: '' }
     - { Field: bgpLocalAddr, Type: text, 'Null': false, Extra: '' }
     - { Field: bgpPeerRemoteAddr, Type: text, 'Null': false, Extra: '' }
+    - { Field: bgpPeerDescr, Type: varchar(255), 'Null': false, Extra: '', Default: '' }
     - { Field: bgpPeerInUpdates, Type: int(11), 'Null': false, Extra: '' }
     - { Field: bgpPeerOutUpdates, Type: int(11), 'Null': false, Extra: '' }
     - { Field: bgpPeerInTotalMessages, Type: int(11), 'Null': false, Extra: '' }
diff --git a/sql-schema/266.sql b/sql-schema/266.sql
new file mode 100644
index 0000000000..e6498db546
--- /dev/null
+++ b/sql-schema/266.sql
@@ -0,0 +1 @@
+ALTER TABLE `bgpPeers` ADD `bgpPeerDescr` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bgpPeerRemoteAddr`;
\ No newline at end of file
diff --git a/tests/data/arista_eos.json b/tests/data/arista_eos.json
index 055019fd92..7e23aff298 100644
--- a/tests/data/arista_eos.json
+++ b/tests/data/arista_eos.json
@@ -10,6 +10,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -17,7 +18,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65000"
+                    "bgpLocalAs": 65000
                 },
                 {
                     "astext": "",
@@ -27,6 +28,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -34,7 +36,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65000"
+                    "bgpLocalAs": 65000
                 }
             ],
             "bgpPeers_cbgp": [
@@ -98,6 +100,7 @@
                     "bgpPeerAdminStatus": "running",
                     "bgpLocalAddr": "192.168.0.1",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 13362513,
                     "bgpPeerOutUpdates": 13579799,
                     "bgpPeerInTotalMessages": 13579799,
@@ -105,7 +108,7 @@
                     "bgpPeerFsmEstablishedTime": 13090321,
                     "bgpPeerInUpdateElapsedTime": 4,
                     "context_name": "",
-                    "bgpLocalAs": "65000"
+                    "bgpLocalAs": 65000
                 },
                 {
                     "astext": "",
@@ -115,6 +118,7 @@
                     "bgpPeerAdminStatus": "running",
                     "bgpLocalAddr": "2001:0550:0002:002f:0000:0000:0033:0002",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 12658044,
                     "bgpPeerOutUpdates": 118,
                     "bgpPeerInTotalMessages": 12658183,
@@ -122,7 +126,7 @@
                     "bgpPeerFsmEstablishedTime": 1551697,
                     "bgpPeerInUpdateElapsedTime": 17,
                     "context_name": "",
-                    "bgpLocalAs": "65000"
+                    "bgpLocalAs": 65000
                 }
             ],
             "bgpPeers_cbgp": [
diff --git a/tests/data/comware.json b/tests/data/comware.json
index 124e3d1406..329252eff0 100644
--- a/tests/data/comware.json
+++ b/tests/data/comware.json
@@ -10,6 +10,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -17,7 +18,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65504"
+                    "bgpLocalAs": 65504
                 },
                 {
                     "astext": "",
@@ -27,6 +28,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -34,7 +36,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65504"
+                    "bgpLocalAs": 65504
                 }
             ],
             "bgpPeers_cbgp": []
@@ -49,6 +51,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.3.51",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 1,
                     "bgpPeerOutUpdates": 6,
                     "bgpPeerInTotalMessages": 4875,
@@ -56,7 +59,7 @@
                     "bgpPeerFsmEstablishedTime": 259280,
                     "bgpPeerInUpdateElapsedTime": 259280,
                     "context_name": "",
-                    "bgpLocalAs": "65504"
+                    "bgpLocalAs": 65504
                 },
                 {
                     "astext": "",
@@ -66,6 +69,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.2.58",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 1,
                     "bgpPeerOutUpdates": 87,
                     "bgpPeerInTotalMessages": 423531,
@@ -73,7 +77,7 @@
                     "bgpPeerFsmEstablishedTime": 22497219,
                     "bgpPeerInUpdateElapsedTime": 22497219,
                     "context_name": "",
-                    "bgpLocalAs": "65504"
+                    "bgpLocalAs": 65504
                 }
             ],
             "bgpPeers_cbgp": []
diff --git a/tests/data/ios_3560g.json b/tests/data/ios_3560g.json
index ebfa532625..895a6b46a5 100644
--- a/tests/data/ios_3560g.json
+++ b/tests/data/ios_3560g.json
@@ -10,6 +10,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -17,7 +18,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "64513"
+                    "bgpLocalAs": 64513
                 },
                 {
                     "astext": "",
@@ -27,6 +28,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -34,7 +36,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "64513"
+                    "bgpLocalAs": 64513
                 }
             ],
             "bgpPeers_cbgp": [
@@ -146,6 +148,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.99.21",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 5,
                     "bgpPeerOutUpdates": 4,
                     "bgpPeerInTotalMessages": 100,
@@ -153,7 +156,7 @@
                     "bgpPeerFsmEstablishedTime": 893,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "64513"
+                    "bgpLocalAs": 64513
                 },
                 {
                     "astext": "",
@@ -163,6 +166,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.99.21",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 8,
                     "bgpPeerOutUpdates": 4,
                     "bgpPeerInTotalMessages": 19,
@@ -170,7 +174,7 @@
                     "bgpPeerFsmEstablishedTime": 467,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "64513"
+                    "bgpLocalAs": 64513
                 }
             ],
             "bgpPeers_cbgp": [
diff --git a/tests/data/iosxe.json b/tests/data/iosxe.json
index d9958af27d..d3eee245b3 100644
--- a/tests/data/iosxe.json
+++ b/tests/data/iosxe.json
@@ -10,6 +10,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -17,7 +18,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65031"
+                    "bgpLocalAs": 65031
                 },
                 {
                     "astext": "",
@@ -27,6 +28,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -34,7 +36,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65031"
+                    "bgpLocalAs": 65031
                 },
                 {
                     "astext": "",
@@ -44,6 +46,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -51,7 +54,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65031"
+                    "bgpLocalAs": 65031
                 },
                 {
                     "astext": "",
@@ -61,6 +64,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -68,7 +72,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65031"
+                    "bgpLocalAs": 65031
                 }
             ],
             "bgpPeers_cbgp": [
@@ -180,6 +184,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "10.44.32.14",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 1,
                     "bgpPeerOutUpdates": 4,
                     "bgpPeerInTotalMessages": 302,
@@ -187,7 +192,7 @@
                     "bgpPeerFsmEstablishedTime": 8497,
                     "bgpPeerInUpdateElapsedTime": 8491,
                     "context_name": "",
-                    "bgpLocalAs": "65031"
+                    "bgpLocalAs": 65031
                 },
                 {
                     "astext": "",
@@ -197,6 +202,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "10.45.63.162",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 1,
                     "bgpPeerOutUpdates": 4,
                     "bgpPeerInTotalMessages": 303,
@@ -204,7 +210,7 @@
                     "bgpPeerFsmEstablishedTime": 8492,
                     "bgpPeerInUpdateElapsedTime": 8491,
                     "context_name": "",
-                    "bgpLocalAs": "65031"
+                    "bgpLocalAs": 65031
                 },
                 {
                     "astext": "",
@@ -214,6 +220,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "2001:0db8:85a3:0000:341a:8a2e:03e1:000e",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 1,
                     "bgpPeerOutUpdates": 3,
                     "bgpPeerInTotalMessages": 302,
@@ -221,7 +228,7 @@
                     "bgpPeerFsmEstablishedTime": 8487,
                     "bgpPeerInUpdateElapsedTime": 8486,
                     "context_name": "",
-                    "bgpLocalAs": "65031"
+                    "bgpLocalAs": 65031
                 },
                 {
                     "astext": "",
@@ -231,6 +238,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "2001:0db8:85a3:0000:341a:8a2e:03e2:00a2",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 1,
                     "bgpPeerOutUpdates": 3,
                     "bgpPeerInTotalMessages": 303,
@@ -238,7 +246,7 @@
                     "bgpPeerFsmEstablishedTime": 8487,
                     "bgpPeerInUpdateElapsedTime": 8486,
                     "context_name": "",
-                    "bgpLocalAs": "65031"
+                    "bgpLocalAs": 65031
                 }
             ],
             "bgpPeers_cbgp": [
diff --git a/tests/data/iosxr.json b/tests/data/iosxr.json
index 3f75eeb169..a754f39749 100644
--- a/tests/data/iosxr.json
+++ b/tests/data/iosxr.json
@@ -10,6 +10,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -17,7 +18,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -27,6 +28,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -34,7 +36,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -44,6 +46,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -51,7 +54,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -61,6 +64,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -68,7 +72,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -78,6 +82,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -85,7 +90,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -95,6 +100,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -102,7 +108,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -112,6 +118,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -119,7 +126,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -129,6 +136,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -136,7 +144,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -146,6 +154,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -153,7 +162,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -163,6 +172,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -170,7 +180,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -180,6 +190,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -187,7 +198,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -197,6 +208,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -204,7 +216,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -214,6 +226,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -221,7 +234,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -231,6 +244,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -238,7 +252,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -248,6 +262,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -255,7 +270,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -265,6 +280,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -272,7 +288,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -282,6 +298,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -289,7 +306,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -299,6 +316,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -306,7 +324,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -316,6 +334,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -323,7 +342,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -333,6 +352,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -340,7 +360,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -350,6 +370,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -357,7 +378,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -367,6 +388,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -374,7 +396,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -384,6 +406,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -391,7 +414,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -401,6 +424,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -408,7 +432,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -418,6 +442,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -425,7 +450,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -435,6 +460,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -442,7 +468,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -452,6 +478,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -459,7 +486,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -469,6 +496,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -476,7 +504,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -486,6 +514,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -493,7 +522,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -503,6 +532,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -510,7 +540,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -520,6 +550,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -527,7 +558,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -537,6 +568,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -544,7 +576,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -554,6 +586,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -561,7 +594,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -571,6 +604,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -578,7 +612,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 }
             ],
             "bgpPeers_cbgp": [
@@ -1338,6 +1372,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.5.150",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 6820270,
                     "bgpPeerOutUpdates": 2971,
                     "bgpPeerInTotalMessages": 6853418,
@@ -1345,7 +1380,7 @@
                     "bgpPeerFsmEstablishedTime": 1308186,
                     "bgpPeerInUpdateElapsedTime": 14,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1355,6 +1390,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.7.42",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 2,
                     "bgpPeerOutUpdates": 27,
                     "bgpPeerInTotalMessages": 220951,
@@ -1362,7 +1398,7 @@
                     "bgpPeerFsmEstablishedTime": 1308119,
                     "bgpPeerInUpdateElapsedTime": 2933262,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1372,6 +1408,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.7.154",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 1,
                     "bgpPeerOutUpdates": 21,
                     "bgpPeerInTotalMessages": 222448,
@@ -1379,7 +1416,7 @@
                     "bgpPeerFsmEstablishedTime": 1308138,
                     "bgpPeerInUpdateElapsedTime": 12900159,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1389,6 +1426,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.8.46",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 1,
                     "bgpPeerOutUpdates": 22,
                     "bgpPeerInTotalMessages": 222360,
@@ -1396,7 +1434,7 @@
                     "bgpPeerFsmEstablishedTime": 1308162,
                     "bgpPeerInUpdateElapsedTime": 2933256,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1406,6 +1444,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.8.114",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 1,
                     "bgpPeerOutUpdates": 21,
                     "bgpPeerInTotalMessages": 222453,
@@ -1413,7 +1452,7 @@
                     "bgpPeerFsmEstablishedTime": 1308163,
                     "bgpPeerInUpdateElapsedTime": 12900159,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1423,6 +1462,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.9.78",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 37,
                     "bgpPeerOutUpdates": 3357288,
                     "bgpPeerInTotalMessages": 2153717,
@@ -1430,7 +1470,7 @@
                     "bgpPeerFsmEstablishedTime": 9721188,
                     "bgpPeerInUpdateElapsedTime": 9721186,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1440,6 +1480,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.25",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 58,
                     "bgpPeerOutUpdates": 2595,
                     "bgpPeerInTotalMessages": 1087279,
@@ -1447,7 +1488,7 @@
                     "bgpPeerFsmEstablishedTime": 5917594,
                     "bgpPeerInUpdateElapsedTime": 5917591,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1457,6 +1498,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.102",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 38,
                     "bgpPeerOutUpdates": 3413704,
                     "bgpPeerInTotalMessages": 981961,
@@ -1464,7 +1506,7 @@
                     "bgpPeerFsmEstablishedTime": 3050652,
                     "bgpPeerInUpdateElapsedTime": 3050649,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1474,6 +1516,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.126",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 8,
                     "bgpPeerOutUpdates": 3345698,
                     "bgpPeerInTotalMessages": 1088403,
@@ -1481,7 +1524,7 @@
                     "bgpPeerFsmEstablishedTime": 35789109,
                     "bgpPeerInUpdateElapsedTime": 35789107,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1491,6 +1534,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.126",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 8,
                     "bgpPeerOutUpdates": 3345684,
                     "bgpPeerInTotalMessages": 1088576,
@@ -1498,7 +1542,7 @@
                     "bgpPeerFsmEstablishedTime": 35012857,
                     "bgpPeerInUpdateElapsedTime": 35012834,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1508,6 +1552,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.137",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 30,
                     "bgpPeerOutUpdates": 4213170,
                     "bgpPeerInTotalMessages": 1088394,
@@ -1515,7 +1560,7 @@
                     "bgpPeerFsmEstablishedTime": 59346654,
                     "bgpPeerInUpdateElapsedTime": 73311,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1525,6 +1570,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.141",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 6,
                     "bgpPeerOutUpdates": 3346328,
                     "bgpPeerInTotalMessages": 988818,
@@ -1532,7 +1578,7 @@
                     "bgpPeerFsmEstablishedTime": 21542388,
                     "bgpPeerInUpdateElapsedTime": 21536506,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1542,6 +1588,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.154",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 22818,
                     "bgpPeerOutUpdates": 1071754,
                     "bgpPeerInTotalMessages": 364237,
@@ -1549,7 +1596,7 @@
                     "bgpPeerFsmEstablishedTime": 20493157,
                     "bgpPeerInUpdateElapsedTime": 1307780,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1559,6 +1606,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.161",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 15808613,
                     "bgpPeerOutUpdates": 2651,
                     "bgpPeerInTotalMessages": 17862383,
@@ -1566,7 +1614,7 @@
                     "bgpPeerFsmEstablishedTime": 1423427,
                     "bgpPeerInUpdateElapsedTime": 2,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1576,6 +1624,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.166",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 107,
                     "bgpPeerOutUpdates": 3360399,
                     "bgpPeerInTotalMessages": 3200267,
@@ -1583,7 +1632,7 @@
                     "bgpPeerFsmEstablishedTime": 2264958,
                     "bgpPeerInUpdateElapsedTime": 2264956,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1593,6 +1642,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.169",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 44,
                     "bgpPeerOutUpdates": 3398158,
                     "bgpPeerInTotalMessages": 1115193,
@@ -1600,7 +1650,7 @@
                     "bgpPeerFsmEstablishedTime": 7976142,
                     "bgpPeerInUpdateElapsedTime": 7976139,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1610,6 +1660,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.177",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 12,
                     "bgpPeerOutUpdates": 3322796,
                     "bgpPeerInTotalMessages": 11505784,
@@ -1617,7 +1668,7 @@
                     "bgpPeerFsmEstablishedTime": 1220645,
                     "bgpPeerInUpdateElapsedTime": 1220639,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1627,6 +1678,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.185",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 19787,
                     "bgpPeerOutUpdates": 3351200,
                     "bgpPeerInTotalMessages": 3215544,
@@ -1634,7 +1686,7 @@
                     "bgpPeerFsmEstablishedTime": 33584677,
                     "bgpPeerInUpdateElapsedTime": 1814,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1644,6 +1696,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.198",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 8093,
                     "bgpPeerOutUpdates": 6052626,
                     "bgpPeerInTotalMessages": 1006247,
@@ -1651,7 +1704,7 @@
                     "bgpPeerFsmEstablishedTime": 4410812,
                     "bgpPeerInUpdateElapsedTime": 4410807,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1661,6 +1714,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.202",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 44,
                     "bgpPeerOutUpdates": 3360759,
                     "bgpPeerInTotalMessages": 989162,
@@ -1668,7 +1722,7 @@
                     "bgpPeerFsmEstablishedTime": 30057244,
                     "bgpPeerInUpdateElapsedTime": 175341,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1678,6 +1732,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.206",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 4,
                     "bgpPeerOutUpdates": 2432478,
                     "bgpPeerInTotalMessages": 1700182,
@@ -1685,7 +1740,7 @@
                     "bgpPeerFsmEstablishedTime": 2116848,
                     "bgpPeerInUpdateElapsedTime": 2116844,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1695,6 +1750,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.210",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 7,
                     "bgpPeerOutUpdates": 2190947,
                     "bgpPeerInTotalMessages": 811340,
@@ -1702,7 +1758,7 @@
                     "bgpPeerFsmEstablishedTime": 7976155,
                     "bgpPeerInUpdateElapsedTime": 7976152,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1712,6 +1768,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -1719,7 +1776,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1729,6 +1786,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.218",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 49,
                     "bgpPeerOutUpdates": 1214760,
                     "bgpPeerInTotalMessages": 767015,
@@ -1736,7 +1794,7 @@
                     "bgpPeerFsmEstablishedTime": 19966196,
                     "bgpPeerInUpdateElapsedTime": 4288850,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1746,6 +1804,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.222",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 106554,
                     "bgpPeerOutUpdates": 2434919,
                     "bgpPeerInTotalMessages": 293718,
@@ -1753,7 +1812,7 @@
                     "bgpPeerFsmEstablishedTime": 2659874,
                     "bgpPeerInUpdateElapsedTime": 1644752,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1763,6 +1822,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.255",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 7,
                     "bgpPeerOutUpdates": 135291803,
                     "bgpPeerInTotalMessages": 989152,
@@ -1770,7 +1830,7 @@
                     "bgpPeerFsmEstablishedTime": 59350192,
                     "bgpPeerInUpdateElapsedTime": 25567472,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1780,6 +1840,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.13.255",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 103,
                     "bgpPeerOutUpdates": 135340420,
                     "bgpPeerInTotalMessages": 989231,
@@ -1787,7 +1848,7 @@
                     "bgpPeerFsmEstablishedTime": 59350337,
                     "bgpPeerInUpdateElapsedTime": 19105427,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1797,6 +1858,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.27.146",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 188689760,
                     "bgpPeerOutUpdates": 105,
                     "bgpPeerInTotalMessages": 188689897,
@@ -1804,7 +1866,7 @@
                     "bgpPeerFsmEstablishedTime": 1308161,
                     "bgpPeerInUpdateElapsedTime": 1,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1814,6 +1876,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.71.170",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 128796010,
                     "bgpPeerOutUpdates": 56,
                     "bgpPeerInTotalMessages": 130823696,
@@ -1821,7 +1884,7 @@
                     "bgpPeerFsmEstablishedTime": 1424073,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1831,6 +1894,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "fd13:42ed:aee2:d2d9:0000:0000:0000:0002",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 29097537,
                     "bgpPeerOutUpdates": 90,
                     "bgpPeerInTotalMessages": 29098407,
@@ -1838,7 +1902,7 @@
                     "bgpPeerFsmEstablishedTime": 1308182,
                     "bgpPeerInUpdateElapsedTime": 24,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1848,6 +1912,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "fd2a:4cc8:1ff3:700c:0000:0000:0000:0002",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 65650369,
                     "bgpPeerOutUpdates": 56,
                     "bgpPeerInTotalMessages": 67677937,
@@ -1855,7 +1920,7 @@
                     "bgpPeerFsmEstablishedTime": 1424064,
                     "bgpPeerInUpdateElapsedTime": 2,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1865,6 +1930,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "fd34:d2ac:4327:6193:0000:0000:0000:0001",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 2116378,
                     "bgpPeerOutUpdates": 43,
                     "bgpPeerInTotalMessages": 4170222,
@@ -1872,7 +1938,7 @@
                     "bgpPeerFsmEstablishedTime": 1423439,
                     "bgpPeerInUpdateElapsedTime": 470,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1882,6 +1948,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "fde2:8b5a:dc45:e267:0000:0000:0000:0001",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 3,
                     "bgpPeerOutUpdates": 98826145,
                     "bgpPeerInTotalMessages": 989159,
@@ -1889,7 +1956,7 @@
                     "bgpPeerFsmEstablishedTime": 59350165,
                     "bgpPeerInUpdateElapsedTime": 59348951,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 },
                 {
                     "astext": "",
@@ -1899,6 +1966,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "fde2:8b5a:dc45:e267:0000:0000:0000:0001",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 3,
                     "bgpPeerOutUpdates": 98826168,
                     "bgpPeerInTotalMessages": 989149,
@@ -1906,7 +1974,7 @@
                     "bgpPeerFsmEstablishedTime": 59350183,
                     "bgpPeerInUpdateElapsedTime": 59348952,
                     "context_name": "",
-                    "bgpLocalAs": "65351"
+                    "bgpLocalAs": 65351
                 }
             ],
             "bgpPeers_cbgp": [
diff --git a/tests/data/junos_ex.json b/tests/data/junos_ex.json
index ee23a1914d..ec7b5a3205 100644
--- a/tests/data/junos_ex.json
+++ b/tests/data/junos_ex.json
@@ -10,6 +10,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -17,7 +18,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65501"
+                    "bgpLocalAs": 65501
                 },
                 {
                     "astext": "",
@@ -27,6 +28,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -34,7 +36,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65501"
+                    "bgpLocalAs": 65501
                 },
                 {
                     "astext": "",
@@ -44,6 +46,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -51,7 +54,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "65501"
+                    "bgpLocalAs": 65501
                 }
             ],
             "bgpPeers_cbgp": []
@@ -66,6 +69,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.1.43",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 10526,
                     "bgpPeerOutUpdates": 531,
                     "bgpPeerInTotalMessages": 824076,
@@ -73,7 +77,7 @@
                     "bgpPeerFsmEstablishedTime": 23675506,
                     "bgpPeerInUpdateElapsedTime": 21748,
                     "context_name": "",
-                    "bgpLocalAs": "65501"
+                    "bgpLocalAs": 65501
                 },
                 {
                     "astext": "",
@@ -83,6 +87,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.1.185",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 1,
                     "bgpPeerOutUpdates": 1,
                     "bgpPeerInTotalMessages": 29928,
@@ -90,7 +95,7 @@
                     "bgpPeerFsmEstablishedTime": 785386,
                     "bgpPeerInUpdateElapsedTime": 785386,
                     "context_name": "",
-                    "bgpLocalAs": "65501"
+                    "bgpLocalAs": 65501
                 },
                 {
                     "astext": "",
@@ -100,6 +105,7 @@
                     "bgpPeerAdminStatus": "start",
                     "bgpLocalAddr": "192.168.1.225",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 3,
                     "bgpPeerOutUpdates": 1,
                     "bgpPeerInTotalMessages": 25802,
@@ -107,7 +113,7 @@
                     "bgpPeerFsmEstablishedTime": 774041,
                     "bgpPeerInUpdateElapsedTime": 774040,
                     "context_name": "",
-                    "bgpLocalAs": "65501"
+                    "bgpLocalAs": 65501
                 }
             ],
             "bgpPeers_cbgp": []
diff --git a/tests/data/junos_mx.json b/tests/data/junos_mx.json
index 5143ddf7b1..1fad0c84a3 100644
--- a/tests/data/junos_mx.json
+++ b/tests/data/junos_mx.json
@@ -10,6 +10,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -17,7 +18,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "64513"
+                    "bgpLocalAs": 64513
                 },
                 {
                     "astext": "",
@@ -27,6 +28,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -34,7 +36,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "64513"
+                    "bgpLocalAs": 64513
                 },
                 {
                     "astext": "",
@@ -44,6 +46,7 @@
                     "bgpPeerAdminStatus": "stop",
                     "bgpLocalAddr": "0.0.0.0",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -51,7 +54,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "64513"
+                    "bgpLocalAs": 64513
                 }
             ],
             "bgpPeers_cbgp": [
@@ -283,6 +286,7 @@
                     "bgpPeerAdminStatus": "running",
                     "bgpLocalAddr": "192.168.99.24",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 56,
                     "bgpPeerOutUpdates": 1,
                     "bgpPeerInTotalMessages": 13199,
@@ -290,7 +294,7 @@
                     "bgpPeerFsmEstablishedTime": 361781,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "64513"
+                    "bgpLocalAs": 64513
                 },
                 {
                     "astext": "",
@@ -300,6 +304,7 @@
                     "bgpPeerAdminStatus": "running",
                     "bgpLocalAddr": "192.168.99.24",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 6,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 14583,
@@ -307,7 +312,7 @@
                     "bgpPeerFsmEstablishedTime": 437296,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "64513"
+                    "bgpLocalAs": 64513
                 },
                 {
                     "astext": "",
@@ -317,6 +322,7 @@
                     "bgpPeerAdminStatus": "running",
                     "bgpLocalAddr": "fd00:0028:0001:0001:0000:0000:0001:0004",
                     "bgpPeerRemoteAddr": "0.0.0.0",
+                    "bgpPeerDescr": "",
                     "bgpPeerInUpdates": 0,
                     "bgpPeerOutUpdates": 0,
                     "bgpPeerInTotalMessages": 0,
@@ -324,7 +330,7 @@
                     "bgpPeerFsmEstablishedTime": 633976,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": "64513"
+                    "bgpLocalAs": 64513
                 }
             ],
             "bgpPeers_cbgp": [