From 1593900402f02845beface48880ed62ec9060f5d Mon Sep 17 00:00:00 2001
From: Devdeep Singh <devdeep.singh@citrix.com>
Date: Wed, 23 May 2012 18:56:49 +0530
Subject: [PATCH] CS-9919: Changes to integrate UI changes for nexus feature.
 Reviewed by: Sateesh, Pranav.

Conflicts:

	ui/scripts/system.js
---
 setup/db/create-schema.sql      |  4 ++--
 setup/db/db/schema-302to303.sql |  4 ++--
 ui/scripts/system.js            | 14 ++++++--------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 91606690cdc..be178952968 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -2097,8 +2097,8 @@ CREATE TABLE `cloud`.`virtual_supervisor_module` (
   `username` varchar(255) NOT NULL,
   `password` varchar(255) NOT NULL,
   `ipaddr` varchar(80) NOT NULL,
-  `vcenter_ipaddr` varchar(80) NOT NULL,
-  `vcenter_dc_name` varchar(255) NOT NULL,
+  `vcenter_ipaddr` varchar(80),
+  `vcenter_dc_name` varchar(255),
   `management_vlan` int(32),
   `control_vlan` int(32),
   `packet_vlan` int(32),
diff --git a/setup/db/db/schema-302to303.sql b/setup/db/db/schema-302to303.sql
index 0e3d0431faf..7293d7e89dd 100755
--- a/setup/db/db/schema-302to303.sql
+++ b/setup/db/db/schema-302to303.sql
@@ -148,8 +148,8 @@ CREATE TABLE `cloud`.`virtual_supervisor_module` (
   `username` varchar(255) NOT NULL,
   `password` varchar(255) NOT NULL,
   `ipaddr` varchar(80) NOT NULL,
-  `vcenter_ipaddr` varchar(80) NOT NULL,
-  `vcenter_dc_name` varchar(255) NOT NULL,
+  `vcenter_ipaddr` varchar(80),
+  `vcenter_dc_name` varchar(255),
   `management_vlan` int(32),
   `control_vlan` int(32),
   `packet_vlan` int(32),
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index bda935b965c..6303d85f7d3 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6193,18 +6193,18 @@
                   vsmipaddress: {
                     label: 'Nexus dvSwitch IP Address',
                     validation: { required: true },
-                    isHidden: true
+                    isHidden: false
                   },
                   vsmusername: {
                     label: 'Nexus dvSwitch Username',
                     validation: { required: true },
-                    isHidden: true
+                    isHidden: false
                   },
                   vsmpassword: {
                     label: 'Nexus dvSwitch Password',
                     validation: { required: true },
                     isPassword: true,
-                    isHidden: true
+                    isHidden: false
                   }
                   //hypervisor==VMWare ends here
                 }
@@ -6229,11 +6229,9 @@
                   array1.push("&username=" + todb(args.data.vCenterUsername));
                   array1.push("&password=" + todb(args.data.vCenterPassword));
 
-                  if (args.data.vsmipaddress) {
-                    array1.push('&vsmipaddress=' + args.data.vsmipaddress);
-                    array1.push('&vsmusername=' + args.data.vsmusername);
-                    array1.push('&vsmpassword=' + args.data.vsmpassword);
-                  }
+                  array1.push('&vsmipaddress=' + args.data.vsmipaddress);
+                  array1.push('&vsmusername=' + args.data.vsmusername);
+                  array1.push('&vsmpassword=' + args.data.vsmpassword);
 
                   var hostname = args.data.vCenterHost;
                   var dcName = args.data.vCenterDatacenter;