From 386888654603c936310665a30fdd0208b86a3fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= <rafaelweingartner@gmail.com>
Date: Thu, 29 Mar 2018 10:39:19 -0300
Subject: [PATCH] Fix the name of the column used to hold IPv4 range in 'vlan'
 table. (#2492)

---
 engine/schema/src/main/java/com/cloud/dc/VlanVO.java      | 8 ++++----
 .../main/resources/META-INF/db/schema-41100to41200.sql    | 5 ++++-
 server/src/main/java/com/cloud/test/PodZoneConfig.java    | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/engine/schema/src/main/java/com/cloud/dc/VlanVO.java b/engine/schema/src/main/java/com/cloud/dc/VlanVO.java
index 50106e07fc9..ebbd4bde08b 100644
--- a/engine/schema/src/main/java/com/cloud/dc/VlanVO.java
+++ b/engine/schema/src/main/java/com/cloud/dc/VlanVO.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.dc;
 
-import com.cloud.utils.db.GenericDao;
-
 import java.util.Date;
 import java.util.UUID;
 
@@ -30,6 +28,8 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import com.cloud.utils.db.GenericDao;
+
 @Entity
 @Table(name = "vlan")
 public class VlanVO implements Vlan {
@@ -57,7 +57,7 @@ public class VlanVO implements Vlan {
     @Column(name = "data_center_id")
     long dataCenterId;
 
-    @Column(name = "description")
+    @Column(name = "ip4_range")
     String ipRange;
 
     @Column(name = "ip6_range")
@@ -185,7 +185,7 @@ public class VlanVO implements Vlan {
     public String toString() {
         if (toString == null) {
             toString =
-                new StringBuilder("Vlan[").append(vlanTag)
+                    new StringBuilder("Vlan[").append(vlanTag)
                     .append("|")
                     .append(vlanGateway)
                     .append("|")
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql b/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql
index 97bd5ae7aae..90f3f11f759 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql
@@ -22,5 +22,8 @@
 -- [CLOUDSTACK-10314] Add reason column to ACL rule table
 ALTER TABLE `cloud`.`network_acl_item` ADD COLUMN `reason` VARCHAR(2500) AFTER `display`;
 
---[CLOUDSTACK-9846] Make provision to store content and subject for Alerts in separate columns.
+-- [CLOUDSTACK-9846] Make provision to store content and subject for Alerts in separate columns.
 ALTER TABLE `cloud`.`alert` ADD COLUMN `content` VARCHAR(5000);
+
+-- Fix the name of the column used to hold IPv4 range in 'vlan' table.
+ALTER TABLE `vlan` CHANGE `description` `ip4_range` varchar(255);
\ No newline at end of file
diff --git a/server/src/main/java/com/cloud/test/PodZoneConfig.java b/server/src/main/java/com/cloud/test/PodZoneConfig.java
index c55178f3f79..3607a3b1fff 100644
--- a/server/src/main/java/com/cloud/test/PodZoneConfig.java
+++ b/server/src/main/java/com/cloud/test/PodZoneConfig.java
@@ -485,7 +485,7 @@ public class PodZoneConfig {
     public void saveVlan(long zoneId, Long podId, String vlanId, String vlanGateway, String vlanNetmask, String vlanType, String ipRange, long networkId,
         long physicalNetworkId) {
         String sql =
-            "INSERT INTO `cloud`.`vlan` (vlan_id, vlan_gateway, vlan_netmask, data_center_id, vlan_type, description, network_id, physical_network_id) " + "VALUES ('" +
+            "INSERT INTO `cloud`.`vlan` (vlan_id, vlan_gateway, vlan_netmask, data_center_id, vlan_type, ip4_range, network_id, physical_network_id) " + "VALUES ('" +
                 vlanId + "','" + vlanGateway + "','" + vlanNetmask + "','" + zoneId + "','" + vlanType + "','" + ipRange + "','" + networkId + "','" + physicalNetworkId +
                 "')";
         DatabaseConfig.saveSQL(sql, "Failed to save vlan due to exception. Please contact Cloud Support.");