You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/08/16 19:43:29 UTC
git commit: updated refs/heads/4.2 to 4f8fe9c
Updated Branches:
refs/heads/4.2 524e73c63 -> 4f8fe9c06
CLOUDSTACK-4355: UI > Infrastructure > clusters > add cluster dialog > show Public Traffic vSwitch Type/Name when Override Public Traffic is checked; show Guest Traffic vSwitch Type/Name when Override Guest Traffic is checked.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f8fe9c0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f8fe9c0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f8fe9c0
Branch: refs/heads/4.2
Commit: 4f8fe9c0629cab744b675b121375657362226eb4
Parents: 524e73c
Author: Jessica Wang <je...@apache.org>
Authored: Fri Aug 16 10:40:19 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Aug 16 10:43:17 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 73 ++++++++++++++++++++++++++++-------------------
1 file changed, 44 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f8fe9c0/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 5ce32bc..6070e27 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -10343,9 +10343,9 @@
//$('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=vSwitchPublicName]').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');
@@ -10353,13 +10353,17 @@
$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=vSwitchPublicName]').css('display','none');
- //$form.find('.form-item[rel=vSwitchGuestName]').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');
$form.find('.form-item[rel=vCenterUsername]').css('display', 'inline-block');
@@ -10376,10 +10380,11 @@
$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=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');
@@ -10518,7 +10523,7 @@
},
- /*
+
vSwitchPublicType: {
label: 'Public Traffic vSwitch Type',
select: function(args) {
@@ -10536,7 +10541,9 @@
}
}
});
+
if (vSwitchEnabled) {
+
items.push({
id: "nexusdvs",
description: "Cisco Nexus 1000v Distributed Virtual Switch"
@@ -10549,7 +10556,13 @@
id: "vmwaredvs",
description: "VMware vNetwork Distributed Virtual Switch"
});
- }
+
+
+
+
+ }
+
+ // items.push({id: "" , description:" " });
else {
items.push({
id: "vmwaredvs",
@@ -10564,6 +10577,7 @@
description: "Cisco Nexus 1000v Distributed Virtual Switch"
});
}
+
args.response.success({
data: items
});
@@ -10571,15 +10585,14 @@
isHidden: true,
dependsOn: 'overridepublictraffic'
},
- */
- /*
vSwitchPublicName: {
label: 'Public Traffic vSwitch Name',
dependsOn: 'overridepublictraffic',
isHidden: true
+
+
},
- */
overrideguesttraffic: {
label: 'Override Guest-Traffic',
@@ -10590,11 +10603,13 @@
},
- /*
+
vSwitchGuestType: {
label: 'Guest Traffic vSwitch Type',
select: function(args) {
- var items = [];
+ var items = []
+ // items.push({id: "" , description:" " });
+
var vSwitchEnabled = false;
$.ajax({
url: createURL('listConfigurations'),
@@ -10608,6 +10623,8 @@
}
}
});
+
+
if (vSwitchEnabled) {
items.push({
id: "nexusdvs",
@@ -10621,6 +10638,7 @@
id: "vmwaredvs",
description: "VMware vNetwork Distributed Virtual Switch"
});
+
} else {
items.push({
id: "vmwaredvs",
@@ -10634,6 +10652,8 @@
id: "nexusdvs",
description: "Cisco Nexus 1000v Distributed Virtual Switch"
});
+
+
}
args.response.success({
data: items
@@ -10641,16 +10661,17 @@
},
isHidden: true,
dependsOn: 'overrideguesttraffic'
+
},
- */
- /*
vSwitchGuestName: {
label: ' Guest Traffic vSwitch Name',
dependsOn: 'overrideguesttraffic',
isHidden: true
+
+
},
- */
+
vsmipaddress: {
label: 'Nexus 1000v IP Address',
@@ -10699,25 +10720,19 @@
array1.push("&password=" + todb(args.data.vCenterPassword));
//vSwitch Public Type
- /*
if (args.data.vSwitchPublicType != "")
array1.push("&publicvswitchtype=" + args.data.vSwitchPublicType);
- */
- /*
if (args.data.vSwitchPublicName != "")
array1.push("&publicvswitchname=" + args.data.vSwitchPublicName);
- */
- /*
+
+ //vSwitch Guest Type
if (args.data.vSwitchGuestType != "")
array1.push("&guestvswitchtype=" + args.data.vSwitchGuestType);
- */
- /*
if (args.data.vSwitchGuestName != "")
array1.push("&guestvswitchname=" + args.data.vSwitchGuestName);
- */
if (args.data.vsmipaddress != null && args.data.vsmipaddress.length > 0) {
array1.push('&vsmipaddress=' + args.data.vsmipaddress);