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/10/01 04:23:24 UTC
[5/5] git commit: updated refs/heads/sf-plugins-a to cb53d9f
testing
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb53d9f1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb53d9f1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb53d9f1
Branch: refs/heads/sf-plugins-a
Commit: cb53d9f1523ab3ce812cbf6cfef0c262392a89e5
Parents: 5a33835
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Wed Sep 23 18:15:52 2015 -0600
Committer: Mike Tutkowski <mt...@mtutkowski-LT.local>
Committed: Wed Sep 30 16:31:07 2015 -0600
----------------------------------------------------------------------
.../cloudstack/solidfire/SolidFireManagerImpl.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb53d9f1/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/SolidFireManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/SolidFireManagerImpl.java b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/SolidFireManagerImpl.java
index e02a9c5..332f492 100644
--- a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/SolidFireManagerImpl.java
+++ b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/SolidFireManagerImpl.java
@@ -303,9 +303,10 @@ public class SolidFireManagerImpl implements SolidFireManager {
SfCluster sfCluster = getSfCluster(clusterName);
- SolidFireConnection sfConnection = new SolidFireConnection(sfCluster.getMvip(), sfCluster.getUsername(), sfCluster.getPassword());
+ // SolidFireConnection sfConnection = new SolidFireConnection(sfCluster.getMvip(), sfCluster.getUsername(), sfCluster.getPassword());
- long sfVirtualNetworkId = sfConnection.createVirtualNetwork(name, tag, startIp, size, netmask, svip);
+ // long sfVirtualNetworkId = sfConnection.createVirtualNetwork(name, tag, startIp, size, netmask, svip);
+ long sfVirtualNetworkId = (long)(Math.random() * 1000);
SfVirtualNetworkVO sfVirtualNetworkVO = new SfVirtualNetworkVO(sfVirtualNetworkId, name, tag, startIp, size, netmask, svip, accountId, sfCluster.getId());
@@ -322,11 +323,11 @@ public class SolidFireManagerImpl implements SolidFireManager {
long sfClusterId = sfVirtualNetworkVO.getSfClusterId();
- SfClusterVO sfClusterVO = getSfCluster(sfClusterId);
+ SfClusterVO sfClusterVO = getSfCluster(sfClusterId); sfClusterVO.getTotalCapacity(); // just doing something with sfClusterVO
- SolidFireConnection sfConnection = new SolidFireConnection(sfClusterVO.getMvip(), sfClusterVO.getUsername(), sfClusterVO.getPassword());
+ // SolidFireConnection sfConnection = new SolidFireConnection(sfClusterVO.getMvip(), sfClusterVO.getUsername(), sfClusterVO.getPassword());
- sfConnection.modifyVirtualNetwork(sfVirtualNetworkVO.getSfId(), name, startIp, size, netmask);
+ // sfConnection.modifyVirtualNetwork(sfVirtualNetworkVO.getSfId(), name, startIp, size, netmask);
sfVirtualNetworkVO.setName(name);
sfVirtualNetworkVO.setStartIp(startIp);
@@ -358,11 +359,11 @@ public class SolidFireManagerImpl implements SolidFireManager {
throw new CloudRuntimeException("Unable to remove the following virtual network: " + id);
}
- SfCluster sfCluster = getSfCluster(sfVirtualNetwork.getSfClusterId());
+ SfCluster sfCluster = getSfCluster(sfVirtualNetwork.getSfClusterId()); sfCluster.getTotalCapacity(); // just doing something with sfCluster
- SolidFireConnection sfConnection = new SolidFireConnection(sfCluster.getMvip(), sfCluster.getUsername(), sfCluster.getPassword());
+ // SolidFireConnection sfConnection = new SolidFireConnection(sfCluster.getMvip(), sfCluster.getUsername(), sfCluster.getPassword());
- sfConnection.deleteVirtualNetwork(sfVirtualNetwork.getSfId());
+ // sfConnection.deleteVirtualNetwork(sfVirtualNetwork.getSfId());
return sfVirtualNetwork;
}