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:53 UTC
[47/50] git commit: updated refs/heads/sf-plugins to 157efc3
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/09760553
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/09760553
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/09760553
Branch: refs/heads/sf-plugins
Commit: 09760553394f37967d1764eb136d328be7687f06
Parents: f5a299a
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Tue Jul 28 15:16:42 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Fri Sep 18 19:28:24 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/09760553/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/09760553/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/09760553/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/09760553/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/09760553/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'
}
}
],