etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed F5 usage code to work with iControl API's high-order/low-order integers.

This commit is contained in:
keshav 2011-10-31 16:20:25 -07:00
parent 1a91ec99f8
commit d245a4f188
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/com/cloud/network/resource/F5BigIpResource.java
View File

@ -47,6 +47,7 @@ import iControl.SystemConfigSyncSaveMode;
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -907,6 +908,7 @@ public class F5BigIpResource implements ServerResource {
ExternalNetworkResourceUsageAnswer answer = new ExternalNetworkResourceUsageAnswer(cmd);
try {
LocalLBVirtualServerVirtualServerStatistics stats = _virtualServerApi.get_all_statistics();
for (LocalLBVirtualServerVirtualServerStatisticEntry entry : stats.getStatistics()) {
String virtualServerIp = entry.getVirtual_server().getAddress();
@ -920,15 +922,23 @@ public class F5BigIpResource implements ServerResource {
if (bytesSentAndReceived == null) {
bytesSentAndReceived = new long[]{0, 0};
}
for (CommonStatistic stat : entry.getStatistics()) {
if (stat.getType().equals(CommonStatisticType.STATISTIC_CLIENT_SIDE_BYTES_OUT)) {
int index;
if (stat.getType().equals(CommonStatisticType.STATISTIC_CLIENT_SIDE_BYTES_OUT)) {
// Add to the outgoing bytes
bytesSentAndReceived[0] += stat.getValue().getLow();
index = 0;
} else if (stat.getType().equals(CommonStatisticType.STATISTIC_CLIENT_SIDE_BYTES_IN)) {
// Add to the incoming bytes
bytesSentAndReceived[1] += stat.getValue().getLow();
index = 1;
} else {
continue;
}
long high = stat.getValue().getHigh() & 0x0000ffff;
long low = stat.getValue().getLow() & 0x0000ffff;
long full = (high << 32) | low;
bytesSentAndReceived[index] += full;
}
if (bytesSentAndReceived[0] >= 0 && bytesSentAndReceived[1] >= 0) {