Changeset 1854

Timestamp:

01/16/12 06:27:15 (4 months ago)

Author:

Dylan

Message:

unxsVZ moving to normal remote datacenter clones.

Location:

trunk

Files:

• tcontainer.c (modified) (1 diff)
• tcontainerfunc.h (modified) (7 diffs)

trunk/tcontainer.c

@@ -495 +495 @@
                 {
                         char cAutoCloneSyncTime[256]={""};
+                        char cAutoCloneNode[256]={""};
+                        unsigned uTargetDatacenter=0;
+
+                        MYSQL_RES *res;
+                        MYSQL_ROW field;
 
                         OpenRow("Clone target node","black");
-                        tTablePullDownDatacenter("tNode;cuTargetNodePullDown","cLabel","cLabel",uTargetNode,1,
-                                cuTargetNodePullDown,0,uDatacenter);//0 does not use tProperty, uses uDatacenter
+                        GetConfiguration("cAutoCloneNode",cAutoCloneNode,uDatacenter,uNode,0,0);
+                        sprintf(gcQuery,"SELECT uNode,uDatacenter FROM tNode WHERE cLabel='%s'",cAutoCloneNode);
+                        MYSQL_RUN_STORE(res);
+                        if((field=mysql_fetch_row(res)))
+                        {
+                                sscanf(field[0],"%u",&uTargetNode);
+                                sscanf(field[1],"%u",&uTargetDatacenter);
+                        }
+                        tTablePullDown("tNode;cuTargetNodePullDown","cLabel","cLabel",uTargetNode,0);
 
                         OpenRow("Clone start uIPv4","black");
                         tTablePullDownOwnerAvailDatacenter("tIP;cuWizIPv4PullDown","cLabel","cLabel",uWizIPv4,1,
-                                uDatacenter,uForClient);
+                                uTargetDatacenter,uForClient);
 
                         OpenRow("Keep clone stopped","black");

trunk/tcontainerfunc.h

@@ -1596 +1596 @@
                                 unsigned uHostnameLen=0;
                                 unsigned uLabelLen=0;
+                                unsigned uTargetDatacenter=0;
 
                                 ProcesstContainerVars(entries,x);
@@ -1711 +1712 @@
                                                         "Select another.");
 
-                                        sscanf(ForeignKey("tNode","uDatacenter",uTargetNode),"%u",&uNodeDatacenter);
-                                        if(uDatacenter!=uNodeDatacenter)
-                                                tContainer("<blink>Error:</blink> The specified clone uNode does not "
-                                                        "belong to the specified uDatacenter.");
+                                        //We are moving to normal remote datacenter clone containers
+                                        sscanf(ForeignKey("tNode","uDatacenter",uTargetNode),"%u",&uTargetDatacenter);
+                                        //if(uDatacenter!=uTargetDatacenter)
+                                        //      tContainer("<blink>Error:</blink> The specified clone uNode does not "
+                                        //              "belong to the specified uDatacenter.");
                                         if(!uWizIPv4)
                                                 tContainer("<blink>Error:</blink> You must select an IP for the clone");
@@ -1721 +1723 @@
                                                                                 " clone");
                                         sscanf(ForeignKey("tIP","uDatacenter",uWizIPv4),"%u",&uIPv4Datacenter);
-                                        if(uDatacenter!=uIPv4Datacenter)
-                                                tContainer("<blink>Error:</blink> The specified uIPv4 does not "
-                                                        "belong to the specified uDatacenter.");
+                                        if(uTargetDatacenter!=uIPv4Datacenter)
+                                                tContainer("<blink>Error:</blink> The specified clone uIPv4 does not "
+                                                        "belong to the specified uTargetDatacenter.");
                                         if(cNCCloneRange[0] && !uIpv4InCIDR4(ForeignKey("tIP","cLabel",uWizIPv4),cNCCloneRange))
                                                 tContainer("<blink>Error:</blink> Clone start uIPv4 must be in datacenter clone IP range");
@@ -1788 +1790 @@
                                 {
                                         sprintf(gcQuery,"SELECT cLabel FROM tIP WHERE uIP=%u AND uAvailable=1"
-                                                " AND uOwner=%u AND uDatacenter=%u",uWizIPv4,uForClient,uDatacenter);
+                                                " AND uOwner=%u AND uDatacenter=%u",uWizIPv4,uForClient,uTargetDatacenter);
                                         mysql_query(&gMysql,gcQuery);
                                         if(mysql_errno(&gMysql))
@@ -1819 +1821 @@
                                         sprintf(gcQuery,"SELECT COUNT(uIP) FROM tIP WHERE uAvailable=1 AND uOwner=%u"
                                                         " AND cLabel LIKE '%s%%' AND uDatacenter=%u",
-                                                                uForClient,cIPv4ClassCClone,uDatacenter);
+                                                                uForClient,cIPv4ClassCClone,uTargetDatacenter);
                                         mysql_query(&gMysql,gcQuery);
                                         if(mysql_errno(&gMysql))
@@ -2002 +2004 @@
                                                                         uSearchdomain,
                                                                         uDatacenter,
-                                                                        uDatacenter,
+                                                                        uTargetDatacenter,
                                                                         uForClient,
                                                                         cLabel,
@@ -2024 +2026 @@
                                                 sprintf(gcQuery,"SELECT uIP FROM tIP WHERE uAvailable=1 AND uOwner=%u"
                                                         " AND cLabel LIKE '%s%%' AND uDatacenter=%u LIMIT 1",
-                                                                uForClient,cIPv4ClassCClone,uDatacenter);
+                                                                uForClient,cIPv4ClassCClone,uTargetDatacenter);
                                                 mysql_query(&gMysql,gcQuery);
                                                 if(mysql_errno(&gMysql))