misc: modify the non stand s5 vUART generate logic

The legacy code get all non-stand vUARTs from scenario_etree and generate
the serial.conf, now we need add more non-stand vUARTs which was config
by offline tool and record by allocation_etree.

This patch add allocation_etree to the list, then add all non-stand
vUART to serial.conf which will config by SERVICE VM.

Tracked-On: #6690
Signed-off-by: Chenli Wei <chenli.wei@intel.com>
This commit is contained in:
Chenli Wei
2022-05-23 16:24:23 +08:00
committed by acrnsi-robot
parent a2cf3ac46b
commit 1dd5060e9e
2 changed files with 8 additions and 15 deletions

View File

@@ -22,7 +22,7 @@ def create_s5_vuart_connection(allocation_etree, service_vm_name, service_vm_por
vuart_connection_node = common.append_node(f"./vuart_connection", None, vuart_connections_node)
common.append_node(f"./name", connection_name, vuart_connection_node)
common.append_node(f"./type", "type", vuart_connection_node)
common.append_node(f"./type", "legacy", vuart_connection_node)
service_vm_endpoint = common.append_node(f"./endpoint", None, vuart_connection_node)
common.append_node(f"./vm_name", service_vm_name, service_vm_endpoint)
@@ -57,9 +57,11 @@ def alloc_free_port(scenario_etree, load_order, vm_name):
for port in port_list:
tmp_list.append(int(port, 16))
port_list = list(set(service_port_list) - set(tmp_list))
global service_port_list
service_port_list = list(set(service_port_list) - set(tmp_list))
service_port_list.sort()
port = hex(service_port_list[0])
service_port_list.remove(port_list[0])
service_port_list.remove(service_port_list[0])
return str(port).upper()
else:
tmp_list = list(set(standard_uart_port) - set(port_list))