Merge pull request #134 from QualiSystems/dev

Release 6.1.4

Author: Costya-Y

.coveragerc

@@ -1,4 +1,4 @@
-[report]
-omit =
-    */mibs/*
-    *__init__*
+[report]
+omit =
+    */mibs/*
+    *__init__*

cloudshell/networking/cisco/command_actions/add_remove_vlan_actions.py

@@ -6,6 +6,8 @@
 from cloudshell.cli.command_template.command_template_executor import (
     CommandTemplateExecutor,
 )
+from cloudshell.cli.session.session_exceptions import SessionException
+from cloudshell.shell.flows.connectivity.helpers.vlan_handler import VLANHandler
 
 from cloudshell.networking.cisco.command_templates import add_remove_vlan, iface
 
@@ -18,7 +20,7 @@ class AddRemoveVlanActions(object):
         r"^command\s*rejected.*encapsulation\s*is\s*\S*Auto", re.IGNORECASE
     )
     CREATE_VLAN_ERROR_PATTERN = re.compile(r"%.*\\.", re.IGNORECASE)
-    CHECK_VLAN_ASSIGNED = re.compile(
+    CHECK_ANY_VLAN_CFGED = re.compile(
         r"switchport.*vlan\s+\d+$|switchport\s+mode\s+trunk",
         re.MULTILINE | re.IGNORECASE | re.DOTALL,
     )
@@ -42,7 +44,7 @@ def verify_interface_configured(current_config):
         :param current_config:
         :return: True or False
         """
-        return bool(AddRemoveVlanActions.CHECK_VLAN_ASSIGNED.search(current_config))
+        return bool(AddRemoveVlanActions.CHECK_ANY_VLAN_CFGED.search(current_config))
 
     @staticmethod
     def verify_interface_has_vlan_assigned(vlan_range, current_config):
@@ -52,11 +54,33 @@ def verify_interface_has_vlan_assigned(vlan_range, current_config):
         :param current_config:
         :return: True or False
         """
-        return re.search(
-            r"switchport.*vlan\s+{0}$".format(str(vlan_range)),
-            current_config,
-            re.MULTILINE | re.IGNORECASE | re.DOTALL,
-        )
+        success = True
+        vlans_list = VLANHandler(
+            is_vlan_range_supported=True, is_multi_vlan_supported=False
+        ).get_vlan_list(vlan_range)
+        vlan_range_list = [v for v in vlans_list if "-" in v]
+        for vlan_range in vlan_range_list:
+            str_vlan_range_ls = vlan_range.split("-")
+
+            vlan_range_ls = list(map(int, str_vlan_range_ls))
+            vlan_min = min(vlan_range_ls)
+            vlan_max = max(vlan_range_ls)
+
+            for vlan in vlans_list:
+                vlans_range = range(vlan_min, vlan_max)
+                if vlan not in vlan_range_list and int(vlan) in vlans_range:
+                    vlans_list.remove(vlan)
+            if len(range(vlan_min, vlan_max)) == 1:
+                vlans_list.remove(vlan_range)
+                vlans_list.extend(str_vlan_range_ls)
+        for vlan in vlans_list:
+            if not re.search(
+                r"switchport.*vlan.*\b{vlan}\b".format(vlan=vlan),
+                current_config,
+                re.IGNORECASE,
+            ):
+                success = False
+        return success
 
     def create_vlan(self, vlan_range, action_map=None, error_map=None):
         """Create vlan entity on the device.
@@ -233,12 +257,23 @@ def set_vlan_to_sub_interface(
                 error_map=error_map,
             ).execute_command(vlan_id=vlan_range, qnq="")
         else:
-            CommandTemplateExecutor(
-                self._cli_service,
-                add_remove_vlan.VLAN_SUB_IFACE,
-                action_map=action_map,
-                error_map=error_map,
-            ).execute_command(vlan_id=vlan_range, untagged=untagged)
+            try:
+                CommandTemplateExecutor(
+                    self._cli_service,
+                    add_remove_vlan.VLAN_SUB_IFACE,
+                    action_map=action_map,
+                    error_map=error_map,
+                ).execute_command(vlan_id=vlan_range, untagged=untagged)
+            except SessionException:
+                self._logger.warning(
+                    "Unable to configure sub interface with untagged encapsulation."
+                )
+                CommandTemplateExecutor(
+                    self._cli_service,
+                    add_remove_vlan.VLAN_SUB_IFACE,
+                    action_map=action_map,
+                    error_map=error_map,
+                ).execute_command(vlan_id=vlan_range)
 
     def clean_vlan_sub_interface(self, port_name):
         CommandTemplateExecutor(

cloudshell/networking/cisco/command_actions/system_actions.py

@@ -147,7 +147,13 @@ def delete_file(self, path, action_map=None, error_map=None):
         ).execute_command(target=path)
 
     def override_running(
-        self, path, action_map=None, error_map=None, timeout=300, reconnect_timeout=1600
+        self,
+        path,
+        vrf=None,
+        action_map=None,
+        error_map=None,
+        timeout=300,
+        reconnect_timeout=1600,
     ):
         """Override running-config.
 
@@ -167,7 +173,7 @@ def override_running(
                 error_map=error_map,
                 timeout=timeout,
                 check_action_loop_detector=False,
-            ).execute_command(path=path)
+            ).execute_command(path=path, vrf=vrf)
             match_error = re.search(r"[Ee]rror.*", output, flags=re.DOTALL)
             if match_error:
                 error_str = match_error.group()

cloudshell/networking/cisco/command_templates/configuration.py

@@ -36,7 +36,7 @@
 )
 
 CONFIGURE_REPLACE = CommandTemplate(
-    "configure replace {path}",
+    "configure replace {path} [{vrf}]",
     action_map=OrderedDict(
         {
             r"[\[\(][Yy]es/[Nn]o[\)\]]": lambda session, logger: session.send_line(

cloudshell/networking/cisco/command_templates/firmware.py

@@ -1,12 +1,12 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-from cloudshell.cli.command_template.command_template import CommandTemplate
-
-BOOT_SYSTEM_FILE = CommandTemplate("boot system {firmware_file_name}")
-
-CONFIG_REG = CommandTemplate("config-reg 0x2102")
-
-SHOW_RUNNING = CommandTemplate("show running-config | include boot")
-
-SHOW_VERSION = CommandTemplate("show version")
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from cloudshell.cli.command_template.command_template import CommandTemplate
+
+BOOT_SYSTEM_FILE = CommandTemplate("boot system {firmware_file_name}")
+
+CONFIG_REG = CommandTemplate("config-reg 0x2102")
+
+SHOW_RUNNING = CommandTemplate("show running-config | include boot")
+
+SHOW_VERSION = CommandTemplate("show version")

cloudshell/networking/cisco/flows/cisco_autoload_flow.py

@@ -1,8 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 import os
+import re
+from collections import OrderedDict
 
 from cloudshell.shell.flows.autoload.basic_flow import AbstractAutoloadFlow
+from cloudshell.snmp.autoload.constants import entity_constants
 
 from cloudshell.networking.cisco.autoload.cisco_generic_snmp_autoload import (
     CiscoGenericSNMPAutoload,
@@ -15,8 +18,19 @@
     CiscoIfPortChannel,
 )
 
+entity_constants.ENTITY_VENDOR_TYPE_TO_CLASS_MAP = OrderedDict(
+    [
+        (re.compile(r"^\S+cevcontainer", re.IGNORECASE), "container"),
+        (re.compile(r"^\S+cevchassis", re.IGNORECASE), "chassis"),
+        (re.compile(r"^\S+cevmodule", re.IGNORECASE), "module"),
+        (re.compile(r"^\S+cevport", re.IGNORECASE), "port"),
+        (re.compile(r"^\S+cevpowersupply", re.IGNORECASE), "powerSupply"),
+    ]
+)
+
 
 class CiscoSnmpAutoloadFlow(AbstractAutoloadFlow):
+
     CISCO_MIBS_FOLDER = os.path.join(os.path.dirname(__file__), os.pardir, "mibs")
     DEVICE_NAMES_MAP_FILE = os.path.join(CISCO_MIBS_FOLDER, "device_names_map.csv")
 
@@ -35,12 +49,12 @@ def _autoload_flow(self, supported_os, resource_model):
                 r"stack|engine|management|"
                 r"mgmt|voice|foreign|cpu|"
                 r"control\s*ethernet\s*port|"
-                r"console\s*port"
+                r"usb\s*port"
             )
             cisco_snmp_autoload.entity_table_service.set_module_exclude_pattern(
                 r"powershelf|cevsfp|cevxfr|"
                 r"cevxfp|cevContainer10GigBasePort|"
-                r"cevModulePseAsicPlim"
+                r"cevModulePseAsicPlim|cevModuleCommonCardsPSEASIC"
             )
             (
                 cisco_snmp_autoload.if_table_service.port_attributes_service

cloudshell/networking/cisco/flows/cisco_connectivity_flow.py

@@ -18,11 +18,13 @@ def __init__(
         logger,
         support_vlan_range_str=False,
         support_multi_vlan_str=False,
+        is_switch=False,
     ):
         super(CiscoConnectivityFlow, self).__init__(logger)
         self._cli_handler = cli_handler
         self.IS_VLAN_RANGE_SUPPORTED = support_vlan_range_str
         self.IS_MULTI_VLAN_SUPPORTED = support_multi_vlan_str
+        self.is_switch = is_switch
 
     def _get_vlan_actions(self, config_session):
         return AddRemoveVlanActions(config_session, self._logger)
@@ -41,7 +43,7 @@ def _add_vlan_flow(self, vlan_range, port_mode, full_name, qnq, c_tag, vm_uid=No
         :param c_tag:
         :return:
         """
-        success = True
+        success = False
         self._logger.info("Add VLAN(s) {} configuration started".format(vlan_range))
 
         with self._cli_handler.get_cli_service(
@@ -62,23 +64,24 @@ def _add_vlan_flow(self, vlan_range, port_mode, full_name, qnq, c_tag, vm_uid=No
                     qnq,
                     c_tag,
                 )
-                if not vlan_actions.verify_interface_has_vlan_assigned(
+                if vlan_actions.verify_interface_has_vlan_assigned(
                     vlan_range, current_config
                 ):
-                    success = False
+                    success = True
             except CommandExecutionException:
-                current_config = self._add_sub_interface_vlan(
-                    vlan_actions,
-                    iface_action,
-                    vlan_range,
-                    port_name,
-                    port_mode,
-                    qnq,
-                    c_tag,
-                )
+                if not self.is_switch:
+                    current_config = self._add_sub_interface_vlan(
+                        vlan_actions,
+                        iface_action,
+                        vlan_range,
+                        port_name,
+                        port_mode,
+                        qnq,
+                        c_tag,
+                    )
 
-                if not "{}.{}".format(port_name, vlan_range) in current_config:
-                    success = False
+                    if "{}.{}".format(port_name, vlan_range) in current_config:
+                        success = True
             if not success:
                 raise Exception(
                     self.__class__.__name__,
@@ -174,16 +177,19 @@ def _remove_vlan_flow(self, vlan_range, full_name, port_mode, vm_uid=None):
 
             current_config = iface_action.get_current_interface_config(port_name)
             if "switchport" not in current_config:
-                sub_interface_name = "{}.{}".format(port_name, vlan_range)
-                self._remove_sub_interface(sub_interface_name, iface_action)
-                sub_interfaces_list = iface_action.get_current_interface_config(
-                    sub_interface_name
-                )
-                if sub_interface_name in sub_interfaces_list:
-                    is_failed = True
-                    self._logger.error(
-                        "Failed to remove sub interface: {}".format(sub_interface_name)
+                if not self.is_switch:
+                    sub_interface_name = "{}.{}".format(port_name, vlan_range)
+                    self._remove_sub_interface(sub_interface_name, iface_action)
+                    sub_interfaces_list = iface_action.get_current_interface_config(
+                        sub_interface_name
                     )
+                    if sub_interface_name in sub_interfaces_list:
+                        is_failed = True
+                        self._logger.error(
+                            "Failed to remove sub interface: {}".format(
+                                sub_interface_name
+                            )
+                        )
             else:
                 iface_action.enter_iface_config_mode(port_name)
                 iface_action.clean_interface_switchport_config(current_config)