diff --git a/Amazon_Framework/DentOsTestbed/Requirements.txt b/Amazon_Framework/DentOsTestbed/Requirements.txt index 2dc1f810e..be6f4657f 100644 --- a/Amazon_Framework/DentOsTestbed/Requirements.txt +++ b/Amazon_Framework/DentOsTestbed/Requirements.txt @@ -7,4 +7,4 @@ pytest pytest-asyncio pytest-html ixnetwork_restpy -progressbar +progressbar2 diff --git a/Amazon_Framework/DentOsTestbed/configuration/testbed_config/basic/infra_sw1/infra_sw1_KEEPALIVED_CONF b/Amazon_Framework/DentOsTestbed/configuration/testbed_config/basic/infra_sw1/infra_sw1_KEEPALIVED_CONF deleted file mode 100644 index 58dc7b3c4..000000000 --- a/Amazon_Framework/DentOsTestbed/configuration/testbed_config/basic/infra_sw1/infra_sw1_KEEPALIVED_CONF +++ /dev/null @@ -1,19 +0,0 @@ - - -vrrp_instance VI_1 { - state MASTER - interface vlan100 - vrrp_garp_master_delay 5 - vrrp_garp_master_refresh 60 - vrrp_garp_lower_prio_repeat 3 - virtual_router_id 1 - priority 101 - advert_int 1 - authentication { - auth_type PASS - auth_pass 1111 - } - virtual_ipaddress { - 10.1.4.1 label vlan100:MASTER - } -} diff --git a/Amazon_Framework/DentOsTestbed/src/dent_os_testbed/installers/OsInstallerOnieSelect.py b/Amazon_Framework/DentOsTestbed/src/dent_os_testbed/installers/OsInstallerOnieSelect.py index 8abdde2c6..c5a009efc 100644 --- a/Amazon_Framework/DentOsTestbed/src/dent_os_testbed/installers/OsInstallerOnieSelect.py +++ b/Amazon_Framework/DentOsTestbed/src/dent_os_testbed/installers/OsInstallerOnieSelect.py @@ -1,4 +1,4 @@ -"""Module for installing OS through onie-select +"""Module for installing OS through dent_boot_select """ import os import time @@ -6,7 +6,7 @@ class OsInstallerOnieSelect: """ - Implements APIs for installing OS through onie-select + Implements APIs for installing OS through dent_boot_select """ DEVICE_UP_WAIT_TIME_SECS = 60 * 3 @@ -42,7 +42,7 @@ async def install_os(self, device, os_image_download_url, staging_device, stagin Args: device (Device): Device on which the OS needs to be installed os_image_download_url (str): HTTP URL to download the OS image from - staging_device (Device): Device to stage the OS image,from which onie-select picks it up + staging_device (Device): Device to stage the OS image,from which dent_boot_select picks it up staging_path(str): Path on the staging device to which the OS image is copied to. Raises: @@ -66,7 +66,7 @@ async def verify_os(self, device, os_image_download_url, staging_device, staging Args: device (Device): Device on which the OS needs to be installed os_image_download_url (str): HTTP URL to download the OS image from - staging_device (Device): Device to stage the OS image,from which onie-select picks it up + staging_device (Device): Device to stage the OS image,from which dent_boot_select picks it up staging_path(str): Path on the staging device to which the OS image is copied to. Raises: @@ -86,7 +86,7 @@ async def verify_os(self, device, os_image_download_url, staging_device, staging async def _run_onie_select(self, device): try: - await device.run_cmd("onie-select install", sudo=True) + await device.run_cmd("dent_boot_select install", sudo=True) except Exception as e: self.applog.exception( f"{OsInstallerOnieSelect._run_onie_select.__qualname__}", exc_info=e diff --git a/Amazon_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/basic_triggers/test_clean_config.py b/Amazon_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/basic_triggers/test_clean_config.py index 857202708..6199e29d3 100644 --- a/Amazon_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/basic_triggers/test_clean_config.py +++ b/Amazon_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/basic_triggers/test_clean_config.py @@ -48,9 +48,9 @@ async def test_clean_config(testbed): - call the helper """ - package = "/home/neteng/staging/staging.tar.gz" - if not os.path.exists(package): - assert 0, f"{package} could not be found!" + # package = "/home/neteng/staging/staging.tar.gz" + # if not os.path.exists(package): + # assert 0, f"{package} could not be found!" devices = await tb_get_all_devices(testbed) cos = [] @@ -58,10 +58,10 @@ async def test_clean_config(testbed): cos.append(disable_ztp(device)) results = await asyncio.gather(*cos, return_exceptions=True) check_asyncio_results(results, "disable_ztp") - cos = [] - for device in devices: - cos.append(setup_dent_tools(device, package)) - results = await asyncio.gather(*cos, return_exceptions=True) - check_asyncio_results(results, "setup_dent_tools") + # cos = [] + # for device in devices: + # cos.append(setup_dent_tools(device, package)) + # results = await asyncio.gather(*cos, return_exceptions=True) + # check_asyncio_results(results, "setup_dent_tools") await tb_clean_config(testbed)