diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh index 196a9ca989..c9cca2340b 100644 --- a/src/mad/sh/scripts_common.sh +++ b/src/mad/sh/scripts_common.sh @@ -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++]}" diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index b41c1e0210..fda79ade8a 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -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"); diff --git a/src/vmm_mad/remotes/kvm/attach_nic b/src/vmm_mad/remotes/kvm/attach_nic index d7fc1ef9f1..54a084cf74 100755 --- a/src/vmm_mad/remotes/kvm/attach_nic +++ b/src/vmm_mad/remotes/kvm/attach_nic @@ -34,7 +34,7 @@ if [ -z "${BRIDGE}" ]; then DEVICE+="" else DEVICE+="" - if [ "${VN_MAD}" = 'ovswitch' ] || [ "${VN_MAD}" = 'ovswitch_vxlan' ]; then + if [ "${BRIDGE_TYPE}" = 'openvswitch' ]; then DEVICE+=" " fi DEVICE+=" "