Skip to content

Fix the name of the column used to hold IPv4 range in 'vlan' table. #2492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rafaelweingartner merged 1 commit into from
Mar 29, 2018
Merged

Fix the name of the column used to hold IPv4 range in 'vlan' table. #2492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions engine/schema/src/main/java/com/cloud/dc/VlanVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -30,6 +28,8 @@
import javax.persistence.Id;
import javax.persistence.Table;

import com.cloud.utils.db.GenericDao;

@Entity
@Table(name = "vlan")
public class VlanVO implements Vlan {
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -185,7 +185,7 @@ public void setPhysicalNetworkId(Long physicalNetworkId) {
public String toString() {
if (toString == null) {
toString =
new StringBuilder("Vlan[").append(vlanTag)
new StringBuilder("Vlan[").append(vlanTag)
.append("|")
.append(vlanGateway)
.append("|")
Expand Down
5 changes: 4 additions & 1 deletion engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/test/PodZoneConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ public void deleteZone(String name) {
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.");
Expand Down