From 3ffb109b5e3a3299689e99c996a4cd42c660253f Mon Sep 17 00:00:00 2001
From: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Date: Tue, 22 May 2012 19:13:43 -0700
Subject: [PATCH] CS-9919: Support for Nexus Swiches (Cisco Vswitches)
 reviewed-by: Devdeep

Description:

	Modifying column names in db tables to
	adhere to naming conventions.
---
 .../src/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(-)

diff --git a/server/src/com/cloud/network/CiscoNexusVSMDeviceVO.java b/server/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
index 945b0331883..b1f195480c3 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
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 1d60955c8d4..b9604a05ce1 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;
 
diff --git a/setup/db/db/schema-302to303.sql b/setup/db/db/schema-302to303.sql
index bf1d852c0c8..4f020ebe7ce 100755
--- a/setup/db/db/schema-302to303.sql
+++ b/setup/db/db/schema-302to303.sql
@@ -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;