Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/vm_set/tasks/add_ceos_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
become: yes
docker_container:
name: net_{{ vm_set_name }}_{{ vm_name }}
image: "{{ docker_registry_host }}/debian:jessie"
image: "{{ debian_docker_registry_host }}/debian:trixie"
pull: no
state: started
restart: no
Expand Down
1 change: 1 addition & 0 deletions ansible/vars/docker_registry.yml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
docker_registry_host: sonicdev-microsoft.azurecr.io:443
debian_docker_registry_host: publicmirror.azurecr.io:443
6 changes: 2 additions & 4 deletions setup-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ declare EXISTING_CONTAINER_NAME=""

ENV_VARS=""
CONTAINER_NAME=""
IMAGE_ID=""
IMAGE_ID="sonicdev-microsoft.azurecr.io:443/docker-sonic-mgmt:master"
LINK_DIR=""
MOUNT_POINTS="-v \"/var/run/docker.sock:/var/run/docker.sock:rslave\""
PUBLISH_PORTS=""
Expand Down Expand Up @@ -104,9 +104,7 @@ function show_help_and_exit() {
echo "Other options:"
echo " -e <VAR=value> set environment variable inside the container (can be used multiple times)"
echo " -i <image_id> specify Docker image to use. This can be an image ID (hashed value) or an image name."
echo " If no value is provided, defaults to the following images in the specified order:"
echo " 1. The local image named \"docker-sonic-mgmt\""
echo " 2. The remote image at \"sonicdev-microsoft.azurecr.io:443/docker-sonic-mgmt:latest\""
echo " (default: \"sonicdev-microsoft.azurecr.io:443/docker-sonic-mgmt:master\")"
echo " -d <directory> specify directory inside container to bind mount to sonic-mgmt root (default: \"/var/src\")"
echo " -m <mount_point> specify directory to bind mount to container"
echo " -p <port> publish container port to the host"
Expand Down
5 changes: 4 additions & 1 deletion tests/common/connections/base_console_conn.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
import logging

from netmiko.cisco_base_connection import CiscoBaseConnection
from netmiko.ssh_exception import NetMikoAuthenticationException
try:
from netmiko.ssh_exception import NetMikoAuthenticationException
except ImportError:
from netmiko.exceptions import NetMikoAuthenticationException

# For interactive shell
import sys
Expand Down
5 changes: 4 additions & 1 deletion tests/common/connections/ssh_console_conn.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import time
import re
from .base_console_conn import CONSOLE_SSH_DIGI_CONFIG, BaseConsoleConn, CONSOLE_SSH
from netmiko.ssh_exception import NetMikoAuthenticationException
try:
from netmiko.ssh_exception import NetMikoAuthenticationException
except ImportError:
from netmiko.exceptions import NetMikoAuthenticationException
from paramiko.ssh_exception import SSHException


Expand Down
5 changes: 4 additions & 1 deletion tests/common/connections/telnet_console_conn.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import time
import re
from .base_console_conn import BaseConsoleConn
from netmiko.ssh_exception import NetMikoAuthenticationException
try:
from netmiko.ssh_exception import NetMikoAuthenticationException
except ImportError:
from netmiko.exceptions import NetMikoAuthenticationException


class TelnetConsoleConn(BaseConsoleConn):
Expand Down