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 5941F18E32 for ; Tue, 28 Jul 2015 21:34:19 +0000 (UTC) Received: (qmail 27334 invoked by uid 500); 28 Jul 2015 21:34:16 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 27139 invoked by uid 500); 28 Jul 2015 21:34:16 -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 27077 invoked by uid 99); 28 Jul 2015 21:34:16 -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; Tue, 28 Jul 2015 21:34:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08087E35DB; Tue, 28 Jul 2015 21:34:16 +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: Tue, 28 Jul 2015 21:34:17 -0000 Message-Id: In-Reply-To: <67fb081f3da04f93ab42f605a9560aea@git.apache.org> References: <67fb081f3da04f93ab42f605a9560aea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/sf-plugins to f812e10 The SVIP cannot be changed Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f812e10b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f812e10b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f812e10b Branch: refs/heads/sf-plugins Commit: f812e10bb62c0595831856b6e0d780e2993993d5 Parents: 4673447 Author: Mike Tutkowski Authored: Tue Jul 28 15:16:42 2015 -0600 Committer: Mike Tutkowski Committed: Tue Jul 28 15:16:42 2015 -0600 ---------------------------------------------------------------------- .../solidfire/UpdateSolidFireVirtualNetworkCmd.java | 5 +---- .../cloudstack/solidfire/ApiSolidFireService2.java | 2 +- .../cloudstack/solidfire/ApiSolidFireServiceImpl2.java | 6 ++---- .../cloudstack/solidfire/util/SolidFireConnection.java | 12 +++++------- ui/plugins/sfAdministration/sfAdministration.js | 4 +--- 5 files changed, 10 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f812e10b/plugins/api/solidfire/src/org/apache/cloudstack/api/command/admin/solidfire/UpdateSolidFireVirtualNetworkCmd.java ---------------------------------------------------------------------- diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/api/command/admin/solidfire/UpdateSolidFireVirtualNetworkCmd.java b/plugins/api/solidfire/src/org/apache/cloudstack/api/command/admin/solidfire/UpdateSolidFireVirtualNetworkCmd.java index 2d71947..6620d26 100644 --- a/plugins/api/solidfire/src/org/apache/cloudstack/api/command/admin/solidfire/UpdateSolidFireVirtualNetworkCmd.java +++ b/plugins/api/solidfire/src/org/apache/cloudstack/api/command/admin/solidfire/UpdateSolidFireVirtualNetworkCmd.java @@ -56,9 +56,6 @@ public class UpdateSolidFireVirtualNetworkCmd extends BaseCmd { @Parameter(name = ApiHelper.NETMASK, type = CommandType.STRING, description = ApiHelper.NETMASK, required = true) private String _netmask; - @Parameter(name = ApiHelper.SVIP, type = CommandType.STRING, description = ApiHelper.SOLIDFIRE_SVIP_DESC, required = true) - private String _svip; - @Inject private ApiHelper _apiHelper; @Inject private ApiSolidFireService2 _apiSolidFireService2; @@ -87,7 +84,7 @@ public class UpdateSolidFireVirtualNetworkCmd extends BaseCmd { try { s_logger.info(UpdateSolidFireVirtualNetworkCmd.class.getName() + ".execute invoked"); - SfVirtualNetwork sfVirtualNetwork = _apiSolidFireService2.updateSolidFireVirtualNetwork(_id, _name, _startIp, _size, _netmask, _svip); + SfVirtualNetwork sfVirtualNetwork = _apiSolidFireService2.updateSolidFireVirtualNetwork(_id, _name, _startIp, _size, _netmask); ApiSolidFireVirtualNetworkResponse response = _apiHelper.getApiSolidFireVirtualNetworkResponse(sfVirtualNetwork, ResponseView.Full); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f812e10b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireService2.java ---------------------------------------------------------------------- diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireService2.java b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireService2.java index 12f276c..03bcb19 100644 --- a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireService2.java +++ b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireService2.java @@ -53,7 +53,7 @@ public interface ApiSolidFireService2 extends PluggableService, Configurable { SfVirtualNetwork createSolidFireVirtualNetwork(String clusterName, String name, String tag, String startIp, int size, String netmask, String svip, long accountId); - SfVirtualNetwork updateSolidFireVirtualNetwork(long id, String name, String startIp, int size, String netmask, String svip); + SfVirtualNetwork updateSolidFireVirtualNetwork(long id, String name, String startIp, int size, String netmask); SfVirtualNetwork deleteSolidFireVirtualNetwork(long id); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f812e10b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java ---------------------------------------------------------------------- diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java index 9137c07..28cbd89 100644 --- a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java +++ b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java @@ -332,7 +332,7 @@ public class ApiSolidFireServiceImpl2 extends AdapterBase implements APIChecker, } @Override - public SfVirtualNetwork updateSolidFireVirtualNetwork(long id, String name, String startIp, int size, String netmask, String svip) { + public SfVirtualNetwork updateSolidFireVirtualNetwork(long id, String name, String startIp, int size, String netmask) { s_logger.info("updateSolidFireVirtualNetwork invoked"); verifyRootAdmin(); @@ -345,14 +345,12 @@ public class ApiSolidFireServiceImpl2 extends AdapterBase implements APIChecker, SolidFireConnection sfConnection = new SolidFireConnection(sfClusterVO.getMvip(), sfClusterVO.getUsername(), sfClusterVO.getPassword()); - sfConnection.modifyVirtualNetwork(name, sfVirtualNetworkVO.getTag(), startIp, size, netmask, svip); + sfConnection.modifyVirtualNetwork(name, sfVirtualNetworkVO.getTag(), startIp, size, netmask); sfVirtualNetworkVO.setName(name); - sfVirtualNetworkVO.setTag(sfVirtualNetworkVO.getTag()); sfVirtualNetworkVO.setStartIp(startIp); sfVirtualNetworkVO.setSize(size); sfVirtualNetworkVO.setNetmask(netmask); - sfVirtualNetworkVO.setSvip(svip); if (_sfVirtualNetworkDao.update(sfVirtualNetworkVO.getId(), sfVirtualNetworkVO)) { return sfVirtualNetworkVO; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f812e10b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/util/SolidFireConnection.java ---------------------------------------------------------------------- diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/util/SolidFireConnection.java b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/util/SolidFireConnection.java index f00a84b..a9e8d84 100644 --- a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/util/SolidFireConnection.java +++ b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/util/SolidFireConnection.java @@ -95,10 +95,10 @@ public class SolidFireConnection { return virtualNetworkAddResult.result.virtualNetworkID; } - public void modifyVirtualNetwork(String name, String tag, String startIp, int size, String netmask, String svip) { + public void modifyVirtualNetwork(String name, String tag, String startIp, int size, String netmask) { final Gson gson = new GsonBuilder().create(); - VirtualNetworkToModify virtualNetworkToModify = new VirtualNetworkToModify(name, tag, startIp, size, netmask, svip); + VirtualNetworkToModify virtualNetworkToModify = new VirtualNetworkToModify(name, tag, startIp, size, netmask); String strVirtualNetworkToModifyJson = gson.toJson(virtualNetworkToModify); @@ -428,8 +428,8 @@ public class SolidFireConnection { private final String method = "ModifyVirtualNetwork"; private final VirtualNetworkToModifyParams params; - public VirtualNetworkToModify(String name, String tag, String startIp, int size, String netmask, String svip) { - params = new VirtualNetworkToModifyParams(name, tag, startIp, size, netmask, svip); + public VirtualNetworkToModify(String name, String tag, String startIp, int size, String netmask) { + params = new VirtualNetworkToModifyParams(name, tag, startIp, size, netmask); } private static final class VirtualNetworkToModifyParams { @@ -437,16 +437,14 @@ public class SolidFireConnection { private final String virtualNetworkTag; private final AddressBlock[] addressBlocks = new AddressBlock[1]; private final String netmask; - private final String svip; - public VirtualNetworkToModifyParams(String name, String tag, String startIp, int size, String netmask, String svip) { + public VirtualNetworkToModifyParams(String name, String tag, String startIp, int size, String netmask) { this.name = name; this.virtualNetworkTag = tag; this.addressBlocks[0] = new AddressBlock(startIp, size); this.netmask = netmask; - this.svip = svip; } private static final class AddressBlock { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f812e10b/ui/plugins/sfAdministration/sfAdministration.js ---------------------------------------------------------------------- diff --git a/ui/plugins/sfAdministration/sfAdministration.js b/ui/plugins/sfAdministration/sfAdministration.js index 9fabf58..ce6da59 100644 --- a/ui/plugins/sfAdministration/sfAdministration.js +++ b/ui/plugins/sfAdministration/sfAdministration.js @@ -463,7 +463,6 @@ 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({ url: createURL('updateSolidFireVirtualNetwork' + params.join("")), @@ -540,8 +539,7 @@ isEditable: true }, svip: { - label: 'SVIP', - isEditable: true + label: 'SVIP' } } ],