dvSwitch UI integration Set 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bd583613 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bd583613 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bd583613 Branch: refs/heads/master Commit: bd583613622fed982e862625d077474a6c659fd8 Parents: 1f21c12 Author: Pranav Saxena <[email protected]> Authored: Wed Feb 27 21:23:13 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Wed Feb 27 21:23:13 2013 +0530 ---------------------------------------------------------------------- ui/scripts/system.js | 117 +++++++++++++++++++++++++------------- ui/scripts/zoneWizard.js | 126 +++++++++++++++++++++++++++------------- 2 files changed, 161 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd583613/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 3193a0a..14a15aa 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7408,12 +7408,27 @@ //$('li[input_sub_group="external"]', $dialogAddCluster).show(); if(dvSwitchEnabled ){ - $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'inline-block'); - $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'inline-block'); - } + // $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'inline-block'); + // $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'inline-block'); + // $form.find('.form-item[rel=vSwitchPublicName]').css('display','inline-block'); + //$form.find('.form-item[rel=vSwitchGuestName]').css('display','inline-block'); + $form.find('.form-item[rel=overridepublictraffic]').css('display','inline-block'); + $form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').removeAttr('checked'); + + $form.find('.form-item[rel=overrideguesttraffic]').css('display','inline-block'); + $form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').removeAttr('checked'); + + + + } else { - $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none'); - $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none'); + // $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none'); + // $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none'); + // $form.find('.form-item[rel=vSwitchPublicName]').css('display','none'); + // $form.find('.form-item[rel=vSwitchGuestName]').css('display','none'); + $form.find('.form-item[rel=overridepublictraffic]').css('display','none'); + $form.find('.form-item[rel=overrideguesttraffic]').css('display','none'); + } $form.find('.form-item[rel=vCenterHost]').css('display', 'inline-block'); @@ -7427,6 +7442,16 @@ $vsmFields.css('display', 'none'); } } else { + + + $form.find('.form-item[rel=overridepublictraffic]').css('display', 'none'); + $form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none'); + $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none'); + $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none'); + $form.find('.form-item[rel=vSwitchPublicName]').css('display','none'); + $form.find('.form-item[rel=vSwitchGuestName]').css('display','none'); + + $form.find('.form-item[rel=vCenterHost]').css('display', 'none'); $form.find('.form-item[rel=vCenterUsername]').css('display', 'none'); $form.find('.form-item[rel=vCenterPassword]').css('display', 'none'); @@ -7480,15 +7505,33 @@ //hypervisor==VMWare begins here - overridepublictraffic:{ - label:'Override Public-Traffic', - isBoolean:true - + vCenterHost: { + label: 'label.vcenter.host', + docID: 'helpClustervCenterHost', + validation: { required: true } + }, + vCenterUsername: { + label: 'label.vcenter.username', + docID: 'helpClustervCenterUsername', + validation: { required: true } + }, + vCenterPassword: { + label: 'label.vcenter.password', + docID: 'helpClustervCenterPassword', + validation: { required: true }, + isPassword: true + }, + vCenterDatacenter: { + label: 'label.vcenter.datacenter', + docID: 'helpClustervCenterDatacenter', + validation: { required: true } }, - overrideguesttraffic:{ - label:'Override Guest-Traffic', - isBoolean:true + overridepublictraffic:{ + label:'Override Public-Traffic', + isBoolean:true, + isHidden:true, + isChecked:false }, @@ -7509,15 +7552,21 @@ }, vSwitchPublicName:{ - label:'vSwitch Public Traffic Name', + label:'Public Traffic vSwitch Name', dependsOn:'overridepublictraffic', isHidden:true }, + overrideguesttraffic:{ + label:'Override Guest-Traffic', + isBoolean:true, + isHidden:true, + isChecked:false + }, + - vSwitchGuestType:{ label: 'Guest Traffic vSwitch Type', select: function(args) { @@ -7533,36 +7582,14 @@ }, vSwitchGuestName:{ - label:'vSwitch Guest Traffic Name', + label:' Guest Traffic vSwitch Name', dependsOn:'overrideguesttraffic', isHidden:true }, - - - vCenterHost: { - label: 'label.vcenter.host', - docID: 'helpClustervCenterHost', - validation: { required: true } - }, - vCenterUsername: { - label: 'label.vcenter.username', - docID: 'helpClustervCenterUsername', - validation: { required: true } - }, - vCenterPassword: { - label: 'label.vcenter.password', - docID: 'helpClustervCenterPassword', - validation: { required: true }, - isPassword: true - }, - vCenterDatacenter: { - label: 'label.vcenter.datacenter', - docID: 'helpClustervCenterDatacenter', - validation: { required: true } - }, + vsmipaddress: { label: 'Nexus 1000v IP Address', validation: { required: true }, @@ -7609,12 +7636,20 @@ array1.push("&username=" + todb(args.data.vCenterUsername)); array1.push("&password=" + todb(args.data.vCenterPassword)); + //vSwitch Public Type if(args.data.vSwitchPublicType != "") - array1.push('&vswitchtypepublic=' + args.data.vSwitchPublicType); + array1.push("&vswitchtypepublic=" + args.data.vSwitchPublicType); - if(args.data.vSwitchGuestType != "") - array1.push('&vswitchtypeguest=' + args.data.vSwitchGuestType); + if(args.data.vSwitchPublicName != "") + array1.push("&publicvswitchname=" +args.data.vSwitchPublicName); + + //vSwitch Guest Type + if(args.data.vSwitchGuestType != "") + array1.push("&vswitchtypeguest=" + args.data.vSwitchGuestType); + + if(args.data.vSwitchGuestName !="") + array1.push("&guestvswitchname=" +args.data.vSwitchGuestName); if (args.data.vsmipaddress) { array1.push('&vsmipaddress=' + args.data.vsmipaddress); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd583613/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index e6b5c1a..95a7550 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -773,12 +773,32 @@ if($(this).val() == "VMware") { //$('li[input_sub_group="external"]', $dialogAddCluster).show(); if(dvSwitchEnabled ){ - $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'inline-block'); + /* $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'inline-block'); $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'inline-block'); - } + + $form.find('.form-item[rel=vSwitchPublicName]').css('display','inline-block'); + $form.find('.form-item[rel=vSwitchGuestName]').css('display','inline-block'); + + $form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').css('display','inline-block'); + $form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').css('display','inline-block');*/ + + $form.find('.form-item[rel=overridepublictraffic]').css('display','inline-block'); + $form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').removeAttr('checked'); + + $form.find('.form-item[rel=overrideguesttraffic]').css('display','inline-block'); + $form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').removeAttr('checked'); + + + + } else { - $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none'); + /* $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none'); $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none'); + $form.find('.form-item[rel=vSwitchPublicName]').css('display','none'); + $form.find('.form-item[rel=vSwitchGuestName]').css('display','none');*/ + $form.find('.form-item[rel=overridepublictraffic]').css('display','none'); + $form.find('.form-item[rel=overrideguesttraffic]').css('display','none'); + } $form.find('[rel=vCenterHost]').css('display', 'block'); @@ -795,6 +815,15 @@ } else { //$('li[input_group="vmware"]', $dialogAddCluster).hide(); + + $form.find('.form-item[rel=overridepublictraffic]').css('display', 'none'); + $form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none'); + $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none'); + $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none'); + $form.find('.form-item[rel=vSwitchPublicName]').css('display','none'); + $form.find('.form-item[rel=vSwitchGuestName]').css('display','none'); + + $form.find('[rel=vCenterHost]').css('display', 'none'); $form.find('[rel=vCenterUsername]').css('display', 'none'); $form.find('[rel=vCenterPassword]').css('display', 'none'); @@ -811,21 +840,34 @@ }, //hypervisor==VMWare begins here - - overridepublictraffic:{ - label:'Override Public-Traffic', - isBoolean:true - - }, + + vCenterHost: { + label: 'label.vcenter.host', + validation: { required: true } + }, + vCenterUsername: { + label: 'label.vcenter.username', + validation: { required: true } + }, + vCenterPassword: { + label: 'label.vcenter.password', + validation: { required: true }, + isPassword: true + }, + vCenterDatacenter: { + label: 'label.vcenter.datacenter', + validation: { required: true } + }, - overrideguesttraffic:{ - label:'Override Guest-Traffic', - isBoolean:true + overridepublictraffic:{ + label:'Override Public-Traffic', + isBoolean:true, + isHidden:true - }, + }, - vSwitchPublicType:{ + vSwitchPublicType:{ label: 'Public Traffic vSwitch Type', select: function(args) { var items = [] @@ -840,25 +882,34 @@ dependsOn:'overridepublictraffic' }, - vSwitchPublicName:{ - label:'vSwitch Public Traffic Name', - dependsOn:'overridepublictraffic', - isHidden:true + vSwitchPublicName:{ + label:'vSwitch Public Traffic Name', + dependsOn:'overridepublictraffic', + isHidden:true }, - - vSwitchGuestType:{ + overrideguesttraffic:{ + label:'Override Guest-Traffic', + isBoolean:true, + isHidden:true + + }, + + + vSwitchGuestType:{ label: 'Guest Traffic vSwitch Type', select: function(args) { var items = [] items.push({ id:" ", description:" "}); - + items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); - args.response.success({data: items}); - }, isHidden:true, + + args.response.success({data: items}); + + }, isHidden:true, dependsOn:'overrideguesttraffic' }, @@ -869,24 +920,8 @@ isHidden:true }, - - vCenterHost: { - label: 'label.vcenter.host', - validation: { required: true } - }, - vCenterUsername: { - label: 'label.vcenter.username', - validation: { required: true } - }, - vCenterPassword: { - label: 'label.vcenter.password', - validation: { required: true }, - isPassword: true - }, - vCenterDatacenter: { - label: 'label.vcenter.datacenter', - validation: { required: true } - }, + + //Cisco Nexus Vswitch vsmipaddress: { label: 'Nexus 1000v IP Address', validation: { required: true }, @@ -3000,9 +3035,18 @@ if(args.data.cluster.vSwitchPublicType != "") array1.push('&vswitchtypepublic=' + args.data.cluster.vSwitchPublicType); + if(args.data.cluster.vSwitchPublicName != "") + array1.push("&publicvswitchname=" +args.data.cluster.vSwitchPublicName); + + + if(args.data.cluster.vSwitchGuestType != "") array1.push('&vswitchtypeguest=' + args.data.cluster.vSwitchGuestType); + if(args.data.cluster.vSwitchGuestName !="") + array1.push("&guestvswitchname=" +args.data.cluster.vSwitchGuestName); + + if (args.data.cluster.vsmipaddress) { // vSwitch is enabled array1.push('&vsmipaddress=' + args.data.cluster.vsmipaddress); array1.push('&vsmusername=' + args.data.cluster.vsmusername);
