Merge 2ae5f40 into 670a97d

napalm-automation · Apr 11, 2018 · 7a8f79b · 7a8f79b
2 parents 670a97d + 2ae5f40
commit 7a8f79b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 23 deletions.
diff --git a/napalm/ios/ios.py b/napalm/ios/ios.py
@@ -2083,9 +2083,9 @@ def get_users(self):
         lowest access and 15 represents full access to the device.
         """
         username_regex = r"^username\s+(?P<username>\S+)\s+(?:privilege\s+(?P<priv_level>\S+)" \
-            "\s+)?(?:secret \d+\s+(?P<pwd_hash>\S+))?$"
+            r"\s+)?(?:secret \d+\s+(?P<pwd_hash>\S+))?$"
         pub_keychain_regex = r"^\s+username\s+(?P<username>\S+)(?P<keys>(?:\n\s+key-hash\s+" \
-            "(?P<hash_type>\S+)\s+(?P<hash>\S+)(?:\s+\S+)?)+)$"
+            r"(?P<hash_type>\S+)\s+(?P<hash>\S+)(?:\s+\S+)?)+)$"
         users = {}
         command = "show run | section username"
         output = self._send_command(command)

diff --git a/napalm/iosxr/iosxr.py b/napalm/iosxr/iosxr.py
@@ -1315,23 +1315,32 @@ def get_route_to(self, destination='', protocol=''):
             raise TypeError('Wrong destination IP Address!')
 
         if ipv == 6:
-            route_info_rpc_command = '<Get><Operational><IPV6_RIB><VRFTable><VRF><Naming><VRFName>\
-            default</VRFName></Naming><AFTable><AF><Naming><AFName>IPv6</AFName></Naming><SAFTable>\
-            <SAF><Naming><SAFName>Unicast</SAFName></Naming><IP_RIBRouteTable><IP_RIBRoute><Naming>\
-            <RouteTableName>default</RouteTableName></Naming><RouteTable><Route><Naming><Address>\
-            {network}</Address>{prefix}</Naming></Route></RouteTable></IP_RIBRoute>\
-            </IP_RIBRouteTable></SAF></SAFTable></AF></AFTable></VRF></VRFTable></IPV6_RIB>\
-            </Operational></Get>'.format(network=network, prefix=prefix_tag)
+            route_info_rpc_command = (
+                '<Get><Operational><IPV6_RIB><VRFTable><VRF><Naming><VRFName>'
+                'default</VRFName></Naming><AFTable><AF><Naming><AFName>IPv6</AFName></Naming>'
+                '<SAFTable>'
+                '<SAF><Naming><SAFName>Unicast</SAFName></Naming><IP_RIBRouteTable><IP_RIBRoute>'
+                '<Naming>'
+                '<RouteTableName>default</RouteTableName></Naming><RouteTable><Route><Naming>'
+                '<Address>'
+                '{network}</Address>{prefix}</Naming></Route></RouteTable></IP_RIBRoute>'
+                '</IP_RIBRouteTable></SAF></SAFTable></AF></AFTable></VRF></VRFTable></IPV6_RIB>'
+                '</Operational></Get>'
+            ).format(network=network, prefix=prefix_tag)
         else:
-            route_info_rpc_command = '<Get><Operational><RIB><VRFTable><VRF><Naming><VRFName>default\
-            </VRFName></Naming><AFTable><AF><Naming><AFName>IPv4</AFName></Naming><SAFTable><SAF>\
-            <Naming><SAFName>Unicast</SAFName></Naming><IP_RIBRouteTable><IP_RIBRoute><Naming>\
-            <RouteTableName>default</RouteTableName></Naming><RouteTable><Route><Naming><Address>\
-            {network}</Address>{prefix}</Naming></Route></RouteTable></IP_RIBRoute></IP_RIBRouteTable>\
-            </SAF></SAFTable></AF></AFTable></VRF></VRFTable></RIB></Operational></Get>'.format(
-                network=network,
-                prefix=prefix_tag
-            )
+            route_info_rpc_command = (
+                '<Get><Operational><RIB><VRFTable><VRF><Naming><VRFName>'
+                'default'
+                '</VRFName></Naming><AFTable><AF><Naming><AFName>IPv4</AFName></Naming>'
+                '<SAFTable><SAF>'
+                '<Naming><SAFName>Unicast</SAFName></Naming><IP_RIBRouteTable><IP_RIBRoute>'
+                '<Naming>'
+                '<RouteTableName>default</RouteTableName></Naming><RouteTable><Route><Naming>'
+                '<Address>'
+                '{network}</Address>{prefix}</Naming></Route></RouteTable></IP_RIBRoute>'
+                '</IP_RIBRouteTable>'
+                '</SAF></SAFTable></AF></AFTable></VRF></VRFTable></RIB></Operational></Get>'
+            ).format(network=network, prefix=prefix_tag)
 
         routes_tree = ETREE.fromstring(self.device.make_rpc_call(route_info_rpc_command))
 

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name="napalm",
-    version='2.3.0',
+    version='2.3.1',
     packages=find_packages(exclude=("test*", )),
     test_suite='test_base',
     author="David Barroso, Kirk Byers, Mircea Ulinic",

diff --git a/test/base/validate/test_unit.py b/test/base/validate/test_unit.py
@@ -5,9 +5,9 @@
 
 _compare_getter = [
     (
-        {"list": ["\d{2}", 1, 2]},
+        {"list": [r"\d{2}", 1, 2]},
         [1, 2, 33],
-        {u'complies': True, u'extra': [], u'missing': [], u'present': ['\d{2}', 1, 2]}
+        {u'complies': True, u'extra': [], u'missing': [], u'present': [r'\d{2}', 1, 2]}
     ),
     (
         {"list": [1, 2, 3]},
@@ -29,9 +29,9 @@
          u'present': [1, 2, {'list': [1, 2]}]}
     ),
     (
-        {"list": ['\d{2}', 4, 3]},
+        {"list": [r'\d{2}', 4, 3]},
         [1, 2, 3],
-        {u'complies': False, u'extra': [], u'missing': ['\d{2}', 4], u'present': [3]}
+        {u'complies': False, u'extra': [], u'missing': [r'\d{2}', 4], u'present': [3]}
     ),
     (
         {"list": [{"list": [1, 2]}, 3]},

diff --git a/...__AFName_IPv4__AFName___Naming__SAFTa.txt → ...4__AFName___Naming__SAFTable__SAF__Na.txt b/...__AFName_IPv4__AFName___Naming__SAFTa.txt → ...4__AFName___Naming__SAFTable__SAF__Na.txt