Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 45159180AE for ; Sat, 19 Sep 2015 01:31:19 +0000 (UTC) Received: (qmail 83491 invoked by uid 500); 19 Sep 2015 01:31:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 83435 invoked by uid 500); 19 Sep 2015 01:31:08 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 81579 invoked by uid 99); 19 Sep 2015 01:31:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Sep 2015 01:31:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CE18EE0AFE; Sat, 19 Sep 2015 01:31:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mtutkowski@apache.org To: commits@cloudstack.apache.org Date: Sat, 19 Sep 2015 01:31:47 -0000 Message-Id: <2d2cc6116be1471baf0c2e95409bfb4e@git.apache.org> In-Reply-To: <1ba3cd7f4a18434d91b25d563b872cbb@git.apache.org> References: <1ba3cd7f4a18434d91b25d563b872cbb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Wed Jul 22 20:07:23 2015 -0600 Committer: Mike Tutkowski 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: {