Revert IPv6 conversion fixture

ansible/plugins/connection/multi_passwd_ssh.py

@@ -1,12 +1,10 @@
 import imp
 import os
-import logging
 
 from functools import wraps
-from ansible.errors import AnsibleAuthenticationFailure, AnsibleConnectionFailure
+from ansible.errors import AnsibleAuthenticationFailure
 from ansible.plugins import connection
 
-logger = logging.getLogger(__name__)
 
 # HACK: workaround to import the SSH connection plugin
 _ssh_mod = os.path.join(os.path.dirname(connection.__file__), "ssh.py")
@@ -28,16 +26,8 @@
           vars:
               - name: ansible_altpasswords
               - name: ansible_ssh_altpasswords
-      hostv6:
-          description: IPv6 address
-          vars:
-              - name: ansible_hostv6
 """.lstrip("\n")
 
-# A sample error message that host unreachable:
-# 'Failed to connect to the host via ssh: ssh: connect to host 192.168.0.2 port 22: Connection timed out'
-CONNECTION_TIMEOUT_ERR_FLAG = "Connection timed out"
-
 
 def _password_retry(func):
     """
@@ -47,38 +37,6 @@ def _password_retry(func):
     """
     @wraps(func)
     def wrapped(self, *args, **kwargs):
-
-        # If the host have an IPv6 address, try connect IPv4 address first,
-        # If IPv4 host unavailable, fall back to use IPv6 address
-        try:
-            hostv6 = self.get_option("hostv6")
-        except KeyError:
-            hostv6 = None
-
-        if hostv6:
-            try:
-                return func(self, *args, **kwargs)
-            except AnsibleConnectionFailure as e:
-                logger.info("First connection failed: {}".format(str(e)))
-                if CONNECTION_TIMEOUT_ERR_FLAG in e.message:
-                    self._play_context.remote_addr = hostv6
-                    # args sample:
-                    # ( [b'sshpass', b'-d18', b'ssh', b'-o', b'ControlMaster=auto', b'-o', b'ControlPersist=120s', b'-o', b'UserKnownHostsFile=/dev/null', b'-o', b'StrictHostKeyChecking=no', b'-o', b'StrictHostKeyChecking=no', b'-o', b'User="admin"', b'-o', b'ConnectTimeout=60', b'-o', b'ControlPath="/home/user/.ansible/cp/376bdcc730"', 'fc00:1234:5678:abcd::2', b'/bin/sh -c \'echo PLATFORM; uname; echo FOUND; command -v \'"\'"\'python3.10\'"\'"\'; command -v \'"\'"\'python3.9\'"\'"\'; command -v \'"\'"\'python3.8\'"\'"\'; command -v \'"\'"\'python3.7\'"\'"\'; command -v \'"\'"\'python3.6\'"\'"\'; command -v \'"\'"\'python3.5\'"\'"\'; command -v \'"\'"\'/usr/bin/python3\'"\'"\'; command -v \'"\'"\'/usr/libexec/platform-python\'"\'"\'; command -v \'"\'"\'python2.7\'"\'"\'; command -v \'"\'"\'/usr/bin/python\'"\'"\'; command -v \'"\'"\'python\'"\'"\'; echo ENDFOUND && sleep 0\''], None) # noqa: E501
-                    # args[0] are the parameters of ssh connection
-                    ssh_args = args[0]
-                    # Change the IPv4 host in the ssh_args to IPv6
-                    for idx in range(len(ssh_args)):
-                        if type(ssh_args[idx]) == bytes and ssh_args[idx].decode() == self.host:
-                            ssh_args[idx] = hostv6
-                    self.host = hostv6
-                    self.set_option("host", hostv6)
-            except BaseException as e:
-                # Only catch the connection error, won't block the multi-password functionality
-                logger.info("First connection failed: {}".format(str(e)))
-
-            # Reset the sshpass_pipe for the new connections to be created
-            self.sshpass_pipe = os.pipe()
-
         password = self.get_option("password") or self._play_context.password
         conn_passwords = [password]
         altpassword = self.get_option("altpassword")

tests/common/devices/duthosts.py

@@ -54,15 +54,9 @@ def __init__(self, ansible_adhoc, tbinfo, duts):
                    DUTs in the testbed should be used
 
         """
-        self.ansible_adhoc = ansible_adhoc
-        self.tbinfo = tbinfo
-        self.duts = duts
-        self.__initialize_nodes()
-
-    def __initialize_nodes(self):
         # TODO: Initialize the nodes in parallel using multi-threads?
