From ec4755a60e5d70fb18d39cf2b1938a9ad96e6648 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Mon, 27 Sep 2010 16:57:31 +0530
Subject: [PATCH] bug 6123: Include last id in the vlan range status 6123:
 resolved fixed

---
 core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java          | 2 +-
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java b/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
index 43ba290d2ea..bedc5d30941 100755
--- a/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
+++ b/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
@@ -60,7 +60,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
         try {
             txn.start();
             PreparedStatement stmt = txn.prepareAutoCloseStatement(insertVnet);
-            for (int i = start; i < end; i++) {
+            for (int i = start; i <= end; i++) {
                 stmt.setString(1, String.valueOf(i));
                 stmt.setLong(2, dcId);
                 stmt.addBatch();
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 9d48953e0b9..50db6d6fd9f 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -729,7 +729,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
     	if (vnetRange != null) {
     		String[] tokens = vnetRange.split("-");
 	    	int begin = Integer.parseInt(tokens[0]);
-	    	int end = tokens.length == 1 ? (begin + 1) : Integer.parseInt(tokens[1]);
+	    	int end = tokens.length == 1 ? (begin) : Integer.parseInt(tokens[1]);
 	    	
 	    	_zoneDao.deleteVnet(zoneId);
 	    	_zoneDao.addVnet(zone.getId(), begin, end);
@@ -793,7 +793,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
             try {
             	vnetStart = Integer.parseInt(tokens[0]);
             	if (tokens.length == 1) {
-            		vnetEnd = vnetStart + 1;
+            		vnetEnd = vnetStart;
             	} else {
             		vnetEnd = Integer.parseInt(tokens[1]);
             	}