You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mt...@apache.org on 2015/09/19 03:31:47 UTC
[41/50] git commit: updated refs/heads/sf-plugins to 157efc3
Modifications to fields for virtual-networking support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/576e524f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/576e524f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/576e524f
Branch: refs/heads/sf-plugins
Commit: 576e524fee1bc978414440851ceb09aaa33eddfe
Parents: c2c42b0
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Wed Jul 22 20:07:23 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Fri Sep 18 19:28:23 2015 -0600
----------------------------------------------------------------------
ui/plugins/sfAdministration/sfAdministration.js | 88 +++-----------------
1 file changed, 13 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/576e524f/ui/plugins/sfAdministration/sfAdministration.js
----------------------------------------------------------------------
diff --git a/ui/plugins/sfAdministration/sfAdministration.js b/ui/plugins/sfAdministration/sfAdministration.js
index a18f81d..68a3197 100644
--- a/ui/plugins/sfAdministration/sfAdministration.js
+++ b/ui/plugins/sfAdministration/sfAdministration.js
@@ -383,66 +383,12 @@
required: true
}
},
- description: {
- label: 'Description',
- validation: {
- required: true
- }
- },
tag: {
label: 'Tag',
validation: {
required: true
}
},
- physicalnetwork: {
- label: 'Physical Network',
- validation: {
- required: true
- },
- select: function(args) {
- $.ajax({
- url: createURL("listAccounts&listAll=true"),
- dataType: "json",
- async: true,
- success: function(json) {
- var accountObjs = json.listaccountsresponse.account;
-
- args.response.success({
- descriptionField: 'name',
- data: accountObjs
- });
- }
- });
- }
- },
- networkoffering: {
- label: 'Network Offering',
- validation: {
- required: true
- },
- select: function(args) {
- $.ajax({
- url: createURL("listAccounts&listAll=true"),
- dataType: "json",
- async: true,
- success: function(json) {
- var accountObjs = json.listaccountsresponse.account;
-
- args.response.success({
- descriptionField: 'name',
- data: accountObjs
- });
- }
- });
- }
- },
- gateway: {
- label: 'Gateway',
- validation: {
- required: true
- }
- },
netmask: {
label: 'Netmask',
validation: {
@@ -455,10 +401,11 @@
required: true
}
},
- endip: {
- label: 'End IP',
+ size: {
+ label: 'Size',
validation: {
- required: true
+ required: true,
+ number: true
}
},
svip: {
@@ -472,13 +419,13 @@
action: function(args) {
var data = {
clustername: args.context.sfAdministration[0].name,
+ accountid: args.data.account,
name: args.data.name,
tag: args.data.tag,
- startip: args.data.startip,
- size: 10, // Mike T. args.data.size,
netmask: args.data.netmask,
- svip: args.data.svip,
- accountid: args.data.account
+ startip: args.data.startip,
+ size: args.data.size,
+ svip: args.data.svip
};
$.ajax({
@@ -514,9 +461,9 @@
params.push("&id=" + args.context.sfVirtualNetworks[0].id);
params.push("&name=" + args.data.name);
params.push("&tag=" + args.data.tag);
- params.push("&startip=" + args.data.startip);
- params.push("&size=" + "10"); // Mike T. args.data.size);
params.push("&netmask=" + args.data.netmask);
+ params.push("&startip=" + args.data.startip);
+ params.push("&size=" + args.data.size);
params.push("&svip=" + args.data.svip);
$.ajax({
@@ -581,16 +528,6 @@
label: 'Tag',
isEditable: true
},
- physicalnetwork: {
- label: 'Physical Network'
- },
- networkoffering: {
- label: 'Network Offering'
- },
- gateway: {
- label: 'Gateway',
- isEditable: true
- },
netmask: {
label: 'Netmask',
isEditable: true
@@ -599,8 +536,9 @@
label: 'Start IP',
isEditable: true
},
- endip: {
- label: 'End IP',
+ size: {
+ label: 'Size',
+ number: true,
isEditable: true
},
svip: {