starlingx/virtual-deployment
Code Issues Proposed changes

Merge "Change TCP port value"

Browse Source
This commit is contained in:
Zuul 2023-08-08 14:13:11 +00:00 committed by Gerrit Code Review
commit 2462c55035
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
virtualbox/pybox/consts/networking.py
View File

@ -182,5 +182,6 @@ class Serial:
"uartbase": "0x3F8",
"uartport": "4",
"uartmode": "tcpserver",
# The port number of the ssh connection of controller-1 wil be added to the uartpath so 2 deployments don't have the same TCP port.
"uartpath": 10000,
}

13
virtualbox/pybox/install_vbox.py
View File

@ -379,6 +379,10 @@ def create_lab(m_vboxoptions):
disk_sizes = item['disks'][no_disks]
vboxmanage.vboxmanage_createmedium(node, disk_sizes,
vbox_home_dir=m_vboxoptions.vbox_home_dir)
if "controller-0" in node:
serial_config[0]['uartpath'] = serial_config[0]['uartpath'] + int(m_vboxoptions.nat_controller0_local_ssh_port)
vboxmanage.vboxmanage_modifyvm(
node,
{
@ -785,7 +789,10 @@ def serial_prompt_mode(mode):
def _connect_to_serial(virtual_machine=None):
if not virtual_machine:
virtual_machine = V_BOX_OPTIONS.labname + "-controller-0"
sock = serial.connect(virtual_machine, 10000, getpass.getuser())
port = 10000 + int(V_BOX_OPTIONS.nat_controller0_local_ssh_port)
sock = serial.connect(virtual_machine, port, getpass.getuser())
return sock, streamexpect.wrap(sock, echo=True, close_stream=False)
@ -921,7 +928,9 @@ def stage_install_controller0():
vboxmanage.vboxmanage_startvm(ctrlr0, V_BOX_OPTIONS.headless)
sock = serial.connect(ctrlr0, 10000, getpass.getuser())
port = 10000 + int(V_BOX_OPTIONS.nat_controller0_local_ssh_port)
sock = serial.connect(ctrlr0, port, getpass.getuser())
cont0_stream = streamexpect.wrap(sock, echo=True, close_stream=False)
install_controller_0(