x
/
nova-dpm
Code Issues Proposed changes

guest tools: Fix layer2 configuration 

The guest image tools do not properly configure a network interface
in the image for layer2. When hipersockets is used, setting the MAC
fails with "Operation not supported". No communication with the
dhcp on the network is possible.

OSA was not affected as layer2 is the default for OSA if nothing is
provided (for hipersockets it's layer3).

Change-Id: I203a8d4e62afb10666e9b131164e77ab4f85d890
Closes-Bug: #1685737
This commit is contained in:
Andreas Scheuring 2017-04-24 10:39:23 +02:00
parent 8e44759921
commit 335150cc7b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guest_image_tools/usr/bin/dpm_guest_image_tools_common
View File

@ -214,7 +214,7 @@ function configure_device {
# TODO(andreas_s): Do not depend on znetconf
# Errors of the following command are written to stderr, and therefore
# show up in the systemd units journal
local cmd=$(_change_root "znetconf -a $dev_bus_id -o portno=$port_no,layer2=1")
local cmd=$(_change_root "znetconf -a $dev_bus_id -o portno=$port_no -o layer2=1")
eval "$cmd"
return "$?"
}

4
nova_dpm/tests/unit/guest_image_tools/root_dir_default/znetconf
View File

@ -1,6 +1,6 @@
#! /bin/bash
# znetconf -a $dev_bus_id -o portno=$port,layer2=1
if ! [[ "$@" == "-a 0.0.0001 -o portno=1,layer2=1" ]]; then
# znetconf -a $dev_bus_id -o portno=$port -o layer2=1
if ! [[ "$@" == "-a 0.0.0001 -o portno=1 -o layer2=1" ]]; then
exit 1
fi