-        self.nodes = self._Nodes([MultiAsicSonicHost(self.ansible_adhoc, hostname, self, self.tbinfo['topo']['type'])
-                                  for hostname in self.tbinfo["duts"] if hostname in self.duts])
+        self.nodes = self._Nodes([MultiAsicSonicHost(ansible_adhoc, hostname, self, tbinfo['topo']['type'])
+                                  for hostname in tbinfo["duts"] if hostname in duts])
         self.supervisor_nodes = self._Nodes([node for node in self.nodes if node.is_supervisor_node()])
         self.frontend_nodes = self._Nodes([node for node in self.nodes if node.is_frontend_node()])
 
@@ -131,6 +125,3 @@ def config_facts(self, *module_args, **complex_args):
             complex_args['host'] = node.hostname
             result[node.hostname] = node.config_facts(*module_args, **complex_args)['ansible_facts']
         return result
-
-    def reset(self):
-        self.__initialize_nodes()

tests/common/fixtures/duthost_utils.py

@@ -1,18 +1,14 @@
-from typing import Dict, List
-
 import pytest
 import logging
 import itertools
 import collections
 import ipaddress
 import time
 import json
-
-from tests.common import config_reload
 from tests.common.helpers.assertions import pytest_assert
 from tests.common.utilities import wait_until
 from jinja2 import Template
-from netaddr import valid_ipv4, valid_ipv6
+from netaddr import valid_ipv4
 
 
 logger = logging.getLogger(__name__)
@@ -602,131 +598,3 @@ def check_bgp_router_id(duthost, mgFacts):
             return False
     except Exception as e:
         logger.error("Error loading BGP routerID - {}".format(e))
