etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CS-9919: Support for Nexus Swiches (Cisco Vswitches) 

reviewed-by: Devdeep

Description:

	Modifying column names in db tables to
	adhere to naming conventions.
This commit is contained in:
Vijayendra Bhamidipati 2012-05-22 19:13:43 -07:00 committed by Devdeep Singh
parent 42901e5a6e
commit 3ffb109b5e
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
View File

@ -64,11 +64,11 @@ public class CiscoNexusVSMDeviceVO implements CiscoNexusVSMDevice, Identity{
@Column(name = "ipaddr")
private String ipaddr;
@Column(name = "vcenteripaddr")
@Column(name = "vcenter_ipaddr")
private String vCenterIPAddr;
// Name of the DataCenter (as seen in vCenter) that this VSM manages.
@Column(name = "vcenterdcname")
@Column(name = "vcenter_dc_name")
private String vCenterDCName;
@Column(name = "management_vlan")
@ -83,16 +83,16 @@ public class CiscoNexusVSMDeviceVO implements CiscoNexusVSMDevice, Identity{
@Column(name = "storage_vlan")
private int storageVlan;
@Column(name = "vsmDomainId")
@Column(name = "vsm_domain_id")
private long vsmDomainId;
@Column(name = "config_mode")
private VSMConfigMode vsmConfigMode;
@Column(name = "ConfigState")
@Column(name = "config_state")
private VSMConfigState vsmConfigState;
@Column(name = "vsmDeviceState")
@Column(name = "vsm_device_state")
private VSMDeviceState vsmDeviceState;
// Accessor methods

10
setup/db/create-schema.sql
View File

@ -2097,16 +2097,16 @@ CREATE TABLE `cloud`.`virtual_supervisor_module` (
`username` varchar(255) NOT NULL,
`password` varchar(255) NOT NULL,
`ipaddr` varchar(80) NOT NULL,
`vcenteripaddr` varchar(80) NOT NULL,
`vcenterdcname` varchar(255) NOT NULL,
`vcenter_ipaddr` varchar(80) NOT NULL,
`vcenter_dc_name` varchar(255) NOT NULL,
`management_vlan` int(32),
`control_vlan` int(32),
`packet_vlan` int(32),
`storage_vlan` int(32),
`vsmDomainId` bigint unsigned,
`vsm_domain_id` bigint unsigned,
`config_mode` varchar(20),
`ConfigState` varchar(20),
`vsmDeviceState` varchar(20) NOT NULL,
`config_state` varchar(20),
`vsm_device_state` varchar(20) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

10
setup/db/db/schema-302to303.sql
View File

@ -145,16 +145,16 @@ CREATE TABLE `cloud`.`virtual_supervisor_module` (
`username` varchar(255) NOT NULL,
`password` varchar(255) NOT NULL,
`ipaddr` varchar(80) NOT NULL,
`vcenteripaddr` varchar(80) NOT NULL,
`vcenterdcname` varchar(255) NOT NULL,
`vcenter_ipaddr` varchar(80) NOT NULL,
`vcenter_dc_name` varchar(255) NOT NULL,
`management_vlan` int(32),
`control_vlan` int(32),
`packet_vlan` int(32),
`storage_vlan` int(32),
`vsmDomainId` bigint unsigned,
`vsm_domain_id` bigint unsigned,
`config_mode` varchar(20),
`ConfigState` varchar(20),
`vsmDeviceState` varchar(20) NOT NULL,
`config_state` varchar(20),
`vsm_device_state` varchar(20) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;