Merge pull request #69 from QualiSystems/dev

A preview release of cloudshell-networking-cisco-5.0.24

Author: Costya-Y

cloudshell/networking/cisco/autoload/cisco_generic_snmp_autoload.py

@@ -14,6 +14,7 @@
 class CiscoGenericSNMPAutoload(object):
     IF_ENTITY = "ifDescr"
     ENTITY_PHYSICAL = "entPhysicalDescr"
+    SNMP_ERRORS = [r'No\s+Such\s+Object\s+currently\s+exists']
 
     def __init__(self, snmp_handler, shell_name, shell_type, resource_name, logger):
         """Basic init with injected snmp handler and logger
@@ -29,6 +30,7 @@ def __init__(self, snmp_handler, shell_name, shell_type, resource_name, logger):
         self.resource_name = resource_name
         self.logger = logger
         self.elements = {}
+        self.snmp_handler.set_snmp_errors(self.SNMP_ERRORS)
         self.resource = GenericResource(shell_name=shell_name,
                                         shell_type=shell_type,
                                         name=resource_name,

cloudshell/networking/cisco/autoload/snmp_port_attr_tables.py

@@ -1,62 +1,69 @@
+from collections import defaultdict
+
+
 class SnmpPortAttrTables(object):
     def __init__(self, snmp_handler, logger):
         self._snmp = snmp_handler
         self._logger = logger
-        self._lldp_remote_table = dict()
-        self._lldp_local_table = dict()
-        self._cdp_table = dict()
-        self._duplex_table = dict()
-        self._ip_v4_table = dict()
-        self._ip_v6_table = dict()
-        self._port_channel_ports = dict()
+        self._lldp_remote_table = None
+        self._lldp_local_table = None
+        self._cdp_table = None
+        self._duplex_table = None
+        self._ip_v4_table = None
+        self._ip_v6_table = None
+        self._port_channel_ports = None
 
     @property
     def lldp_remote_table(self):
-        if not self._lldp_remote_table:
-            self._lldp_remote_table = self._snmp.get_table('LLDP-MIB', 'lldpRemSysName')
+        if self._lldp_remote_table is None:
+            self._lldp_remote_table = self._snmp.get_table('LLDP-MIB', 'lldpRemSysName') or defaultdict()
             self._logger.info('lldpRemSysName table loaded')
         return self._lldp_remote_table
 
     @property
     def lldp_local_table(self):
-        if not self._lldp_remote_table:
-            lldp_local_table = self._snmp.get_table('LLDP-MIB', 'lldpLocPortDesc')
+        if self._lldp_local_table is None:
+            lldp_local_table = self._snmp.get_table('LLDP-MIB', 'lldpLocPortDesc') or defaultdict()
             if lldp_local_table:
-                self._lldp_local_table = dict([(v['lldpLocPortDesc'].lower(), k) for k, v in lldp_local_table.iteritems()])
+                self._lldp_local_table = dict(
+                    [(v['lldpLocPortDesc'].lower(), k) for k, v in lldp_local_table.iteritems()])
+            else:
+                self._lldp_local_table = defaultdict()
             self._logger.info('lldpLocPortDesc table loaded')
-        return self._lldp_remote_table
+        return self._lldp_local_table
 
     @property
     def cdp_table(self):
-        if not self._cdp_table:
-            self._cdp_table = self._snmp.get_table('CISCO-CDP-MIB', 'cdpCacheDeviceId')
+        if self._cdp_table is None:
+            self._cdp_table = self._snmp.get_table('CISCO-CDP-MIB', 'cdpCacheDeviceId') or defaultdict()
             self._logger.info('cdpCacheDeviceId table loaded')
         return self._cdp_table
 
     @property
     def duplex_table(self):
-        if not self._duplex_table:
-            self._duplex_table = self._snmp.get_table('EtherLike-MIB', 'dot3StatsIndex')
+        if self._duplex_table is None:
+            self._duplex_table = self._snmp.get_table('EtherLike-MIB', 'dot3StatsIndex') or defaultdict()
             self._logger.info('dot3StatsIndex table loaded')
         return self._duplex_table
 
     @property
     def ip_v4_table(self):
-        if not self._ip_v4_table:
-            self._ip_v4_table = self._snmp.get_table('IP-MIB', 'ipAddrTable')
+        if self._ip_v4_table is None:
+            self._ip_v4_table = self._snmp.get_table('IP-MIB', 'ipAddrTable') or defaultdict()
             self._logger.info('ipAddrTable table loaded')
         return self._ip_v4_table
 
     @property
     def ip_v6_table(self):
-        if not self._ip_v6_table:
-            self._ip_v6_table = self._snmp.get_table('IPV6-MIB', 'ipv6AddrEntry')
+        if self._ip_v6_table is None:
+            self._ip_v6_table = self._snmp.get_table('IPV6-MIB', 'ipv6AddrEntry') or defaultdict()
             self._logger.info('ipv6AddrEntry table loaded')
         return self._ip_v6_table
 
     @property
     def port_channel_ports(self):
-        if not self._port_channel_ports:
-            self._port_channel_ports = self._snmp.get_table('IEEE8023-LAG-MIB', 'dot3adAggPortAttachedAggID')
+        if self._port_channel_ports is None:
+            self._port_channel_ports = self._snmp.get_table('IEEE8023-LAG-MIB',
+                                                            'dot3adAggPortAttachedAggID') or defaultdict()
             self._logger.info('dot3adAggPortAttachedAggID table loaded')
         return self._port_channel_ports

cloudshell/networking/cisco/command_actions/add_remove_vlan_actions.py

@@ -92,6 +92,11 @@ def set_vlan_to_interface(self, vlan_range, port_mode, port_name, qnq, c_tag,
                                 vlan_command_template.SWITCHPORT_MODE,
                                 action_map=action_map,
                                 error_map=error_map).execute_command(port_mode=port_mode)
+        if qnq:
+            CommandTemplateExecutor(self._cli_service,
+                                    vlan_command_template.L2_TUNNEL,
+                                    action_map=action_map,
+                                    error_map=error_map).execute_command()
 
         if 'trunk' not in port_mode:
 

cloudshell/networking/cisco/command_actions/iface_actions.py

@@ -5,6 +5,7 @@
 
 from cloudshell.cli.command_template.command_template_executor import CommandTemplateExecutor
 from cloudshell.networking.cisco.command_templates import iface as iface_command_template
+from cloudshell.networking.cisco.command_templates import add_remove_vlan as vlan_command_template
 from cloudshell.networking.cisco.command_templates import configuration
 
 
@@ -82,5 +83,8 @@ def clean_interface_switchport_config(self, current_config, action_map=None, err
                 CommandTemplateExecutor(self._cli_service,
                                         configuration.NO, action_map=action_map,
                                         error_map=error_map).execute_command(command=line_to_remove)
-
-                self._logger.debug("Completed cleaning interface switchport configuration")
+        if "switchport mode dot1q-tunnel" in current_config.lower():
+            CommandTemplateExecutor(self._cli_service,
+                                    vlan_command_template.NO_L2_TUNNEL, action_map=action_map,
+                                    error_map=error_map).execute_command()
+        self._logger.debug("Completed cleaning interface switchport configuration")

cloudshell/networking/cisco/command_templates/add_remove_vlan.py

@@ -7,7 +7,7 @@
 ACTION_MAP = OrderedDict({"[\[\(][Yy]es/[Nn]o[\)\]]|\[confirm\]": lambda session: session.send_line("yes"),
                           "[\[\(][Yy]/[Nn][\)\]]": lambda session: session.send_line("y")})
 ERROR_MAP = OrderedDict({"[Ii]nvalid\s*([Ii]nput|[Cc]ommand)|[Cc]ommand rejected":
-                         Exception("SWITCHPORT_MODE", "Failed to switch port mode"),
+                             Exception("SWITCHPORT_MODE", "Failed to switch port mode"),
                          })
 
 VLAN_SUB_IFACE = CommandTemplate(command="encapsulation dot1q {vlan_id} [, untagged{untagged}] [second-dot1q any{qnq}]")
@@ -23,3 +23,11 @@
 SWITCHPORT_MODE = CommandTemplate("switchport [mode {port_mode}]",
                                   action_map=ACTION_MAP,
                                   error_map=ERROR_MAP)
+
+L2_TUNNEL = CommandTemplate("l2protocol-tunnel",
+                            action_map=ACTION_MAP,
+                            error_map=ERROR_MAP)
+
+NO_L2_TUNNEL = CommandTemplate("no l2protocol-tunnel",
+                               action_map=ACTION_MAP,
+                               error_map=ERROR_MAP)

cloudshell/networking/cisco/firmware_data/__init__.py

@@ -7,8 +7,8 @@
 
 class CiscoSnmpAutoloadFlow(AutoloadFlow):
     def execute_flow(self, supported_os, shell_name, shell_type, resource_name):
-        with self._snmp_handler.get_snmp_service() as snpm_service:
-            cisco_snmp_autoload = CiscoGenericSNMPAutoload(snpm_service,
+        with self._snmp_handler.get_snmp_service() as snmp_service:
+            cisco_snmp_autoload = CiscoGenericSNMPAutoload(snmp_service,
                                                            shell_name,
                                                            shell_type,
                                                            resource_name,

cloudshell/networking/cisco/firmware_data/cisco_firmware_data.py

@@ -1,5 +1,5 @@
--e git+https://github.com/QualiSystems/cloudshell-shell-core.git@dev#egg=cloudshell-shell-core
--e git+https://github.com/QualiSystems/cloudshell-cli.git@dev#egg=cloudshell-cli
--e git+https://github.com/QualiSystems/cloudshell-snmp.git@dev#egg=cloudshell-snmp
--e git+https://github.com/QualiSystems/cloudshell-networking.git@dev#egg=cloudshell-networking
--e git+https://github.com/QualiSystems/cloudshell-networking-devices.git@dev#egg=cloudshell-networking-devices
+git+https://github.com/QualiSystems/cloudshell-shell-core.git@dev#egg=cloudshell-shell-core
+git+https://github.com/QualiSystems/cloudshell-cli.git@dev#egg=cloudshell-cli
+git+https://github.com/QualiSystems/cloudshell-snmp.git@dev#egg=cloudshell-snmp
+git+https://github.com/QualiSystems/cloudshell-networking.git@dev#egg=cloudshell-networking
+git+https://github.com/QualiSystems/cloudshell-networking-devices.git@dev#egg=cloudshell-networking-devices