-
-
-@pytest.fixture(scope="module")
-def convert_and_restore_config_db_to_ipv6_only(duthosts):
-    """Back up the existing config_db.json file and restore it once the test ends.
-
-    Some cases will update the running config during the test and save the config
-    to be recovered after reboot. In such a case we need to backup config_db.json before
-    the test starts and then restore it after the test ends.
-    """
-    config_db_file = "/etc/sonic/config_db.json"
-    config_db_bak_file = "/etc/sonic/config_db.json.before_ipv6_only"
-
-    # Sample MGMT_INTERFACE:
-    #     "MGMT_INTERFACE": {
-    #         "eth0|192.168.0.2/24": {
-    #             "forced_mgmt_routes": [
-    #                 "192.168.1.1/24"
-    #             ],
-    #             "gwaddr": "192.168.0.1"
-    #         },
-    #         "eth0|fc00:1234:5678:abcd::2/64": {
-    #             "gwaddr": "fc00:1234:5678:abcd::1",
-    #             "forced_mgmt_routes": [
-    #                 "fc00:1234:5678:abc1::1/64"
-    #             ]
-    #         }
-    #     }
-
-    # duthost_name: config_db_modified
-    config_db_modified: Dict[str, bool] = {duthost.hostname: False
-                                           for duthost in duthosts.nodes}
-    # duthost_name: [ip_addr]
-    ipv4_address: Dict[str, List] = {duthost.hostname: []
-                                     for duthost in duthosts.nodes}
-    ipv6_address: Dict[str, List] = {duthost.hostname: []
-                                     for duthost in duthosts.nodes}
-    # Check IPv6 mgmt-ip is set, otherwise the DUT will lose control after v4 mgmt-ip is removed
-    for duthost in duthosts.nodes:
-        mgmt_interface = json.loads(duthost.shell(f"jq '.MGMT_INTERFACE' {config_db_file}",
-                                                  module_ignore_errors=True)["stdout"])
-        # Use list() to make a copy of mgmt_interface.keys() to avoid
-        # "RuntimeError: dictionary changed size during iteration" error
-        for key in list(mgmt_interface):
-            ip_addr = key.split("|")[1]
-            ip_addr_without_mask = ip_addr.split('/')[0]
-            if ip_addr:
-                is_ipv6 = valid_ipv6(ip_addr_without_mask)
-                if is_ipv6:
-                    logger.info(f"Host[{duthost.hostname}] IPv6[{ip_addr}]")
-                    ipv6_address[duthost.hostname].append(ip_addr_without_mask)
-        pytest_assert(len(ipv6_address[duthost.hostname]) > 0,
-                      f"{duthost.hostname} doesn't have IPv6 Management IP address")
-
-    # Remove IPv4 mgmt-ip
-    for duthost in duthosts.nodes:
-        logger.info(f"Backup {config_db_file} to {config_db_bak_file} on {duthost.hostname}")
-        duthost.shell(f"cp {config_db_file} {config_db_bak_file}")
-        mgmt_interface = json.loads(duthost.shell(f"jq '.MGMT_INTERFACE' {config_db_file}",
-                                                  module_ignore_errors=True)["stdout"])
-
-        # Use list() to make a copy of mgmt_interface.keys() to avoid
-        # "RuntimeError: dictionary changed size during iteration" error
-        for key in list(mgmt_interface):
-            ip_addr = key.split("|")[1]
-            ip_addr_without_mask = ip_addr.split('/')[0]
-            if ip_addr:
-                is_ipv4 = valid_ipv4(ip_addr_without_mask)
-                if is_ipv4:
-                    ipv4_address[duthost.hostname].append(ip_addr_without_mask)
-                    logger.info(f"Removing host[{duthost.hostname}] IPv4[{ip_addr}]")
-                    duthost.shell(f"""jq 'del(."MGMT_INTERFACE"."{key}")' {config_db_file} > temp.json"""
-                                  f"""&& mv temp.json {config_db_file}""", module_ignore_errors=True)
-                    config_db_modified[duthost.hostname] = True
-                    config_reload(duthost, wait=120)
-    duthosts.reset()
-
-    # Verify mgmt-interface status
-    mgmt_intf_name = "eth0"
-    for duthost in duthosts.nodes:
-        logger.info(f"Checking host[{duthost.hostname}] mgmt interface[{mgmt_intf_name}]")
-        mgmt_intf_ifconfig = duthost.shell(f"ifconfig {mgmt_intf_name}", module_ignore_errors=True)["stdout"]
-        assert_addr_in_ifconfig(addr_set=ipv4_address, hostname=duthost.hostname,
-                                expect_exists=False, ifconfig_output=mgmt_intf_ifconfig)
-        assert_addr_in_ifconfig(addr_set=ipv6_address, hostname=duthost.hostname,
-                                expect_exists=True, ifconfig_output=mgmt_intf_ifconfig)
-
-    yield
-
-    # Recover IPv4 mgmt-ip
-    for duthost in duthosts.nodes:
-        if config_db_modified[duthost.hostname]:
-            logger.info(f"Restore {config_db_file} with {config_db_bak_file} on {duthost.hostname}")
-            duthost.shell(f"mv {config_db_bak_file} {config_db_file}")
-            config_reload(duthost, safe_reload=True)
-    duthosts.reset()
-
-    # Verify mgmt-interface status
-    for duthost in duthosts.nodes:
-        logger.info(f"Checking host[{duthost.hostname}] mgmt interface[{mgmt_intf_name}]")
-        mgmt_intf_ifconfig = duthost.shell(f"ifconfig {mgmt_intf_name}", module_ignore_errors=True)["stdout"]
-        assert_addr_in_ifconfig(addr_set=ipv4_address, hostname=duthost.hostname,
-                                expect_exists=True, ifconfig_output=mgmt_intf_ifconfig)
-        assert_addr_in_ifconfig(addr_set=ipv6_address, hostname=duthost.hostname,
-                                expect_exists=True, ifconfig_output=mgmt_intf_ifconfig)
-
-
-def assert_addr_in_ifconfig(addr_set: Dict[str, List], hostname: str, expect_exists: bool, ifconfig_output: str):
-    """
-    Assert the address status in the ifconfig output,
-    if status not as expected, assert as failure
-
-    @param addr_set: addr_set, key is dut hostname, value is the list of ip addresses
-    @param hostname: hostname
-    @param expect_exists: Expectation of the ip,
-            True means expect all ip addresses in addr_set appears in the output of ifconfig
-            False means expect no ip addresses in addr_set appears in the output of ifconfig
-    @param ifconfig_output: output of 'ifconfig'
-    """
-    for addr in addr_set[hostname]:
-        if expect_exists:
-            pytest_assert(addr in ifconfig_output,
-                          f"{addr} not appeared in {hostname} mgmt interface")
-            logger.info(f"{addr} exists in the output of ifconfig")
-        else:
-            pytest_assert(addr not in ifconfig_output,
-                          f"{hostname} mgmt interface still with addr {addr}")
-            logger.info(f"{addr} not exists in the output of ifconfig which is expected")

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

@@ -757,12 +757,6 @@ ip/test_ip_packet.py::TestIPPacket::test_forward_ip_packet_with_0xffff_chksum_to
     conditions:
       - "asic_type in ['mellanox'] or asic_subtype in ['broadcom-dnx']"
 
-ip/test_mgmt_ipv6_only.py::test_image_download_ipv6_only:
-  skip:
-    reason: "Skipping mgmt ipv6 test for mgmt topo"
-    conditions:
-      - "topo_type in ['m0', 'mx']"
-
 #######################################
 #####            ipfwd            #####
 #######################################