shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

F #2253: BRIDGE_TYPE typo, fixes to kvm/attach_nic

Browse Source
This commit is contained in:
Vlastimil Holer 2018-12-12 16:56:51 +01:00 committed by Ruben S. Montero
parent 2ea7beda77
commit c5cf6113d2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mad/sh/scripts_common.sh
View File

@ -955,6 +955,7 @@ function get_nic_information {
done < <($CMD /VMM_DRIVER_ACTION_DATA/VM/ID \
$NIC_XPATH/NIC_ID \
$NIC_XPATH/BRIDGE \
$NIC_XPATH/BRIDGE_TYPE \
$NIC_XPATH/VN_MAD \
$NIC_XPATH/MAC \
$NIC_XPATH/TARGET \
@ -975,6 +976,7 @@ function get_nic_information {
VMID="${XPATH_ELEMENTS[j++]}"
NIC_ID="${XPATH_ELEMENTS[j++]}"
BRIDGE="${XPATH_ELEMENTS[j++]}"
BRIDGE_TYPE="${XPATH_ELEMENTS[j++]}"
VN_MAD="${XPATH_ELEMENTS[j++]}"
MAC="${XPATH_ELEMENTS[j++]}"
NIC_TARGET="${XPATH_ELEMENTS[j++]}"

2
src/vmm/LibVirtDriverKVM.cc
View File

@ -1037,7 +1037,7 @@ int LibVirtDriver::deployment_description_kvm(
ip = nic[i]->vector_value("IP");
filter = nic[i]->vector_value("FILTER");
virtio_queues = nic[i]->vector_value("VIRTIO_QUEUES");
bridge_type = nic[i]->vector_value("BRDIGE_TYPE");
bridge_type = nic[i]->vector_value("BRIDGE_TYPE");
vrouter_ip = nic[i]->vector_value("VROUTER_IP");

2
src/vmm_mad/remotes/kvm/attach_nic
View File

@ -34,7 +34,7 @@ if [ -z "${BRIDGE}" ]; then
DEVICE+="<interface type='ethernet'>"
else
DEVICE+="<interface type='bridge'>"
if [ "${VN_MAD}" = 'ovswitch' ] || [ "${VN_MAD}" = 'ovswitch_vxlan' ]; then
if [ "${BRIDGE_TYPE}" = 'openvswitch' ]; then
DEVICE+=" <virtualport type='openvswitch'/>"
fi
DEVICE+=" <source bridge='$(xml_esc "${BRIDGE}")'/>"