changes in mock tests

AUTHORS

@@ -1,4 +1,3 @@
-David Barroso <dbarrosop@dravetech.com>
+Shota Muto <dos9954@gmail.com>
-Elisa Jasinska <elisa@bigwaveit.org>
-Shota Muto
 Piotr Pieprzycki <piotr.pieprzycki@dreamlab.pl>
+David Barroso <dbarrosop@dravetech.com>

napalm_vyos/vyos.py

@@ -198,8 +198,16 @@ class VyOSDriver(NetworkDriver):
         r  b   swpd   free   buff  cache   si   so    bi    bo   in   cs us sy id wa
         0  0      0  61404 139624 139360    0    0     0     0    9   14  0  0 100  0
         """
-        output_cpu = self._device.send_command("vmstat").split("\n")[-1]
+        output_cpu_list = list()
-        cpu = 100 - int(output_cpu.split()[-2])
+        output_cpu = self._device.send_command("vmstat")
+        output_cpu = str(output_cpu)
+        output_cpu_list = output_cpu.split("\n")
+        if len(output_cpu_list[-1]) > 0:
+            output_cpu_list = output_cpu_list[-1]
+        else:
+            output_cpu_list = output_cpu_list[-2]
+        output_cpu_idle = output_cpu_list.split()[-2]
+        cpu = 100 - int(output_cpu_idle)
 
         """
         'free' output:
@@ -365,48 +373,50 @@ class VyOSDriver(NetworkDriver):
          133.130.120.204 133.243.238.164  2 u   46   64  377    7.717  987996. 1669.77
         """
 
-        output = self._device.send_command("ntpq -np").split("\n")[2:]
+        output = self._device.send_command("ntpq -np")
+        output = output.split("\n")[2:]
         ntp_stats = list()
 
         for ntp_info in output:
+            if len(ntp_info) > 0:
+                remote, refid, st, t, when, hostpoll, reachability, delay, offset, \
+                    jitter = ntp_info.split()
 
-            remote, refid, st, t, when, hostpoll, reachability, delay, offset, \
+                # 'remote' contains '*' if the machine synchronized with NTP server
-                jitter = ntp_info.split()
+                synchronized = "*" in remote
 
-            # 'remote' contains '*' if the machine synchronized with NTP server
+                match = re.search("(\d+\.\d+\.\d+\.\d+)", remote)
-            synchronized = "*" in remote
+                ip = match.group(1)
 
-            match = re.search("(\d+\.\d+\.\d+\.\d+)", remote)
+                when = when if when != '-' else 0
-            ip = match.group(1)
 
-            when = when if when != '-' else 0
+                ntp_stats.append({
-
+                    "remote": unicode(ip),
-            ntp_stats.append({
+                    "referenceid": unicode(refid),
-                "remote": unicode(ip),
+                    "synchronized": bool(synchronized),
-                "referenceid": unicode(refid),
+                    "stratum": int(st),
-                "synchronized": bool(synchronized),
+                    "type": unicode(t),
-                "stratum": int(st),
+                    "when": unicode(when),
-                "type": unicode(t),
+                    "hostpoll": int(hostpoll),
-                "when": unicode(when),
+                    "reachability": int(reachability),
-                "hostpoll": int(hostpoll),
+                    "delay": float(delay),
-                "reachability": int(reachability),
+                    "offset": float(offset),
-                "delay": float(delay),
+                    "jitter": float(jitter)
-                "offset": float(offset),
+                })
-                "jitter": float(jitter)
-            })
 
         return ntp_stats
 
     def get_ntp_peers(self):
-        output = self._device.send_command("ntpq -np").split("\n")[2:]
+        output = self._device.send_command("ntpq -np")
-
+        output_peers = output.split("\n")[2:]
         ntp_peers = dict()
 
-        for line in output:
+        for line in output_peers:
-            match = re.search("(\d+\.\d+\.\d+\.\d+)\s+", line)
+            if len(line) > 0:
-            ntp_peers.update({
+                match = re.search("(\d+\.\d+\.\d+\.\d+)\s+", line)
-                unicode(match.group(1)): {}
+                ntp_peers.update({
-            })
+                    unicode(match.group(1)): {}
+                })
 
         return ntp_peers
 
@@ -426,7 +436,8 @@ class VyOSDriver(NetworkDriver):
         192.168.1.4     4 64522       0       0        0    0    0 never    Active
         """
 
-        output = self._device.send_command("show ip bgp summary").split("\n")
+        output = self._device.send_command("show ip bgp summary")
+        output = output.split("\n")
 
         match = re.search(".* router identifier (\d+\.\d+\.\d+\.\d+), local AS number (\d+)",
                           output[0])
