From 71f22acb95ba8955f634367e3e33b15de85a1d86 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Fri, 29 Oct 2010 00:04:24 -0700
Subject: [PATCH 1/4] bug 6807: add the source nat ip with net mask status
 6807: resolved fixed

---
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 9f8aad9e801..ab7bcad6e39 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -991,11 +991,15 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
             }
             if (sourceNat) {
                 args += " -f";
+                long cidrSize = NetUtils.getCidrSize(vlanNetmask);
+                args += " -l ";
+                args += publicIpAddress + "/" + Long.toString(cidrSize);
+            } else {
+            	args += " -l ";
+                args += publicIpAddress;
             }
             args += " -i ";
             args += privateIpAddress;
-            args += " -l ";
-            args += publicIpAddress;
             args += " -c ";
             args += "eth" + correctVif.getDevice(conn);
             args += " -g ";

From 8294ce7fec3b5285e824733c9a4c198332602900 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Fri, 29 Oct 2010 16:18:08 +0530
Subject: [PATCH 2/4] bug 6789: release router lock after commiting transaction
 status 6789: resolved fixed

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 0a1fac8c4de..82e683d2020 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1142,11 +1142,11 @@ public class UserVmManagerImpl implements UserVmManager {
                 );
             userVm.setGuestMacAddress(vmMacAddress);
         	_vmDao.update(userVm.getId(), userVm);
+        	txn.commit();
         	if (routerLock) {
         		_routerDao.release(routerId);
         		routerLock = false;
         	}
-        	txn.commit();
         	return ipAddressStr;
         }finally {
         	if (routerLock) {

From c16ebe945240072cdbbffd6a8fe8b3165c4c6593 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Fri, 29 Oct 2010 16:34:28 -0700
Subject: [PATCH 3/4] bug 6807: first ip is different from sourcenat status
 6807: resolved fixed

---
 .../hypervisor/xen/resource/CitrixResourceBase.java      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index ab7bcad6e39..8b14df5015b 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -989,13 +989,16 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
             } else {
                 args = "-D";
             }
+            String cidrSize = Long.toString(NetUtils.getCidrSize(vlanNetmask));
             if (sourceNat) {
                 args += " -f";
-                long cidrSize = NetUtils.getCidrSize(vlanNetmask);
                 args += " -l ";
-                args += publicIpAddress + "/" + Long.toString(cidrSize);
-            } else {
+                args += publicIpAddress + "/" + cidrSize;
+            } else if (firstIP) {
             	args += " -l ";
+                args += publicIpAddress + "/" + cidrSize;
+            } else {
+              	args += " -l ";
                 args += publicIpAddress;
             }
             args += " -i ";

From 18205acb3bac6147114616497c0204b963ceeab2 Mon Sep 17 00:00:00 2001
From: edison <edison@cloud.com>
Date: Fri, 29 Oct 2010 19:31:20 -0700
Subject: [PATCH 4/4] add db migration for storage_pool: uuid can be null

---
 setup/db/schema-213to214.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup/db/schema-213to214.sql b/setup/db/schema-213to214.sql
index 8267613085c..845c8a71dd0 100755
--- a/setup/db/schema-213to214.sql
+++ b/setup/db/schema-213to214.sql
@@ -1 +1,2 @@
 ALTER TABLE `cloud`.`vm_instance` MODIFY COLUMN `pod_id` bigint unsigned;	-- remove NOT NULL constraint to allow creating DB record in early time
+ALTER TABLE `cloud`.`storage_pool` MODIFY COLUMN `uuid` varchar(255) UNIQUE;	-- remove NOT NULL constraint to allow creating DB record in early time