Merge branch 'develop' into dependabot/pip/coveralls-3.0.0

napalm-automation · Jan 14, 2021 · 2756e51 · 2756e51
2 parents 8ed7864 + 7ad7db8
commit 2756e51
Show file tree

Hide file tree

Showing 7 changed files with 1,577 additions and 1 deletion.
diff --git a/napalm/eos/eos.py b/napalm/eos/eos.py
@@ -600,6 +600,7 @@ def get_re_group(res, key, default=None):
                         "is_up": peer_data["peerState"] == "Established",
                         "is_enabled": is_enabled,
                         "uptime": int(time.time() - float(peer_data["upDownTime"])),
+                        "description": peer_data.get("description", ""),
                     }
                     bgp_counters[vrf]["peers"][napalm.base.helpers.ip(peer)] = peer_info
         lines = []
@@ -663,6 +664,13 @@ def get_re_group(res, key, default=None):
                     "uptime": 0,
                     "is_enabled": True,
                 }
+            if (
+                "description" in bgp_counters[vrf]["peers"][peer_addr]
+                and not data["description"]
+            ):
+                data["description"] = bgp_counters[vrf]["peers"][peer_addr][
+                    "description"
+                ]
             bgp_counters[vrf]["peers"][peer_addr].update(data)
         if "default" in bgp_counters:
             bgp_counters["global"] = bgp_counters.pop("default")

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -8,4 +8,4 @@ pytest-json==0.4.0
 pytest-pythonpath==0.7.3
 pylama==7.7.1
 mock==4.0.3
-tox==3.20.1
+tox==3.21.1