@@ -444,65 +455,66 @@ class VyOSDriver(NetworkDriver):
         bgp_info = [i.strip() for i in output[6:-2] if i is not ""]
 
         for i in bgp_info:
-            peer_id, bgp_version, remote_as, msg_rcvd, msg_sent, table_version, \
+            if len(i) > 0:
-                in_queue, out_queue, up_time, state_prefix = i.split()
+                peer_id, bgp_version, remote_as, msg_rcvd, msg_sent, table_version, \
+                    in_queue, out_queue, up_time, state_prefix = i.split()
 
-            is_enabled = "(Admin)" not in state_prefix
+                is_enabled = "(Admin)" not in state_prefix
 
-            received_prefixes = None
+                received_prefixes = None
 
-            try:
+                try:
-                state_prefix = int(state_prefix)
+                    state_prefix = int(state_prefix)
-                received_prefixes = int(state_prefix)
+                    received_prefixes = int(state_prefix)
-                is_up = True
+                    is_up = True
-            except ValueError:
+                except ValueError:
-                is_up = False
+                    is_up = False
 
-            if bgp_version == "4":
+                if bgp_version == "4":
-                address_family = "ipv4"
+                    address_family = "ipv4"
-            elif bgp_version == "6":
+                elif bgp_version == "6":
-                address_family = "ipv6"
+                    address_family = "ipv6"
-            else:
+                else:
-                raise ValueError("BGP neighbor parsing failed")
+                    raise ValueError("BGP neighbor parsing failed")
 
-            """
+                """
-            'show ip bgp neighbors 192.168.1.1' output example:
+                'show ip bgp neighbors 192.168.1.1' output example:
-            BGP neighbor is 192.168.1.1, remote AS 64519, local AS 64520, external link
+                BGP neighbor is 192.168.1.1, remote AS 64519, local AS 64520, external link
-            BGP version 4, remote router ID 192.168.1.1
+                BGP version 4, remote router ID 192.168.1.1
-            For address family: IPv4 Unicast
+                For address family: IPv4 Unicast
-            ~~~
+                ~~~
-            Community attribute sent to this neighbor(both)
+                Community attribute sent to this neighbor(both)
-            1 accepted prefixes
+                1 accepted prefixes
-            ~~~
+                ~~~
-            """
+                """
-            bgp_detail = self._device.send_command("show ip bgp neighbors %s" % peer_id)
+                bgp_detail = self._device.send_command("show ip bgp neighbors %s" % peer_id)
 
-            match_rid = re.search("remote router ID (\d+\.\d+\.\d+\.\d+).*", bgp_detail)
+                match_rid = re.search("remote router ID (\d+\.\d+\.\d+\.\d+).*", bgp_detail)
-            remote_rid = match_rid.group(1)
+                remote_rid = match_rid.group(1)
 
-            match_prefix_accepted = re.search("(\d+) accepted prefixes", bgp_detail)
+                match_prefix_accepted = re.search("(\d+) accepted prefixes", bgp_detail)
-            accepted_prefixes = match_prefix_accepted.group(1)
+                accepted_prefixes = match_prefix_accepted.group(1)
 
-            bgp_neighbor_data["global"]["peers"].setdefault(peer_id, {})
+                bgp_neighbor_data["global"]["peers"].setdefault(peer_id, {})
-            peer_dict = {
+                peer_dict = {
-                "description": unicode(""),
+                    "description": unicode(""),
-                "is_enabled": bool(is_enabled),
+                    "is_enabled": bool(is_enabled),
-                "local_as": int(local_as),
+                    "local_as": int(local_as),
-                "is_up": bool(is_up),
+                    "is_up": bool(is_up),
-                "remote_id": unicode(remote_rid),
+                    "remote_id": unicode(remote_rid),
-                "uptime": int(self._bgp_time_conversion(up_time)),
+                    "uptime": int(self._bgp_time_conversion(up_time)),
-                "remote_as": int(remote_as)
+                    "remote_as": int(remote_as)
-            }
+                }
 
-            af_dict = dict()
+                af_dict = dict()
-            af_dict[address_family] = {
+                af_dict[address_family] = {
-                "sent_prefixes": int(-1),
+                    "sent_prefixes": int(-1),
-                "accepted_prefixes": int(accepted_prefixes),
+                    "accepted_prefixes": int(accepted_prefixes),
-                "received_prefixes": int(received_prefixes)
+                    "received_prefixes": int(received_prefixes)
-            }
+                }
 
