From 1b94047bd877f12c2a0c6db6e79ac9bebaac6c72 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Wed, 27 Feb 2013 14:53:07 +0530 Subject: [PATCH 1/6] DV Switch UI Integration -Set 1 --- ui/scripts/system.js | 58 ++++++++++++++++++++++++++++++++++++++++ ui/scripts/zoneWizard.js | 57 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 3d996129280..4e95652507e 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7347,6 +7347,7 @@ docID: 'helpClusterHypervisor', select: function(args) { var vSwitchEnabled = false; + var dvSwitchEnabled = false; $.ajax({ url: createURL("listHypervisors"), @@ -7375,6 +7376,21 @@ } } }); + + //Check whether dvSwitch is enabled or not + $.ajax({ + url: createURL('listConfigurations'), + data: { + name: 'vmware.use.dvswitch' + }, + async: false, + success: function(json) { + if (json.listconfigurationsresponse.configuration[0].value == 'true') { + dvSwitchEnabled = true; + } + } + }); + args.$select.bind("change", function(event) { var $form = $(this).closest('form'); @@ -7390,6 +7406,16 @@ 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=vSwitchGuestType]').css('display', 'inline-block'); + } + else { + $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none'); + $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none'); + + } $form.find('.form-item[rel=vCenterHost]').css('display', 'inline-block'); $form.find('.form-item[rel=vCenterUsername]').css('display', 'inline-block'); $form.find('.form-item[rel=vCenterPassword]').css('display', 'inline-block'); @@ -7453,6 +7479,31 @@ }, //hypervisor==VMWare begins here + vSwitchPublicType:{ + label: 'Public 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 + }, + 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 + }, + vCenterHost: { label: 'label.vcenter.host', docID: 'helpClustervCenterHost', @@ -7519,6 +7570,13 @@ if(args.data.hypervisor == "VMware") { array1.push("&username=" + todb(args.data.vCenterUsername)); array1.push("&password=" + todb(args.data.vCenterPassword)); + + if(args.data.vSwitchPublicType != "") + array1.push('&vswitchtypepublic=' + args.data.vSwitchPublicType); + + if(args.data.vSwitchGuestType != "") + array1.push('&vswitchtypeguest=' + args.data.vSwitchGuestType); + if (args.data.vsmipaddress) { array1.push('&vsmipaddress=' + args.data.vsmipaddress); diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 8b5171bd9c2..a5c52098421 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -732,7 +732,7 @@ }); var vSwitchEnabled = false; - + var dvSwitchEnabled = false; // Check whether vSwitch capability is enabled $.ajax({ url: createURL('listConfigurations'), @@ -747,6 +747,17 @@ } }); + //Check whether dvSwitch is enabled or not + $.ajax({ + url: createURL('listConfigurations'), + data: { + name: 'vmware.use.dvswitch' + }, + async: false, + success: function(json) { if (json.listconfigurationsresponse.configuration[0].value == 'true') { dvSwitchEnabled = true; + } + } }); + args.$select.bind("change", function(event) { var $form = $(this).closest('form'); var $vsmFields = $form.find('[rel]').filter(function() { @@ -761,6 +772,15 @@ 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=vSwitchGuestType]').css('display', 'inline-block'); + } + else { + $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none'); + $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none'); + } + $form.find('[rel=vCenterHost]').css('display', 'block'); $form.find('[rel=vCenterUsername]').css('display', 'block'); $form.find('[rel=vCenterPassword]').css('display', 'block'); @@ -791,6 +811,32 @@ }, //hypervisor==VMWare begins here + + vSwitchPublicType:{ + label: 'Public 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 + }, + 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 + }, + vCenterHost: { label: 'label.vcenter.host', validation: { required: true } @@ -2917,7 +2963,14 @@ array1.push("&username=" + todb(args.data.cluster.vCenterUsername)); array1.push("&password=" + todb(args.data.cluster.vCenterPassword)); - if (args.data.cluster.vsmipaddress) { // vSwitch is enabled + //dvswitch is enabled + if(args.data.cluster.vSwitchPublicType != "") + array1.push('&vswitchtypepublic=' + args.data.cluster.vSwitchPublicType); + + if(args.data.cluster.vSwitchGuestType != "") + array1.push('&vswitchtypeguest=' + args.data.cluster.vSwitchGuestType); + + if (args.data.cluster.vsmipaddress) { // vSwitch is enabled array1.push('&vsmipaddress=' + args.data.cluster.vsmipaddress); array1.push('&vsmusername=' + args.data.cluster.vsmusername); array1.push('&vsmpassword=' + args.data.cluster.vsmpassword); From 1f21c126878a23e5786aed2c740977299d7f1da2 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Wed, 27 Feb 2013 15:29:27 +0530 Subject: [PATCH 2/6] dvSwitch-UI Integration - Set 2 --- ui/scripts/system.js | 42 ++++++++++++++++++++++++++++++++++++++-- ui/scripts/zoneWizard.js | 41 +++++++++++++++++++++++++++++++++++---- 2 files changed, 77 insertions(+), 6 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 4e95652507e..3193a0aa83b 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7479,6 +7479,20 @@ }, //hypervisor==VMWare begins here + + overridepublictraffic:{ + label:'Override Public-Traffic', + isBoolean:true + + }, + + overrideguesttraffic:{ + label:'Override Guest-Traffic', + isBoolean:true + + }, + + vSwitchPublicType:{ label: 'Public Traffic vSwitch Type', select: function(args) { @@ -7490,8 +7504,20 @@ items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); args.response.success({data: items}); }, - isHidden:true + isHidden:true, + dependsOn:'overridepublictraffic' }, + + vSwitchPublicName:{ + label:'vSwitch Public Traffic Name', + dependsOn:'overridepublictraffic', + isHidden:true + + + }, + + + vSwitchGuestType:{ label: 'Guest Traffic vSwitch Type', select: function(args) { @@ -7501,9 +7527,21 @@ items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); args.response.success({data: items}); }, - isHidden:true + isHidden:true, + dependsOn:'overrideguesttraffic' + }, + vSwitchGuestName:{ + label:'vSwitch Guest Traffic Name', + dependsOn:'overrideguesttraffic', + isHidden:true + + + }, + + + vCenterHost: { label: 'label.vcenter.host', docID: 'helpClustervCenterHost', diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index a5c52098421..e6b5c1aa31a 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -811,6 +811,19 @@ }, //hypervisor==VMWare begins here + + overridepublictraffic:{ + label:'Override Public-Traffic', + isBoolean:true + + }, + + overrideguesttraffic:{ + label:'Override Guest-Traffic', + isBoolean:true + + }, + vSwitchPublicType:{ label: 'Public Traffic vSwitch Type', @@ -823,8 +836,19 @@ items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); args.response.success({data: items}); }, - isHidden:true - }, + isHidden:true, + dependsOn:'overridepublictraffic' + }, + + vSwitchPublicName:{ + label:'vSwitch Public Traffic Name', + dependsOn:'overridepublictraffic', + isHidden:true + + + }, + + vSwitchGuestType:{ label: 'Guest Traffic vSwitch Type', select: function(args) { @@ -834,8 +858,17 @@ 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 - }, + }, isHidden:true, + dependsOn:'overrideguesttraffic' + + }, + + vSwitchGuestName:{ + label:'vSwitch Guest Traffic Name', + dependsOn:'overrideguesttraffic', + isHidden:true + + }, vCenterHost: { label: 'label.vcenter.host', From bd583613622fed982e862625d077474a6c659fd8 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Wed, 27 Feb 2013 21:23:13 +0530 Subject: [PATCH 3/6] dvSwitch UI integration Set 2 --- ui/scripts/system.js | 175 +++++++++++++++++++++++---------------- ui/scripts/zoneWizard.js | 166 +++++++++++++++++++++++-------------- 2 files changed, 210 insertions(+), 131 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 3193a0aa83b..14a15aa1878 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,68 +7505,6 @@ //hypervisor==VMWare begins here - overridepublictraffic:{ - label:'Override Public-Traffic', - isBoolean:true - - }, - - overrideguesttraffic:{ - label:'Override Guest-Traffic', - isBoolean:true - - }, - - - vSwitchPublicType:{ - label: 'Public 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, - dependsOn:'overridepublictraffic' - }, - - vSwitchPublicName:{ - label:'vSwitch Public Traffic Name', - dependsOn:'overridepublictraffic', - 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, - dependsOn:'overrideguesttraffic' - - }, - - vSwitchGuestName:{ - label:'vSwitch Guest Traffic Name', - dependsOn:'overrideguesttraffic', - isHidden:true - - - }, - - - vCenterHost: { label: 'label.vcenter.host', docID: 'helpClustervCenterHost', @@ -7563,6 +7526,70 @@ docID: 'helpClustervCenterDatacenter', validation: { required: true } }, + + overridepublictraffic:{ + label:'Override Public-Traffic', + isBoolean:true, + isHidden:true, + isChecked:false + + }, + + + vSwitchPublicType:{ + label: 'Public 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, + dependsOn:'overridepublictraffic' + }, + + vSwitchPublicName:{ + 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) { + 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, + dependsOn:'overrideguesttraffic' + + }, + + vSwitchGuestName:{ + label:' Guest Traffic vSwitch Name', + dependsOn:'overrideguesttraffic', + isHidden: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); diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index e6b5c1aa31a..95a7550d8d2 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,64 +840,6 @@ }, //hypervisor==VMWare begins here - - overridepublictraffic:{ - label:'Override Public-Traffic', - isBoolean:true - - }, - - overrideguesttraffic:{ - label:'Override Guest-Traffic', - isBoolean:true - - }, - - - vSwitchPublicType:{ - label: 'Public 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, - dependsOn:'overridepublictraffic' - }, - - vSwitchPublicName:{ - label:'vSwitch Public Traffic Name', - dependsOn:'overridepublictraffic', - 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, - dependsOn:'overrideguesttraffic' - - }, - - vSwitchGuestName:{ - label:'vSwitch Guest Traffic Name', - dependsOn:'overrideguesttraffic', - isHidden:true - - }, vCenterHost: { label: 'label.vcenter.host', @@ -887,6 +858,70 @@ label: 'label.vcenter.datacenter', validation: { required: true } }, + + overridepublictraffic:{ + label:'Override Public-Traffic', + isBoolean:true, + isHidden:true + + }, + + + vSwitchPublicType:{ + label: 'Public 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, + dependsOn:'overridepublictraffic' + }, + + vSwitchPublicName:{ + label:'vSwitch Public Traffic Name', + dependsOn:'overridepublictraffic', + isHidden:true + + + }, + + 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, + dependsOn:'overrideguesttraffic' + + }, + + vSwitchGuestName:{ + label:'vSwitch Guest Traffic Name', + dependsOn:'overrideguesttraffic', + isHidden: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); From c28938091099ecb05f541fe595d60af1869d183a Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Wed, 27 Feb 2013 21:52:47 +0530 Subject: [PATCH 4/6] dvswitch UI integration set 3 --- ui/scripts/system.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 14a15aa1878..24a1c5911b5 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7541,10 +7541,12 @@ select: function(args) { var items = [] - items.push({id: "" , description:" " }); + // items.push({id: "" , description:" " }); items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); + + items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); args.response.success({data: items}); }, isHidden:true, @@ -7571,9 +7573,12 @@ label: 'Guest Traffic vSwitch Type', select: function(args) { var items = [] - items.push({id: "" , description:" " }); + // items.push({id: "" , description:" " }); items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); + + items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); + args.response.success({data: items}); }, isHidden:true, @@ -7638,7 +7643,7 @@ //vSwitch Public Type if(args.data.vSwitchPublicType != "") - array1.push("&vswitchtypepublic=" + args.data.vSwitchPublicType); + array1.push("&publicvswitchtype=" + args.data.vSwitchPublicType); if(args.data.vSwitchPublicName != "") array1.push("&publicvswitchname=" +args.data.vSwitchPublicName); @@ -7646,7 +7651,7 @@ //vSwitch Guest Type if(args.data.vSwitchGuestType != "") - array1.push("&vswitchtypeguest=" + args.data.vSwitchGuestType); + array1.push("&guestvswitchtype=" + args.data.vSwitchGuestType); if(args.data.vSwitchGuestName !="") array1.push("&guestvswitchname=" +args.data.vSwitchGuestName); From 08b2f7734bc9c7968954a1235b32881e017861bf Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Wed, 27 Feb 2013 23:44:02 +0530 Subject: [PATCH 5/6] dvswitch UI integration Complete - Set 4 --- ui/scripts/system.js | 72 ++++++++++++++++++++++++++++++++++++---- ui/scripts/zoneWizard.js | 71 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 131 insertions(+), 12 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 24a1c5911b5..c564b0b2db3 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7407,7 +7407,7 @@ if ($(this).val() == "VMware") { //$('li[input_sub_group="external"]', $dialogAddCluster).show(); - if(dvSwitchEnabled ){ + if(dvSwitchEnabled == false){ // $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'); @@ -7539,14 +7539,42 @@ vSwitchPublicType:{ label: 'Public Traffic vSwitch Type', select: function(args) { - var items = [] + var vSwitchEnabled = false; + var items = [] + $.ajax({ + url: createURL('listConfigurations'), + data: { + name: 'vmware.use.nexus.vswitch' + }, + async: false, + success: function(json) { + if (json.listconfigurationsresponse.configuration[0].value == 'true') { + vSwitchEnabled = true; + } + } + }); - // items.push({id: "" , description:" " }); + if(vSwitchEnabled) { + + items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); - + + + + + } + + // items.push({id: "" , description:" " }); + else{ + items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); + items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); + + items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); + } + args.response.success({data: items}); }, isHidden:true, @@ -7574,11 +7602,41 @@ 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"}); - + + var vSwitchEnabled = false; + $.ajax({ + url: createURL('listConfigurations'), + data: { + name: 'vmware.use.nexus.vswitch' + }, + async: false, + success: function(json) { + if (json.listconfigurationsresponse.configuration[0].value == 'true') { + vSwitchEnabled = true; + } + } + }); + + + if(vSwitchEnabled){ items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); + items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); + items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); + + + } + + + else{ + + items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); + items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); + + items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); + + + } args.response.success({data: items}); }, isHidden:true, diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 95a7550d8d2..b18334a3c89 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -772,7 +772,7 @@ if($(this).val() == "VMware") { //$('li[input_sub_group="external"]', $dialogAddCluster).show(); - if(dvSwitchEnabled ){ + if(dvSwitchEnabled == false){ /* $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'inline-block'); $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'inline-block'); @@ -871,11 +871,41 @@ label: 'Public Traffic vSwitch Type', select: function(args) { var items = [] + var vSwitchEnabled = false; + $.ajax({ + url: createURL('listConfigurations'), + data: { + name: 'vmware.use.nexus.vswitch' + }, + async: false, + success: function(json) { + if (json.listconfigurationsresponse.configuration[0].value == 'true') { + vSwitchEnabled = true; + } + } + }); - items.push({id: " ", description: " "}); + if(vSwitchEnabled) { + items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); + + items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); + items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); + + + + + } + + // items.push({id: " ", description: " "}); + else{ items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); + + + items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); + + } args.response.success({data: items}); }, isHidden:true, @@ -902,11 +932,42 @@ label: 'Guest Traffic vSwitch Type', select: function(args) { var items = [] - items.push({ id:" ", description:" "}); + //items.push({ id:" ", description:" "}); + + var vSwitchEnabled = false; + var items = [] + $.ajax({ + url: createURL('listConfigurations'), + data: { + name: 'vmware.use.nexus.vswitch' + }, + async: false, + success: function(json) { + if (json.listconfigurationsresponse.configuration[0].value == 'true') { + vSwitchEnabled = true; + } + } + }); + + if(vSwitchEnabled) { + + items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); + + items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); + items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); + + + + + } + else{ items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); + items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); + + } args.response.success({data: items}); }, isHidden:true, @@ -3033,7 +3094,7 @@ //dvswitch is enabled if(args.data.cluster.vSwitchPublicType != "") - array1.push('&vswitchtypepublic=' + args.data.cluster.vSwitchPublicType); + array1.push('&publicvswitchtype=' + args.data.cluster.vSwitchPublicType); if(args.data.cluster.vSwitchPublicName != "") array1.push("&publicvswitchname=" +args.data.cluster.vSwitchPublicName); @@ -3041,7 +3102,7 @@ if(args.data.cluster.vSwitchGuestType != "") - array1.push('&vswitchtypeguest=' + args.data.cluster.vSwitchGuestType); + array1.push('&guestvswitchtype=' + args.data.cluster.vSwitchGuestType); if(args.data.cluster.vSwitchGuestName !="") array1.push("&guestvswitchname=" +args.data.cluster.vSwitchGuestName); From b07f482bac38b377ba8ff13d0ce40f73677b2e9d Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Thu, 28 Feb 2013 00:15:04 +0530 Subject: [PATCH 6/6] dvswitch UI integration Complete:Enabling the flag - Set 4 --- ui/scripts/system.js | 2 +- ui/scripts/zoneWizard.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index c564b0b2db3..334993b22c9 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7407,7 +7407,7 @@ if ($(this).val() == "VMware") { //$('li[input_sub_group="external"]', $dialogAddCluster).show(); - if(dvSwitchEnabled == false){ + 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=vSwitchPublicName]').css('display','inline-block'); diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index b18334a3c89..883553ccbd4 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -772,7 +772,7 @@ if($(this).val() == "VMware") { //$('li[input_sub_group="external"]', $dialogAddCluster).show(); - if(dvSwitchEnabled == false){ + if(dvSwitchEnabled ){ /* $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'inline-block'); $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'inline-block');