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:54 UTC
[48/50] git commit: updated refs/heads/sf-plugins to 157efc3
Modify a virtual network by using its SolidFire ID instead of its VLAN tag
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4cc742e6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4cc742e6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4cc742e6
Branch: refs/heads/sf-plugins
Commit: 4cc742e6226fd7b7db1aa19793ca7a1440bf4ba1
Parents: 0976055
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Wed Jul 29 12:25:01 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Fri Sep 18 19:28:24 2015 -0600
----------------------------------------------------------------------
.../solidfire/ApiSolidFireServiceImpl2.java | 2 +-
.../solidfire/util/SolidFireConnection.java | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4cc742e6/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 28cbd89..29a920c 100644
--- a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java
+++ b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java
@@ -345,7 +345,7 @@ 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);
+ sfConnection.modifyVirtualNetwork(sfVirtualNetworkVO.getSfId(), name, startIp, size, netmask);
sfVirtualNetworkVO.setName(name);
sfVirtualNetworkVO.setStartIp(startIp);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4cc742e6/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 a9e8d84..33f47c8 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) {
+ public void modifyVirtualNetwork(long id, String name, String startIp, int size, String netmask) {
final Gson gson = new GsonBuilder().create();
- VirtualNetworkToModify virtualNetworkToModify = new VirtualNetworkToModify(name, tag, startIp, size, netmask);
+ VirtualNetworkToModify virtualNetworkToModify = new VirtualNetworkToModify(id, name, startIp, size, netmask);
String strVirtualNetworkToModifyJson = gson.toJson(virtualNetworkToModify);
@@ -428,19 +428,19 @@ public class SolidFireConnection {
private final String method = "ModifyVirtualNetwork";
private final VirtualNetworkToModifyParams params;
- public VirtualNetworkToModify(String name, String tag, String startIp, int size, String netmask) {
- params = new VirtualNetworkToModifyParams(name, tag, startIp, size, netmask);
+ public VirtualNetworkToModify(long id, String name, String startIp, int size, String netmask) {
+ params = new VirtualNetworkToModifyParams(id, name, startIp, size, netmask);
}
private static final class VirtualNetworkToModifyParams {
+ private final long virtualNetworkID;
private final String name;
- private final String virtualNetworkTag;
private final AddressBlock[] addressBlocks = new AddressBlock[1];
private final String netmask;
- public VirtualNetworkToModifyParams(String name, String tag, String startIp, int size, String netmask) {
+ public VirtualNetworkToModifyParams(long id, String name, String startIp, int size, String netmask) {
+ this.virtualNetworkID = id;
this.name = name;
- this.virtualNetworkTag = tag;
this.addressBlocks[0] = new AddressBlock(startIp, size);
@@ -470,7 +470,7 @@ public class SolidFireConnection {
}
private static final class VirtualNetworkToDeleteParams {
- private long virtualNetworkID;
+ private final long virtualNetworkID;
private VirtualNetworkToDeleteParams(long id) {
virtualNetworkID = id;