-            peer_dict["address_family"] = af_dict
+                peer_dict["address_family"] = af_dict
-            bgp_neighbor_data["global"]["peers"][peer_id] = peer_dict
+                bgp_neighbor_data["global"]["peers"][peer_id] = peer_dict
 
         return bgp_neighbor_data
 
@@ -553,8 +565,10 @@ class VyOSDriver(NetworkDriver):
         """
         output = self._device.send_command("show interfaces detail")
         interfaces = re.findall("(\S+): <.*", output)
-        count = re.findall("(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+", output)
+        # count = re.findall("(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+", output)
+        count = re.findall("(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)", output)
         counters = dict()
+
         j = 0
 
         for i in count:
@@ -681,13 +695,15 @@ class VyOSDriver(NetworkDriver):
         output = output.split("\n")
 
         # delete the header line and the interfaces which has no ip address
-        ifaces = [x for x in output[3:-1] if "-" not in x]
+        if len(output[-1]) > 0:
+            ifaces = [x for x in output[3:] if "-" not in x]
+        else:
+            ifaces = [x for x in output[3:-1] if "-" not in x]
 
         ifaces_ip = dict()
 
         for iface in ifaces:
             iface = iface.split()
-
             if len(iface) != 1:
 
                 iface_name = iface[0]
@@ -782,7 +798,12 @@ class VyOSDriver(NetworkDriver):
             # 'packet_info' example:
             # ['5', 'packets', 'transmitted,' '5', 'received,' '0%', 'packet',
             # 'loss,', 'time', '3997ms']
-            packet_info = output_ping.split("\n")[-2]
+            packet_info = output_ping.split("\n")
+
+            if len(packet_info[-1]) > 0:
+                packet_info = packet_info[-2]
+            else:
+                packet_info = packet_info[-3]
 
             packet_info = [x.strip() for x in packet_info.split()]
 
@@ -792,7 +813,13 @@ class VyOSDriver(NetworkDriver):
 
             # 'rtt_info' example:
             # ["0.307/0.396/0.480/0.061"]
-            rtt_info = output_ping.split("\n")[-1]
+            rtt_info = output_ping.split("\n")
+
+            if len(rtt_info[-1]) > 0:
+                rtt_info = rtt_info[-1]
+            else:
+                rtt_info = rtt_info[-2]
+
             match = re.search("([\d\.]+)/([\d\.]+)/([\d\.]+)/([\d\.]+)", rtt_info)
 
             if match is not None:

setup.py

@@ -14,8 +14,8 @@ setup(
     name="napalm-vyos",
     version="0.1.2",
     packages=find_packages(),
-    author="Piotr Pieprzycki, Shota Muto",
+    author="Piotr Pieprzycki",
-    author_email="piotr.pieprzycki@dreamlab.pl, dos9954@gmail.com",
+    author_email="piotr.pieprzycki@dreamlab.pl",
     description="Network Automation and Programmability Abstraction Layer with Multivendor support",
     classifiers=[
         'Topic :: Utilities',

test/unit/conftest.py

@@ -5,6 +5,7 @@ import pytest
 from napalm_base.test import conftest as parent_conftest
 
 from napalm_base.test.double import BaseTestDouble
+from napalm_base.utils import py23_compat
 
 from napalm_vyos import vyos
 
@@ -36,34 +37,25 @@ class PatchedVyOSDriver(vyos.VyOSDriver):
 
         self.patched_attrs = ['device']
         self.device = FakeVyOSDevice()
+        self._device = FakeVyOSDevice()
 
-        def disconnect(self):
+    def close(self):
-            pass
+        pass
 
-        def is_alive(self):
+    def is_alive(self):
-            return {
+        return {
-                'is_alive': True  # In testing everything works..
+            'is_alive': True  # In testing everything works..
-            }
+        }
-
-        def open(self):
-            pass
 
+    def open(self):
+        pass
 
 
 class FakeVyOSDevice(BaseTestDouble):
     """VyOS device test double."""
 
-    def run_commands(self, command_list, encoding='json'):
+    def send_command(self, command, **kwargs):
-        """Fake run_commands."""
+        filename = '{}.text'.format(self.sanitize_text(command))
-        result = list()
+        full_path = self.find_file(filename)
-
+        result = self.read_txt_file(full_path)
-        for command in command_list:
+        return py23_compat.text_type(result)
-            filename = '{}.{}'.format(self.sanitize_text(command), encoding)
-            full_path = self.find_file(filename)
-
-            if encoding == 'json':
-                result.append(self.read_json_file(full_path))
-            else:
-                result.append({'output': self.read_txt_file(full_path)})
-
-        return result

test/unit/mocked_data/test_get_bgp_neighbors/normal/expected_result.json

@@ -1 +1 @@
-{"global": {"router_id": "...", "peers": {"10.0.1.100": {"is_enabled": true, "uptime": "...", "remote_as": 65001, "description": "", "remote_id": "...", "local_as": 65002, "is_up": "...", "address_family": {"ipv4": {"sent_prefixes": -1, "accepted_prefixes": "...", "received_prefixes": "..."}}}}}}
+{"global": {"router_id": "...", "peers": {"10.0.1.100": {"is_enabled": true, "uptime": "...", "remote_as": 65001, "description": "", "remote_id": "...", "local_as": 65002, "is_up": true, "address_family": {"ipv4": {"sent_prefixes": -1, "accepted_prefixes": "...", "received_prefixes": "..."}}}}}}

test/unit/mocked_data/test_get_interfaces_counters/normal/expected_result.json

@@ -1 +1 @@
-{"eth1": {"tx_discards": 0, "tx_unicast_packets": "...", "rx_broadcast_packets": -1, "rx_discards": 0, "tx_multicast_packets": -1, "tx_octets": "...", "tx_errors": 0, "rx_octets": "...", "rx_errors": 0, "tx_broadcast_packets": -1, "rx_multicast_packets": "...", "rx_unicast_packets": "..."}, "eth0": {"tx_discards": 0, "tx_unicast_packets": "...", "rx_broadcast_packets": -1, "rx_discards": 0, "tx_multicast_packets": -1, "tx_octets": "...", "tx_errors": 0, "rx_octets": "...", "rx_errors": 0, "tx_broadcast_packets": -1, "rx_multicast_packets": "...", "rx_unicast_packets": "..."}, "eth2": {"tx_discards": 0, "tx_unicast_packets": "...", "rx_broadcast_packets": -1, "rx_discards": 0, "tx_multicast_packets": -1, "tx_octets": "...", "tx_errors": 0, "rx_octets": "...", "rx_errors": 0, "tx_broadcast_packets": -1, "rx_multicast_packets": "...", "rx_unicast_packets": "..."}}
+{"lo": {"tx_multicast_packets": "...", "tx_discards": "...", "tx_octets": "...", "tx_errors": "...", "rx_octets": "...", "tx_unicast_packets": "...", "rx_errors": "...", "tx_broadcast_packets": "...", "rx_multicast_packets": "...", "rx_broadcast_packets": "...", "rx_discards": "...", "rx_unicast_packets": "..."},"eth1": {"tx_discards": "...", "tx_unicast_packets": "...", "rx_broadcast_packets": "...", "rx_discards": "...", "tx_multicast_packets": "...", "tx_octets": "...", "tx_errors": "...", "rx_octets": "...", "rx_errors": "...", "tx_broadcast_packets": "...", "rx_multicast_packets": "...", "rx_unicast_packets": "..."}, "eth0": {"tx_discards": "...", "tx_unicast_packets": "...", "rx_broadcast_packets": "...", "rx_discards": "...", "tx_multicast_packets": "...", "tx_octets": "...", "tx_errors": "...", "rx_octets": "...", "rx_errors": "...", "tx_broadcast_packets": "...", "rx_multicast_packets": "...", "rx_unicast_packets": "..."}, "eth2": {"tx_discards": "...", "tx_unicast_packets": "...", "rx_broadcast_packets": "...", "rx_discards": "...", "tx_multicast_packets": "...", "tx_octets": "...", "tx_errors": "...", "rx_octets": "...", "rx_errors": "...", "tx_broadcast_packets": "...", "rx_multicast_packets": "...", "rx_unicast_packets": "..."}}

test/unit/mocked_data/test_get_interfaces_ip/normal/expected_result.json

@@ -1 +1 @@
-{"lo": {"ipv4": {"8.8.8.8": {"prefix_length": 32}, "127.0.0.1": {"prefix_length": 8}, "10.2.2.2": {"prefix_length": 32}}}, "eth1": {"ipv4": {"10.0.1.222": {"prefix_length": 24}}}, "eth0": {"ipv4": {"10.0.2.15": {"prefix_length": 24}}}}
+{"lo": {"ipv4": {"8.8.8.8": {"prefix_length": 32}, "127.0.0.1": {"prefix_length": 8}, "10.2.2.2": {"prefix_length": 32}}, "ipv6": {"::1": {"prefix_length": 128}}}, "eth1": {"ipv4": {"10.0.1.222": {"prefix_length": 24}}}, "eth0": {"ipv4": {"10.0.2.15": {"prefix_length": 24}}}}

test/unit/mocked_data/test_is_alive/normal/expected_result.json

@@ -0,0 +1 @@
+{"is_alive": true}