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

CS-9919: Changes to integrate UI changes for nexus feature. 

Reviewed by: Sateesh, Pranav.

Conflicts:

	ui/scripts/system.js
This commit is contained in:
Devdeep Singh 2012-05-23 18:56:49 +05:30 committed by Vijayendra Bhamidipati
parent 70fbee2cf2
commit 1593900402
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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),

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

@ -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),

14
ui/scripts/system.js
View File

@ -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;