Merge pull request #236 from IBM/jinlings

removed fdb when vm deleted

scripts/kvm/clear_vm.sh

@@ -15,13 +15,15 @@ count=$(echo $vm_xml | xmllint --xpath 'count(/domain/devices/interface)' -)
 for (( i=1; i <= $count; i++ )); do
     vif_dev=$(echo $vm_xml | xmllint --xpath "string(/domain/devices/interface[$i]/target/@dev)" -)
     br_name=$(echo $vm_xml | xmllint --xpath "string(/domain/devices/interface[$i]/source/@bridge)" -)
+    mac_addr=$(echo $vm_xml | xmllint --xpath "string(/domain/devices/interface[$i]/mac/@address)" -)
     if [ "$use_lb" = "false" ]; then
         br_name=br$SCI_CLIENT_ID
         result=$(icp-tower --ovs-bridge=$br_name gate remove --interface $vif_dev)
         sidecar span log $span "Internal: $vif_dev is deleted" "result: $result"
     else
         vni=${br_name#br}
         ./clear_link.sh $vni
+        ./rm_fdb.sh $mac_addr
         ./clear_sg_chain.sh $vif_dev
     fi
     sidecar span log $span "Callback: clear_vnic.sh '$vif_dev'"

scripts/kvm/launch_vm.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -xv
+#!/bin/bash
 
 cd $(dirname $0)
 source ../cloudrc
@@ -65,7 +65,6 @@ if [ "$ephemeral_size" -gt 0 ]; then
     virsh attach-disk $vm_ID $ephemeral vdb --config
 fi
 vlans=$(jq .vlans <<< $metadata)
-echo "Vlans is $vlans" >> /tmp/cloudland_launch_vlans.log
 nvlan=$(jq length <<< $vlans)
 i=0
 while [ $i -lt $nvlan ]; do

scripts/kvm/rm_fdb.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+cd `dirname $0`
+source ../cloudrc
+[ $# -lt 1 ] && die "$0 <mac_addr>"
+mac_addr=$1
+sudo /usr/sbin/bridge fdb del $mac_addr dev $zlayer2_interface