Merge pull request #166 from napalm-automation/develop

Release 0.7.0
napalm-automation · Jun 26, 2017 · 81a69f8 · 81a69f8
2 parents a39365c + 08ee0af
commit 81a69f8
Show file tree

Hide file tree

Showing 39 changed files with 4,534 additions and 325 deletions.
diff --git a/napalm_ios/ios.py b/napalm_ios/ios.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-napalm_base>=0.23.2
-netmiko>=1.4.0
+napalm_base>=0.24.0
+netmiko>=1.4.1
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name="napalm-ios",
-    version="0.6.2",
+    version="0.7.0",
     packages=find_packages(),
     author="Kirk Byers",
     author_email="[email protected]",

diff --git a/test/unit/mocked_data/test_get_bgp_neighbors/normal/expected_result.json b/test/unit/mocked_data/test_get_bgp_neighbors/normal/expected_result.json
@@ -1 +1,39 @@
-{"global": {"router_id": "192.168.0.1", "peers": {"192.168.0.2": {"is_enabled": true, "uptime": -1, "remote_as": 65001, "description": "", "remote_id": "0.0.0.0", "local_as": 65000, "is_up": false, "address_family": {"ipv4": {"sent_prefixes": 0, "accepted_prefixes": 0, "received_prefixes": 0} }}, "192.168.0.3": {"is_enabled": true, "uptime": -1, "remote_as": 65010, "description": "", "remote_id": "192.168.0.3", "local_as": 65000, "is_up": false, "address_family": {"ipv4": {"sent_prefixes": 0, "accepted_prefixes": 0, "received_prefixes": 0} }}}}}
+{
+  "global": {
+    "router_id": "192.168.0.1",
+    "peers": {
+      "192.168.0.2": {
+        "is_enabled": true,
+        "uptime": -1,
+        "remote_as": 65001,
+        "description": "",
+        "remote_id": "0.0.0.0",
+        "local_as": 65000,
+        "is_up": false,
+        "address_family": {
+          "ipv4": {
+            "sent_prefixes": -1,
+            "accepted_prefixes": -1,
+            "received_prefixes": -1 
+          }
+        }
+      },
+      "192.168.0.3": {
+        "is_enabled": true,
+        "uptime": -1,
+        "remote_as": 65010,
+        "description": "",
+        "remote_id": "192.168.0.3",
+        "local_as": 65000,
+        "is_up": false,
+        "address_family": {
+          "ipv4": {
+            "sent_prefixes": -1,
+            "accepted_prefixes": -1,
+            "received_prefixes": -1
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/..._neighbors/normal/show_ip_bgp_summary.txt → ...neighbors/normal/show_bgp_all_summary.txt b/..._neighbors/normal/show_ip_bgp_summary.txt → ...neighbors/normal/show_bgp_all_summary.txt
@@ -1,3 +1,4 @@
+For address family: IPv4 Unicast
 BGP router identifier 192.168.0.1, local AS number 65000
 BGP table version is 1, main routing table version 1
 

diff --git a/test/unit/mocked_data/test_get_bgp_neighbors/normal/show_bgp_ipv4_unicast_neighbors.txt b/test/unit/mocked_data/test_get_bgp_neighbors/normal/show_bgp_ipv4_unicast_neighbors.txt
@@ -0,0 +1,25 @@
+BGP neighbor is 192.168.0.2,  remote AS 65001, internal link
+ Inherits from template iBGP for session parameters
+  BGP version 4, remote router ID 0.0.0.0
+
+ For address family: IPv4 Unicast
+                                 Sent       Rcvd
+  Prefix activity:               ----       ----
+    Prefixes Current:               0          0
+
+                                   Outbound    Inbound
+  Local Policy Denied Prefixes:    --------    -------
+    Total:                                0          0
+
+BGP neighbor is 192.168.0.3,  remote AS 65010, internal link
+ Inherits from template iBGP for session parameters
+  BGP version 4, remote router ID 192.168.0.3
+
+ For address family: IPv4 Unicast
+                                 Sent       Rcvd
+  Prefix activity:               ----       ----
+    Prefixes Current:               0          0
+
+                                   Outbound    Inbound
+  Local Policy Denied Prefixes:    --------    -------
+    Total:                                0          0
diff --git a/test/unit/mocked_data/test_get_bgp_neighbors/normal/show_bgp_ipv6_unicast_neighbors.txt b/test/unit/mocked_data/test_get_bgp_neighbors/normal/show_bgp_ipv6_unicast_neighbors.txt
diff --git a/...est_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_2___inc_Prefixes_Current.txt b/...est_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_2___inc_Prefixes_Current.txt
diff --git a/..._data/test_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_2___inc_router_ID.txt b/..._data/test_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_2___inc_router_ID.txt
diff --git a/...est_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_2___section_Local_Policy.txt b/...est_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_2___section_Local_Policy.txt
diff --git a/...est_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_3___inc_Prefixes_Current.txt b/...est_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_3___inc_Prefixes_Current.txt
diff --git a/..._data/test_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_3___inc_router_ID.txt b/..._data/test_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_3___inc_router_ID.txt
diff --git a/...est_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_3___section_Local_Policy.txt b/...est_get_bgp_neighbors/normal/show_ip_bgp_neighbors_192_168_0_3___section_Local_Policy.txt
diff --git a/test/unit/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_summary___begin_Neighbor.txt b/test/unit/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_summary___begin_Neighbor.txt
diff --git a/test/unit/mocked_data/test_get_bgp_neighbors/real_life/expected_result.json b/test/unit/mocked_data/test_get_bgp_neighbors/real_life/expected_result.json
@@ -0,0 +1,177 @@
+{
+  "global": {
+    "router_id": "10.0.1.1",
+    "peers": {
+      "10.0.0.2": {
+        "is_enabled": true,
+        "uptime": 4838400,
+        "remote_as": 65000,
+        "description": "internal-2",
+        "remote_id": "10.0.1.2",
+        "local_as": 65000,
+        "is_up": true,
+        "address_family": {
+          "ipv4": {
+            "sent_prefixes": 637213,
+            "accepted_prefixes": 3142,
+            "received_prefixes": 3142
+          },
+          "ipv6": {
+            "sent_prefixes": 36714,
+            "accepted_prefixes": 148,
+            "received_prefixes": 148
+          }
+        }
+      },
+      "10.0.0.3": {
+        "is_enabled": true,
+        "uptime": 133200,
+        "remote_as": 65000,
+        "description": "internal-3",
+        "remote_id": "10.0.1.3",
+        "local_as": 65000,
+        "is_up": true,
+        "address_family": {
+          "ipv4": {
+            "sent_prefixes": 966,
+            "accepted_prefixes": 1,
+            "received_prefixes": 1
+          },
+          "ipv6": {
+            "sent_prefixes": 105,
+            "accepted_prefixes": 2,
+            "received_prefixes": 2
+          }
+        }
+      },
+      "192.168.0.1": {
+        "is_enabled": true,
+        "uptime": 3888000,
+        "remote_as": 65001,
+        "description": "external-1",
+        "remote_id": "192.168.1.1",
+        "local_as": 65000,
+        "is_up": true,
+        "address_family": {
+          "ipv4": {
+            "sent_prefixes": 709,
+            "accepted_prefixes": 0,
+            "received_prefixes": 0
+          }
+        }
+      },
+      "192.168.0.2": {
+        "is_enabled": true,
+        "uptime": -1,
+        "remote_as": 65002,
+        "description": "external-2",
+        "remote_id": "0.0.0.0",
+        "local_as": 65000,
+        "is_up": false,
+        "address_family": {
+          "ipv4": {
+            "sent_prefixes": -1,
+            "accepted_prefixes": -1,
+            "received_prefixes": -1 
+          }
+        }
+      },
+      "192.168.0.3": {
+        "is_enabled": false,
+        "uptime": -1,
+        "remote_as": 65003,
+        "description": "external-3",
+        "remote_id": "0.0.0.0",
+        "local_as": 65000,
+        "is_up": false,
+        "address_family": {
+          "ipv4": {
+            "sent_prefixes": -1,
+            "accepted_prefixes": -1,
+            "received_prefixes": -1
+          }
+        }
+      },
+      "192.168.0.4": {
+        "is_enabled": true,
+        "uptime": 16243200,
+        "remote_as": 65004,
+        "description": "external-4",
+        "remote_id": "192.168.1.4",
+        "local_as": 65000,
+        "is_up": true,
+        "address_family": {
+          "ipv4": {
+            "sent_prefixes": 213,
+            "accepted_prefixes": 629700,
+            "received_prefixes": 629700
+          }
+        }
+      },
+      "2001:db8::1": {
+        "is_enabled": true,
+        "uptime": 3456000,
+        "remote_as": 65001,
+        "description": "external-1",
+        "remote_id": "192.168.1.1",
+        "local_as": 65000,
+        "is_up": true,
+        "address_family": {
+          "ipv6": {
+            "sent_prefixes": 35,
+            "accepted_prefixes": 0,
+            "received_prefixes": 0
+          }
+        }
+      },
+      "2001:db8::2": {
+        "is_enabled": true,
+        "uptime": 10713600,
+        "remote_as": 65002,
+        "description": "external-2",
+        "remote_id": "192.168.1.2",
+        "local_as": 65000,
+        "is_up": true,
+        "address_family": {
+          "ipv6": {
+            "sent_prefixes": 36,
+            "accepted_prefixes": 1,
+            "received_prefixes": 1
+          }
+        }
+      },
+      "2001:db8::3": {
+        "is_enabled": false,
+        "uptime": -1,
+        "remote_as": 65003,
+        "description": "external-3",
+        "remote_id": "0.0.0.0",
+        "local_as": 65000,
+        "is_up": false,
+        "address_family": {
+          "ipv6": {
+            "sent_prefixes": -1,
+            "accepted_prefixes": -1,
+            "received_prefixes": -1
+          }
+        }
+      },
+      "2001:db8::4": {
+        "is_enabled": true,
+        "uptime": 16243200,
+        "remote_as": 65004,
+        "description": "external-4",
+        "remote_id": "192.168.1.4",
+        "local_as": 65000,
+        "is_up": true,
+        "address_family": {
+          "ipv6": {
+            "sent_prefixes": 29,
+            "accepted_prefixes": 36387,
+            "received_prefixes": 36387
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/test/unit/mocked_data/test_get_bgp_neighbors/real_life/show_bgp_all_summary.txt b/test/unit/mocked_data/test_get_bgp_neighbors/real_life/show_bgp_all_summary.txt
@@ -0,0 +1,53 @@
+For address family: IPv4 Unicast
+BGP router identifier 10.0.1.1, local AS number 65000
+BGP table version is 1011343585, main routing table version 1011343585
+647707 network entries using 160631336 bytes of memory
+5657305 path entries using 678876600 bytes of memory
+80471 multipath network entries and 160942 multipath paths
+1000955/108586 BGP path/bestpath attribute entries using 248236840 bytes of memory
+70 BGP rrinfo entries using 2800 bytes of memory
+699319 BGP AS-PATH entries using 33422320 bytes of memory
+53834 BGP community entries using 10873404 bytes of memory
+212 BGP extended community entries using 7834 bytes of memory
+6267 BGP route-map cache entries using 401088 bytes of memory
+236 BGP filter-list cache entries using 7552 bytes of memory
+BGP using 1132459774 total bytes of memory
+13548 received paths for inbound soft reconfiguration
+BGP activity 8526435/7841854 prefixes, 408323088/402326018 paths, scan interval 60 secs
+
+Neighbor        V           AS MsgRcvd MsgSent   TblVer  InQ OutQ Up/Down  State/PfxRcd
+10.0.0.2        4        65000 1336020 64337701 1011343614    0    0 8w0d         3143
+192.168.0.1     4        65001   71798  138808 1011343239    0    0 6w3d            0
+192.168.0.2     4        65002       0       0        1    0    0 never    Active
+192.168.0.3     4        65003       0       0        1    0    0 never    Idle (Admin)
+10.0.0.3        4        65000    2497    4399 1011343631    0    0 1d13h           1
+192.168.0.4     4        65004 46122421  675536 1011343239    0    0 26w6d      629783
+
+For address family: IPv6 Unicast
+BGP router identifier 10.0.1.1, local AS number 65000
+BGP table version is 155362951, main routing table version 155362951
+36697 network entries using 9981584 bytes of memory
+339404 path entries using 48874176 bytes of memory
+17496 multipath network entries and 34992 multipath paths
+150389/17120 BGP path/bestpath attribute entries using 37296472 bytes of memory
+70 BGP rrinfo entries using 2800 bytes of memory
+699320 BGP AS-PATH entries using 33422380 bytes of memory
+53834 BGP community entries using 10873404 bytes of memory
+212 BGP extended community entries using 7834 bytes of memory
+6274 BGP route-map cache entries using 401536 bytes of memory
+236 BGP filter-list cache entries using 7552 bytes of memory
+BGP using 140867738 total bytes of memory
+718 received paths for inbound soft reconfiguration
+BGP activity 8526435/7841854 prefixes, 408323098/402326025 paths, scan interval 60 secs
+
+Neighbor        V           AS MsgRcvd MsgSent   TblVer  InQ OutQ Up/Down  State/PfxRcd
+2001:DB8::4
+                4        65004 9900690  612449 155362939    0    0 26w6d       36391
+2001:DB8::1
+                4        65001   63768   71032 155362939    0    0 5w5d            0
+2001:DB8::2
+                4        65002  197924  214323 155362939    0    0 17w5d           1
+2001:DB8::3
+                4        65003       0       0        1    0    0 never    Idle (Admin)
+10.0.0.2        4        65000 1336020 64337708 155362951    0    0 8w0d          148
+10.0.0.3        4        65000    2497    4399 155362952    0    0 1d13h           2