cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [13/50] git commit: CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Date Sun, 27 May 2012 22:30:43 GMT
CS-9919: Support for Nexus Swiches (Cisco Vswitches)

Description:

	Modifying column names in db tables to
	adhere to naming conventions.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/63de97e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/63de97e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/63de97e6

Branch: refs/heads/master
Commit: 63de97e63ce8c7ca6147751d4a26fe66b3db102d
Parents: 6920d76
Author: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Authored: Tue May 22 19:13:43 2012 -0700
Committer: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Committed: Fri May 25 18:28:34 2012 -0700

----------------------------------------------------------------------
 .../com/cloud/network/CiscoNexusVSMDeviceVO.java   |   10 +++++-----
 setup/db/create-schema.sql                         |   10 +++++-----
 setup/db/db/schema-302to303.sql                    |   10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/63de97e6/server/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/CiscoNexusVSMDeviceVO.java b/server/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
index 945b033..b1f1954 100644
--- a/server/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
+++ b/server/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
@@ -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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/63de97e6/setup/db/create-schema.sql
----------------------------------------------------------------------
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 286a013..9160669 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -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;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/63de97e6/setup/db/db/schema-302to303.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-302to303.sql b/setup/db/db/schema-302to303.sql
index 5a4bbc6..0e3d043 100755
--- a/setup/db/db/schema-302to303.sql
+++ b/setup/db/db/schema-302to303.sql
@@ -148,16 +148,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;
 


Mime
View raw message