Changeset 204 for drbl-virt

Timestamp:

Aug 31, 2010, 4:14:38 PM (14 years ago)

Author:

rock

Message:

Bugfix: correct path & delete unused sh

Location:

drbl-virt/sbin

Files:

• add_value (deleted)
• check_drbl_client.sh (modified) (2 diffs)
• check_drbl_vm.sh (modified) (3 diffs)
• drbl_PXE_PV-VM_create.sh (modified) (1 diff)
• duplicate_del_MAC (deleted)
• functions_drbl_virt (modified) (2 diffs)

drbl-virt/sbin/check_drbl_client.sh

@@ -37 +37 @@
         client_CPU_core=$(ssh -o StrictHostKeyChecking=no $client_IP "cat /proc/cpuinfo |grep processor | wc -l")
         # check top information
-        ssh -o StrictHostKeyChecking=no $client_IP "top -b -n1" > $drbl_client_top_file
+        ssh -o StrictHostKeyChecking=no $client_IP "top -b -n2 -d1 | awk '/^top/{i++}i==2'" > $drbl_client_top_file
+IP_VM_right_line=""
         client_idle_CPU=$(cat $drbl_client_top_file | grep ^Cpu | sed 's/^.*ni,//' | sed 's/id,.*$//'  | awk '{print $1}')
         client_Ram=$(cat $drbl_client_top_file | grep ^Mem | sed 's/total.*$//' | sed 's/^Mem://' | awk '{print $1}')
@@ -45 +46 @@
 
 echo "[$client_hostname $client_IP] $IP_status CPU_Core=$client_CPU_core Ram=$client_Ram idle_CPU=$client_idle_CPU unused_Ram=$client_unused_Ram"
-echo "[$client_hostname $client_IP] $IP_status $client_CPU_core $client_Ram $client_idle_CPU $client_unused_Ram" >> $drbl_client_file
+#echo "[$client_hostname $client_IP] $IP_status $client_CPU_core $client_Ram $client_idle_CPU $client_unused_Ram" >> $drbl_client_file
 
 done

drbl-virt/sbin/check_drbl_vm.sh

@@ -36 +36 @@
     
     if [ $IP_status == "online" ]; then
-        ssh -o StrictHostKeyChecking=no $client_IP "xentop -b -i1" > $drbl_vm_xentop_file
+        ssh -o StrictHostKeyChecking=no $client_IP "xentop -d1 -b -i2 | awk '/^.*NAME/{i++}i==2'" > $drbl_vm_xentop_file
         vm_hostnames="$(cat $drbl_vm_xentop_file | sed -n '3,$p' | awk '{print $1}')"
     
-        printf "[$client_hostname] " >> $drbl_vm_file
+#        printf "[$client_hostname] " >> $drbl_vm_file
         printf "[$client_hostname] "
         declare -i i=1
@@ -45 +45 @@
         vm_numbers=$(echo $vm_hostnames | wc -w)
 
-        printf "[Running VM: $vm_numbers]\n" >> $drbl_vm_file
+#        printf "[Running VM: $vm_numbers]\n" >> $drbl_vm_file
         printf "[Running VM: $vm_numbers]\n"
 
@@ -54 +54 @@
             vm_CPU_loading="$(cat $drbl_vm_xentop_file | grep $vm_hostname | awk '{print $4}')"
             vm_Ram_loading="$(cat $drbl_vm_xentop_file | grep $vm_hostname | awk '{print $6}')"
-            printf "VM$i: $vm_hostname $vm_CPU_core ${vm_Ram}K $vm_CPU_loading%% $vm_Ram_loading%%\n" >> $drbl_vm_file
+#            printf "VM$i: $vm_hostname $vm_CPU_core ${vm_Ram}K $vm_CPU_loading%% $vm_Ram_loading%%\n" >> $drbl_vm_file
             printf "VM$i: $vm_hostname VCPU=$vm_CPU_core Mem=${vm_Ram}K VCPU_loading=$vm_CPU_loading%% Mem_usage=$vm_Ram_loading%%\n"
             i=i+1

drbl-virt/sbin/drbl_PXE_PV-VM_create.sh

@@ -127 +127 @@
 #IP_MAC_files=$(ls $Work_Home/etc | grep 'macadr-VM-eth[0-9]*.txt')
 
-IP_VM_files=$(ls $Work_Home/IP_VM_eth[0-9]*)
+IP_VM_files=$(ls $Work_Home/etc | grep 'IP_VM_eth[0-9]*')
 IP_VM_right_file=""
 IP_VM_right_line=""

drbl-virt/sbin/functions_drbl_virt

@@ -112 +112 @@
     declare -i j=1
     echo ""
-    echo "Choose Xen-enabled Kernel"
+    echo "[Choose Xen-enabled Kernel]"
     if [ $Kernels_nu -gt 1  ]; then
         for Kernel in $Kernels
@@ -190 +190 @@
 function get_VM_IP_range_and_prefix_name(){
 echo ""
+echo "[Setup VM IP range]"
 echo "DRBL client IP range -> $eth: [$Host_first_IP ~ $Host_last_IP]"