Changeset 1289 for trunk/tools/datacenter/vzImport.sh

Timestamp:

03/20/10 09:16:51 (2 years ago)

Author:

Gary

Message:

unxsVZ tools/datacenter/vzImport.sh corrected during extensive tests.

Files:

• trunk/tools/datacenter/vzImport.sh (modified) (6 diffs)

trunk/tools/datacenter/vzImport.sh

@@ -14 +14 @@
 #       The first step was faking the new node on the source system
 #       and running clone wizard after setting up the ssh stuff.
+#
+#TODO
+#       We need to get the actual MySQL query results to determine
+#       if something wrong or unexpected happened.
 #       
 
@@ -65 +69 @@
         echo "";
 
-        #this is a nested read see do above
-        read -e -p "Commit $cHostname [y/n/s/q]?: " cReply < /dev/tty;
-        if [ "$cReply" == "n" ];then
-                echo "Aborting commit and exiting $0";
-                exit 0;
-        fi      
-        if [ "$cReply" == "s" ];then
-                echo "Skipping $cHostname";
-                echo "";
-                continue;
-        fi      
-        if [ "$cReply" != "y" ];then
-                echo "Aborting commit and exiting $0";
-                exit 0;
-        fi      
-
-        echo "Commiting to tContainer";
-
         cQuery="SELECT uIP FROM tIP WHERE cLabel='$cIP' AND uAvailable=1";
         uIPv4=`echo $cQuery | /usr/bin/mysql -pwsxedc -u unxsvz unxsvz | tail -n 1 | awk -F' ' '{print $1}'`;
@@ -108 +94 @@
 
         cQuery="SELECT uContainer FROM tContainer WHERE cLabel='$cLabel' AND uDatacenter=$uDatacenter AND uNode=$uNode";
-        uContainer=`echo $cQuery | /usr/bin/mysql -pwsxedc -u unxsvz unxsvz | tail -n 1 | awk -F' ' '{print $1}'`;
+        uCheckContainer=`echo $cQuery | /usr/bin/mysql -pwsxedc -u unxsvz unxsvz | tail -n 1 | awk -F' ' '{print $1}'`;
         if [ $? != 0 ];then
                 echo "$cQuery failed";
                 exit 1;
         fi
-        echo uContainer=$uContainer;
+        echo uCheckContainer=$uCheckContainer;
 
-        if [ "$uContainer" != "" ];then
+        if [ "$uCheckContainer" != "" ];then
                 echo "Skipping container cLabel=$cLabel cHostname=$cHostname already in tContainer";
                 echo "";
@@ -121 +107 @@
         fi
 
-        #debug only
-        #echo "";
-        #continue;
+        #this is a nested read see do above
+        read -e -p "Commit $cHostname [y/n/s/q]?: " cReply < /dev/tty;
+        if [ "$cReply" == "n" ];then
+                echo "Aborting commit and exiting $0";
+                exit 0;
+        fi      
+        if [ "$cReply" == "s" ];then
+                echo "Skipping $cHostname";
+                echo "";
+                continue;
+        fi      
+        if [ "$cReply" != "y" ];then
+                echo "Aborting commit and exiting $0";
+                exit 0;
+        fi      
+
+        echo "Commiting to tContainer";
 
         cQuery="INSERT INTO tContainer SET uContainer=$uContainer,cLabel='$cLabel',cHostname='$cHostname',uIPv4=$uIPv4,uOSTemplate=$uOSTemplate,uConfig=$uConfig,uNameserver=$uNameserver,uSearchdomain=$uSearchdomain,uDatacenter=$uDatacenter,uNode=$uNode,uStatus=$uStatus,uOwner=$uOwner,uCreatedBy=$uCreatedBy,uCreatedDate=UNIX_TIMESTAMP(NOW())";
@@ -133 +133 @@
         echo $cResult;
 
-        cQuery="UPDATE tIP SET uAvailable=0 WHERE uIPv4=$uIPv4";
+        cQuery="UPDATE tIP SET uAvailable=0 WHERE uIP=$uIPv4";
         cResult=`echo $cQuery | /usr/bin/mysql -pwsxedc -u unxsvz unxsvz | tail -n 1`;
         if [ $? != 0 ];then
@@ -140 +140 @@
         fi
         echo $cResult;
-        echo "Commited";
+        echo "Commit attempted";
         echo "";
 done