提交 50b1fe30 编写于 作者: X Xiyue Wang

nic_hotplug: python3 compatible, add e1000e, remove e1000

1. fix python3 compatible issue
2. add e1000e variant
3. remove e1000 for RHEL8 guest
4. remove useless parameter match_string in cfg file
Signed-off-by: NXiyue Wang <xiywang@redhat.com>
上级 fa44d40b
...@@ -11,19 +11,21 @@ ...@@ -11,19 +11,21 @@
- nic_8139: - nic_8139:
no ppc64, ppc64le, s390x no ppc64, ppc64le, s390x
pci_model = rtl8139 pci_model = rtl8139
match_string = "8139"
- nic_virtio: - nic_virtio:
#TODO: Confirm this works with libvirt #TODO: Confirm this works with libvirt
pci_model = virtio-net-pci pci_model = virtio-net-pci
match_string = "Virtio network device"
Host_RHEL.m5: Host_RHEL.m5:
pci_model = virtio pci_model = virtio
s390x: s390x:
pci_model = virtio-net-ccw pci_model = virtio-net-ccw
- nic_e1000: - nic_e1000:
no ppc64, ppc64le, s390x no ppc64, ppc64le, s390x
RHEL:
only RHEL.6 RHEL.7
pci_model = e1000 pci_model = e1000
match_string = "Gigabit Ethernet Controller" - nic_e1000e:
no ppc64, ppc64le, s390x
pci_model = e1000e
variants: variants:
- one_pci: - one_pci:
pci_num = 1 pci_num = 1
......
...@@ -74,7 +74,7 @@ def run(test, params, env): ...@@ -74,7 +74,7 @@ def run(test, params, env):
if nic_ip: if nic_ip:
return nic_ip return nic_ip
cached_ip = vm.address_cache.get(nic["mac"]) cached_ip = vm.address_cache.get(nic["mac"])
arps = process.system_output("arp -aen") arps = process.system_output("arp -aen").decode()
logging.debug("Can't get IP address:") logging.debug("Can't get IP address:")
logging.debug("\tCached IP: %s", cached_ip) logging.debug("\tCached IP: %s", cached_ip)
logging.debug("\tARP table: %s", arps) logging.debug("\tARP table: %s", arps)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册