From 628ca6c6d7df2cc751246aa3a42d2bade61c757d Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <Alena.Prokharchyk@citrix.com>
Date: Mon, 28 Nov 2011 14:12:46 -0800
Subject: [PATCH] bug 11018: removed private_netmask from vm_instance table
 status 11018: resolved fixed

---
 api/src/com/cloud/api/commands/ListVMsCmd.java                 | 3 +--
 .../com/cloud/network/element/ElasticLoadBalancerElement.java  | 2 --
 setup/db/create-schema.sql                                     | 1 -
 setup/db/db/schema-2214to30.sql                                | 2 ++
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/api/src/com/cloud/api/commands/ListVMsCmd.java b/api/src/com/cloud/api/commands/ListVMsCmd.java
index 3ecb99007ad..d149b50964f 100755
--- a/api/src/com/cloud/api/commands/ListVMsCmd.java
+++ b/api/src/com/cloud/api/commands/ListVMsCmd.java
@@ -24,12 +24,11 @@ import java.util.List;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.ApiConstants;
+import com.cloud.api.ApiConstants.VMDetails;
 import com.cloud.api.BaseListCmd;
 import com.cloud.api.IdentityMapper;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.ApiConstants.VMDetails;
-import com.cloud.api.BaseCmd.CommandType;
 import com.cloud.api.response.ListResponse;
 import com.cloud.api.response.UserVmResponse;
 import com.cloud.async.AsyncJob;
diff --git a/server/src/com/cloud/network/element/ElasticLoadBalancerElement.java b/server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
index 53e38c32020..7cfadc54971 100644
--- a/server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
+++ b/server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
@@ -40,8 +40,6 @@ import com.cloud.network.NetworkManager;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetworkServiceProvider;
 import com.cloud.network.dao.NetworkDao;
-import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
-import com.cloud.network.dao.VirtualRouterProviderDao;
 import com.cloud.network.lb.ElasticLoadBalancerManager;
 import com.cloud.network.lb.LoadBalancingRule;
 import com.cloud.offering.NetworkOffering;
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 04ab1d2afec..ff786277349 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -927,7 +927,6 @@ CREATE TABLE  `cloud`.`vm_instance` (
   `guest_os_id` bigint unsigned NOT NULL,
   `private_mac_address` varchar(17),
   `private_ip_address` char(40),
-  `private_netmask` varchar(15),
   `pod_id` bigint unsigned,
   `data_center_id` bigint unsigned NOT NULL COMMENT 'Data Center the instance belongs to',
   `host_id` bigint unsigned,
diff --git a/setup/db/db/schema-2214to30.sql b/setup/db/db/schema-2214to30.sql
index 2e92a37c85b..6417fdac56f 100755
--- a/setup/db/db/schema-2214to30.sql
+++ b/setup/db/db/schema-2214to30.sql
@@ -270,3 +270,5 @@ INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-serv
 ALTER TABLE `cloud_usage`.`usage_vpn_user` ADD INDEX `i_usage_vpn_user__account_id`(`account_id`);
 ALTER TABLE `cloud_usage`.`usage_vpn_user` ADD INDEX `i_usage_vpn_user__created`(`created`);
 ALTER TABLE `cloud_usage`.`usage_vpn_user` ADD INDEX `i_usage_vpn_user__deleted`(`deleted`);
+
+ALTER TABLE `cloud`.`vm_instance` DROP COLUMN `private_netmask`;