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/07/10 01:08:29 UTC
git commit: updated refs/heads/master to 7b783f0
Updated Branches:
refs/heads/master 5db3057b0 -> 7b783f0df
CLOUDSTACK-3427: UI > UCS manager > implement listUcsBlade API.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7b783f0d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b783f0d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b783f0d
Branch: refs/heads/master
Commit: 7b783f0df43bf187afe06220e16d75b35073df8d
Parents: 5db3057
Author: Jessica Wang <je...@apache.org>
Authored: Tue Jul 9 16:07:34 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Tue Jul 9 16:08:19 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 40 +++++++++++++++++++++++++++++-----------
1 file changed, 29 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b783f0d/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 6d1f6b8..1d7a59b 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -13073,34 +13073,52 @@
bladeid: { label: 'Blade ID' },
associatedProfileDn: { label: 'Associated Profile' }
},
- dataProvider: function(args) {
- /*
+ dataProvider: function(args) {
$.ajax({
url: createURL('listUcsBlade'),
data: {
ucsmanagerid: args.context.ucsManagers[0].id
},
success: function(json) {
+ var data = json.listucsbladeresponse.ucsblade? json.listucsbladeresponse.ucsblade: [];
+ for(var i = 0; i < data.length; i++) {
+ var array1 = data[i].bladedn.split('/');
+ data[i].chassis = array1[1];
+ data[i].bladeid = array1[2];
+ }
+
+ args.response.success({
+ data: data
+ });
}
- });
- */
+ });
- var data = [
- { id: '85a2ff00-ed42-4a18-8f5f-bb75c9ffd413', hostId: '62be4b10-a828-4ea2-aed8-9ad1d0812ff9', dn: 'sys/chassis-1/blade-1', associatedProfileDn: '' },
- { id: '85a2ff00-ed42-4a18-8f5f-bb75c9ffd413', hostId: '62be4b10-a828-4ea2-aed8-9ad1d0812ff9', dn: 'sys/chassis-2/blade-2', associatedProfileDn: '' },
- { id: '85a2ff00-ed42-4a18-8f5f-bb75c9ffd413', hostId: '62be4b10-a828-4ea2-aed8-9ad1d0812ff9', dn: 'sys/chassis-3/blade-3', associatedProfileDn: '' }
- ];
+ /*
+ var data = [
+ {
+ "id": "58c84a1d-6e46-44e3-b7ec-abaa876d1be3",
+ "ucsmanagerid": "0c96f848-4306-47e5-a9ac-b76aad3557fb",
+ "bladedn": "sys/chassis-1/blade-1"
+ },
+ {
+ "id": "de5abadf-f294-4014-9fed-7ee37a9b8724",
+ "ucsmanagerid": "0c96f848-4306-47e5-a9ac-b76aad3557fb",
+ "bladedn": "sys/chassis-1/blade-2"
+ }
+ ];
for(var i = 0; i < data.length; i++) {
- var array1 = data[i].dn.split('/');
+ var array1 = data[i].bladedn.split('/');
data[i].chassis = array1[1];
data[i].bladeid = array1[2];
}
args.response.success({
data: data
- });
+ });
+ */
+
},
actions: {
associateProfileToBlade: {