Updated Branches: refs/heads/vmsync 4f709abd6 -> 3174134b3
get nonoss built Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3174134b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3174134b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3174134b Branch: refs/heads/vmsync Commit: 3174134b325d6915a57ac2bf6aafbe95f0f7c6f8 Parents: 4f709ab Author: Alex Huang <[email protected]> Authored: Mon Jun 24 19:52:53 2013 -0700 Committer: Alex Huang <[email protected]> Committed: Mon Jun 24 19:52:53 2013 -0700 ---------------------------------------------------------------------- .../vmware/VmwareServerDiscoverer.java | 19 ++- .../manager/VmwareStorageManagerImpl.java | 2 +- .../vmware/resource/VmwareResource.java | 11 +- .../cloud/network/resource/F5BigIpResource.java | 142 +++++++++---------- 4 files changed, 86 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3174134b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java index 855a950..6f4be05 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java @@ -23,20 +23,21 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.annotation.PostConstruct; import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + +import com.vmware.vim25.ClusterDasConfigInfo; +import com.vmware.vim25.ManagedObjectReference; + import org.apache.cloudstack.api.ApiConstants; -import org.springframework.beans.NullValueInNestedPathException; import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; import com.cloud.alert.AlertManager; import com.cloud.configuration.Config; -import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.ClusterDetailsDao; import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenter.NetworkType; @@ -67,7 +68,6 @@ import com.cloud.network.PhysicalNetwork; import com.cloud.network.VmwareTrafficLabel; import com.cloud.network.dao.CiscoNexusVSMDeviceDao; import com.cloud.network.element.CiscoNexusVSMElement; -import com.cloud.network.element.CiscoNexusVSMElementService; import com.cloud.resource.Discoverer; import com.cloud.resource.DiscovererBase; import com.cloud.resource.ResourceManager; @@ -81,9 +81,6 @@ import com.cloud.storage.dao.VMTemplateDao; import com.cloud.user.Account; import com.cloud.utils.UriUtils; -import com.vmware.vim25.ClusterDasConfigInfo; -import com.vmware.vim25.ManagedObjectReference; - @Local(value = Discoverer.class) public class VmwareServerDiscoverer extends DiscovererBase implements @@ -129,7 +126,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements } @Override - public Map<? extends ServerResource, Map<String, String>> find(long dcId, Long podId, Long clusterId, URI url, + public Map<? extends ServerResource, Map<String, String>> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List<String> hostTags) throws DiscoveryException { if(s_logger.isInfoEnabled()) @@ -364,7 +361,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements details.put("url", hostMo.getHostName()); details.put("username", username); details.put("password", password); - String guid = morHost.getType() + ":" + morHost.getPresetParams() + String guid = morHost.getType() + ":" + morHost.getValue() + "@" + url.getHost(); details.put("guid", guid); @@ -490,7 +487,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements "ClusterComputeResource")) return false; - if (!morParent.getPresetParams().equals(morCluster.getPresetParams())) + if (!morParent.getValue().equals(morCluster.getValue())) return false; } } @@ -713,7 +710,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements return VirtualSwitchType.NexusDistributedVirtualSwitch; else if(useDVS) return VirtualSwitchType.VMwareDistributedVirtualSwitch; - else + else return VirtualSwitchType.StandardVirtualSwitch; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3174134b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java index 887c81d..0606f38 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java @@ -243,7 +243,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { try { VmwareHypervisorHost hyperHost = hostService.getHyperHost(context, cmd); - String templateUuidName = UUID.nameUUIDFromBytes((templateName + "@" + cmd.getPoolUuid() + "-" + hyperHost.getMor().getPresetParams()).getBytes()).toString(); + String templateUuidName = UUID.nameUUIDFromBytes((templateName + "@" + cmd.getPoolUuid() + "-" + hyperHost.getMor().getValue()).getBytes()).toString(); // truncate template name to 32 chars to ensure they work well with vSphere API's. templateUuidName = templateUuidName.replace("-", ""); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3174134b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index f6fd69d..4620aca 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -557,14 +557,14 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa synchronized (this) { try { - JmxUtil.registerMBean("VMware " + _morHyperHost.getPresetParams(), "Command " + cmdSequence + "-" + cmd.getClass().getSimpleName(), mbean); + JmxUtil.registerMBean("VMware " + _morHyperHost.getValue(), "Command " + cmdSequence + "-" + cmd.getClass().getSimpleName(), mbean); _cmdMBeans.add(mbean); if (_cmdMBeans.size() >= MAX_CMD_MBEAN) { PropertyMapDynamicBean mbeanToRemove = _cmdMBeans.get(0); _cmdMBeans.remove(0); - JmxUtil.unregisterMBean("VMware " + _morHyperHost.getPresetParams(), "Command " + mbeanToRemove.getProp("Sequence") + "-" + mbeanToRemove.getProp("Name")); + JmxUtil.unregisterMBean("VMware " + _morHyperHost.getValue(), "Command " + mbeanToRemove.getProp("Sequence") + "-" + mbeanToRemove.getProp("Name")); } } catch (Exception e) { if(s_logger.isTraceEnabled()) @@ -4955,7 +4955,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa DatastoreSummary dsSummary = dsMo.getSummary(); String address = hostMo.getHostName(); - StoragePoolInfo pInfo = new StoragePoolInfo(poolUuid, address, dsMo.getMor().getPresetParams(), "", StoragePoolType.LVM, dsSummary.getCapacity(), dsSummary.getFreeSpace()); + StoragePoolInfo pInfo = new StoragePoolInfo(poolUuid, address, dsMo.getMor().getValue(), "", StoragePoolType.LVM, dsSummary.getCapacity(), + dsSummary.getFreeSpace()); StartupStorageCommand cmd = new StartupStorageCommand(); cmd.setName(poolUuid); cmd.setPoolInfo(pInfo); @@ -5460,11 +5461,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa int endMs = infos.get(infos.size()-1).getTimestamp().getSecond() * 1000 + infos.get(infos.size()-1).getTimestamp().getMillisecond(); int beginMs = infos.get(0).getTimestamp().getSecond() * 1000 + infos.get(0).getTimestamp().getMillisecond(); sampleDuration = (endMs - beginMs) /1000; - List<PerfMetricSeries> vals = ((PerfEntityMetric)values.get(i)).getPresetParams(); + List<PerfMetricSeries> vals = ((PerfEntityMetric)values.get(i)).getValue(); for(int vi = 0; ((vals!= null) && (vi < vals.size())); ++vi){ if(vals.get(vi) instanceof PerfMetricIntSeries) { PerfMetricIntSeries val = (PerfMetricIntSeries)vals.get(vi); - List<Long> perfValues = val.getPresetParams(); + List<Long> perfValues = val.getValue(); if (vals.get(vi).getId().getCounterId() == rxPerfCounterInfo.getKey()) { networkReadKBs = sampleDuration * perfValues.get(3); //get the average RX rate multiplied by sampled duration } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3174134b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java index 51e2733..8ab1bd7 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java +++ b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java @@ -11,7 +11,7 @@ // Unless required by applicable law or agreed to in writing, // software distributed under the License is distributed on an // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.resource; @@ -102,7 +102,7 @@ public class F5BigIpResource implements ServerResource { public LocalLBLBMethod getMethod() { return method; - } + } } private enum LbProtocol { @@ -117,7 +117,7 @@ public class F5BigIpResource implements ServerResource { private String _password; private String _publicInterface; private String _privateInterface; - private Integer _numRetries; + private Integer _numRetries; private String _guid; private Interfaces _interfaces; @@ -129,14 +129,14 @@ public class F5BigIpResource implements ServerResource { private NetworkingRouteDomainBindingStub _routeDomainApi; private SystemConfigSyncBindingStub _configSyncApi; private LocalLBProfilePersistenceBindingStub _persistenceProfileApi; - private String _objectNamePathSep = "-"; - private String _routeDomainIdentifier = "%"; + private final String _objectNamePathSep = "-"; + private final String _routeDomainIdentifier = "%"; private static final Logger s_logger = Logger.getLogger(F5BigIpResource.class); @Override public boolean configure(String name, Map<String, Object> params) throws ConfigurationException { - try { + try { _name = (String) params.get("name"); if (_name == null) { throw new ConfigurationException("Unable to find name"); @@ -160,7 +160,7 @@ public class F5BigIpResource implements ServerResource { _password = (String) params.get("password"); if (_password == null) { throw new ConfigurationException("Unable to find password"); - } + } _publicInterface = (String) params.get("publicinterface"); if (_publicInterface == null) { @@ -189,7 +189,7 @@ public class F5BigIpResource implements ServerResource { } @Override - public StartupCommand[] initialize() { + public StartupCommand[] initialize() { StartupExternalLoadBalancerCommand cmd = new StartupExternalLoadBalancerCommand(); cmd.setName(_name); cmd.setDataCenter(_zoneId); @@ -229,7 +229,7 @@ public class F5BigIpResource implements ServerResource { @Override public void disconnected() { return; - } + } @Override public IAgentControl getAgentControl() { @@ -244,7 +244,7 @@ public class F5BigIpResource implements ServerResource { @Override public Answer executeRequest(Command cmd) { return executeRequest(cmd, _numRetries); - } + } private Answer executeRequest(Command cmd, int numRetries) { if (cmd instanceof ReadyCommand) { @@ -262,10 +262,10 @@ public class F5BigIpResource implements ServerResource { } } - private Answer retry(Command cmd, int numRetries) { + private Answer retry(Command cmd, int numRetries) { int numRetriesRemaining = numRetries - 1; s_logger.error("Retrying " + cmd.getClass().getSimpleName() + ". Number of retries remaining: " + numRetriesRemaining); - return executeRequest(cmd, numRetriesRemaining); + return executeRequest(cmd, numRetriesRemaining); } private boolean shouldRetry(int numRetries) { @@ -286,19 +286,19 @@ public class F5BigIpResource implements ServerResource { private Answer execute(MaintainCommand cmd) { return new MaintainAnswer(cmd); - } + } private synchronized Answer execute(IpAssocCommand cmd, int numRetries) { String[] results = new String[cmd.getIpAddresses().length]; int i = 0; - try { + try { IpAddressTO[] ips = cmd.getIpAddresses(); for (IpAddressTO ip : ips) { long guestVlanTag = Long.valueOf(ip.getVlanId()); // It's a hack, using isOneToOneNat field for indicate if it's inline or not boolean inline = ip.isOneToOneNat(); String vlanSelfIp = inline ? tagAddressWithRouteDomain(ip.getVlanGateway(), guestVlanTag) : ip.getVlanGateway(); - String vlanNetmask = ip.getVlanNetmask(); + String vlanNetmask = ip.getVlanNetmask(); // Delete any existing guest VLAN with this tag, self IP, and netmask deleteGuestVlan(guestVlanTag, vlanSelfIp, vlanNetmask, inline); @@ -308,25 +308,25 @@ public class F5BigIpResource implements ServerResource { addGuestVlan(guestVlanTag, vlanSelfIp, vlanNetmask, inline); } - saveConfiguration(); + saveConfiguration(); results[i++] = ip.getPublicIp() + " - success"; } } catch (ExecutionException e) { - s_logger.error("Failed to execute IPAssocCommand due to " + e); + s_logger.error("Failed to execute IPAssocCommand due to " + e); if (shouldRetry(numRetries)) { return retry(cmd, numRetries); } else { results[i++] = IpAssocAnswer.errorResult; } - } + } return new IpAssocAnswer(cmd, results); } private synchronized Answer execute(LoadBalancerConfigCommand cmd, int numRetries) { - try { + try { long guestVlanTag = Long.parseLong(cmd.getAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG)); LoadBalancerTO[] loadBalancers = cmd.getLoadBalancers(); for (LoadBalancerTO loadBalancer : loadBalancers) { @@ -349,10 +349,10 @@ public class F5BigIpResource implements ServerResource { lbAlgorithm = LbAlgorithm.LeastConn; } else { throw new ExecutionException("Got invalid algorithm: " + loadBalancer.getAlgorithm()); - } + } String srcIp = inline ? tagAddressWithRouteDomain(loadBalancer.getSrcIp(), guestVlanTag) : loadBalancer.getSrcIp(); - int srcPort = loadBalancer.getSrcPort(); + int srcPort = loadBalancer.getSrcPort(); String virtualServerName = genVirtualServerName(lbProtocol, srcIp, srcPort); boolean destinationsToAdd = false; @@ -365,11 +365,11 @@ public class F5BigIpResource implements ServerResource { // Delete the virtual server with this protocol, source IP, and source port, along with its default pool and all pool members deleteVirtualServerAndDefaultPool(virtualServerName); - if (!loadBalancer.isRevoked() && destinationsToAdd) { - // Add the pool + if (!loadBalancer.isRevoked() && destinationsToAdd) { + // Add the pool addPool(virtualServerName, lbAlgorithm); - // Add pool members + // Add pool members List<String> activePoolMembers = new ArrayList<String>(); for (DestinationTO destination : loadBalancer.getDestinations()) { if (!destination.isRevoked()) { @@ -377,15 +377,15 @@ public class F5BigIpResource implements ServerResource { addPoolMember(virtualServerName, destIp, destination.getDestPort()); activePoolMembers.add(destIp + "-" + destination.getDestPort()); } - } + } - // Add the virtual server + // Add the virtual server addVirtualServer(virtualServerName, lbProtocol, srcIp, srcPort, loadBalancer.getStickinessPolicies()); } - } + } - saveConfiguration(); - return new Answer(cmd); + saveConfiguration(); + return new Answer(cmd); } catch (ExecutionException e) { s_logger.error("Failed to execute LoadBalancerConfigCommand due to " + e); @@ -396,7 +396,7 @@ public class F5BigIpResource implements ServerResource { } } - } + } private synchronized ExternalNetworkResourceUsageAnswer execute(ExternalNetworkResourceUsageCommand cmd) { try { @@ -408,8 +408,8 @@ public class F5BigIpResource implements ServerResource { private void saveConfiguration() throws ExecutionException { try { - _configSyncApi.save_configuration("", SystemConfigSyncSaveMode.SAVE_BASE_LEVEL_CONFIG); - _configSyncApi.save_configuration("", SystemConfigSyncSaveMode.SAVE_HIGH_LEVEL_CONFIG); + _configSyncApi.save_configuration("", SystemConfigSyncSaveMode.SAVE_BASE_LEVEL_CONFIG); + _configSyncApi.save_configuration("", SystemConfigSyncSaveMode.SAVE_HIGH_LEVEL_CONFIG); s_logger.debug("Successfully saved F5 BigIp configuration."); } catch (RemoteException e) { s_logger.error("Failed to save F5 BigIp configuration due to: " + e); @@ -419,9 +419,9 @@ public class F5BigIpResource implements ServerResource { private void addGuestVlan(long vlanTag, String vlanSelfIp, String vlanNetmask, boolean inline) throws ExecutionException { try { - String vlanName = genVlanName(vlanTag); + String vlanName = genVlanName(vlanTag); List<String> allVlans = getVlans(); - if (!allVlans.contains(vlanName)) { + if (!allVlans.contains(vlanName)) { String[] vlanNames = genStringArray(vlanName); long[] vlanTags = genLongArray(vlanTag); CommonEnabledState[] commonEnabledState = {CommonEnabledState.STATE_DISABLED}; @@ -433,7 +433,7 @@ public class F5BigIpResource implements ServerResource { vlanMemberEntries[0][0].setMember_name(_privateInterface); s_logger.debug("Creating a guest VLAN with tag " + vlanTag); - _vlanApi.create(vlanNames, vlanTags, vlanMemberEntries, commonEnabledState, new long[]{10L}, new String[]{"00:00:00:00:00:00"}); + _vlanApi.create(vlanNames, vlanTags, vlanMemberEntries, commonEnabledState, new long[]{10L}, new String[]{"00:00:00:00:00:00"}); if (!getVlans().contains(vlanName)) { throw new ExecutionException("Failed to create vlan with tag " + vlanTag); @@ -504,7 +504,7 @@ public class F5BigIpResource implements ServerResource { } } - String vlanName = genVlanName(vlanTag); + String vlanName = genVlanName(vlanTag); List<String> allVlans = getVlans(); if (allVlans.contains(vlanName)) { _vlanApi.delete_vlan(genStringArray(vlanName)); @@ -512,7 +512,7 @@ public class F5BigIpResource implements ServerResource { if (getVlans().contains(vlanName)) { throw new ExecutionException("Failed to delete VLAN with tag: " + vlanTag); } - } + } } catch (RemoteException e) { throw new ExecutionException(e.getMessage()); } @@ -532,7 +532,7 @@ public class F5BigIpResource implements ServerResource { virtualServersToDelete.add(virtualServerName); break; } - } + } } for (String virtualServerName : virtualServersToDelete) { @@ -590,10 +590,10 @@ public class F5BigIpResource implements ServerResource { } } - // Login + // Login private void login() throws ExecutionException { - try { + try { _interfaces = new Interfaces(); if (!_interfaces.initialize(_ip, _username, _password)) { @@ -604,7 +604,7 @@ public class F5BigIpResource implements ServerResource { _interfaces.getSystemSystemInfo().get_system_information(); _virtualServerApi = _interfaces.getLocalLBVirtualServer(); - _loadbalancerApi = _interfaces.getLocalLBPool(); + _loadbalancerApi = _interfaces.getLocalLBPool(); _nodeApi = _interfaces.getLocalLBNodeAddress(); _vlanApi = _interfaces.getNetworkingVLAN(); _selfIpApi = _interfaces.getNetworkingSelfIP(); @@ -680,10 +680,10 @@ public class F5BigIpResource implements ServerResource { if (getVirtualServers().contains(virtualServerName)) { throw new ExecutionException("Failed to delete virtual server " + virtualServerName); - } + } // Delete the default pool - deletePool(virtualServerName); + deletePool(virtualServerName); } } catch (RemoteException e) { throw new ExecutionException(e.getMessage()); @@ -754,10 +754,10 @@ public class F5BigIpResource implements ServerResource { } private LocalLBVirtualServerVirtualServerProfile[][] genVirtualServerProfile(LbProtocol protocol) { - LocalLBVirtualServerVirtualServerProfile vsProfs[][] = {{new LocalLBVirtualServerVirtualServerProfile()}}; - vsProfs[0][0].setProfile_context(LocalLBProfileContextType.PROFILE_CONTEXT_TYPE_ALL); + LocalLBVirtualServerVirtualServerProfile vsProfs[][] = {{new LocalLBVirtualServerVirtualServerProfile()}}; + vsProfs[0][0].setProfile_context(LocalLBProfileContextType.PROFILE_CONTEXT_TYPE_ALL); - if (protocol.equals(LbProtocol.tcp)) { + if (protocol.equals(LbProtocol.tcp)) { vsProfs[0][0].setProfile_name("http"); } else if (protocol.equals(LbProtocol.udp)) { vsProfs[0][0].setProfile_name("udp"); @@ -771,7 +771,7 @@ public class F5BigIpResource implements ServerResource { persistenceProfs[0][0].setDefault_profile(true); persistenceProfs[0][0].setProfile_name(persistenceProfileName); return persistenceProfs; - } + } // Load balancing pool methods @@ -787,7 +787,7 @@ public class F5BigIpResource implements ServerResource { if (!poolExists(virtualServerName)) { throw new ExecutionException("Failed to create new pool for virtual server " + virtualServerName); - } + } } } catch (RemoteException e) { throw new ExecutionException(e.getMessage()); @@ -807,11 +807,11 @@ public class F5BigIpResource implements ServerResource { } catch (RemoteException e) { throw new ExecutionException(e.getMessage()); } - } + } private void addPoolMember(String virtualServerName, String destIp, int destPort) throws ExecutionException { try { - String memberIdentifier = destIp + "-" + destPort; + String memberIdentifier = destIp + "-" + destPort; if (poolExists(virtualServerName) && !memberExists(virtualServerName, memberIdentifier)) { s_logger.debug("Adding member " + memberIdentifier + " into pool for virtual server " + virtualServerName); @@ -839,7 +839,7 @@ public class F5BigIpResource implements ServerResource { private void deletePoolMember(String virtualServerName, String destIp, int destPort) throws ExecutionException { try { - String memberIdentifier = destIp + "-" + destPort; + String memberIdentifier = destIp + "-" + destPort; List<String> lbPools = getAllLbPools(); if (lbPools.contains(virtualServerName) && memberExists(virtualServerName, memberIdentifier)) { @@ -859,8 +859,8 @@ public class F5BigIpResource implements ServerResource { nodeNeeded = true; break done; } - } - } + } + } if (!nodeNeeded) { s_logger.debug("Deleting node " + destIp); @@ -871,7 +871,7 @@ public class F5BigIpResource implements ServerResource { } } } - } + } } catch (RemoteException e) { throw new ExecutionException(e.getMessage()); } @@ -929,7 +929,7 @@ public class F5BigIpResource implements ServerResource { String[] nodesArray = _nodeApi.get_list(); for (String node : nodesArray) { - nodes.add(node); + nodes.add(node); } return nodes; @@ -973,9 +973,9 @@ public class F5BigIpResource implements ServerResource { bytesSentAndReceived = new long[]{0, 0}; } - for (CommonStatistic stat : entry.getStatistics()) { + for (CommonStatistic stat : entry.getStatistics()) { int index; - if (stat.getType().equals(CommonStatisticType.STATISTIC_CLIENT_SIDE_BYTES_OUT)) { + if (stat.getType().equals(CommonStatisticType.STATISTIC_CLIENT_SIDE_BYTES_OUT)) { // Add to the outgoing bytes index = 0; } else if (stat.getType().equals(CommonStatisticType.STATISTIC_CLIENT_SIDE_BYTES_IN)) { @@ -985,8 +985,8 @@ public class F5BigIpResource implements ServerResource { continue; } - long high = stat.getPresetParams().getHigh(); - long low = stat.getPresetParams().getLow(); + long high = stat.getValue().getHigh(); + long low = stat.getValue().getLow(); long full = getFullUsage(high, low); @@ -994,7 +994,7 @@ public class F5BigIpResource implements ServerResource { } if (bytesSentAndReceived[0] >= 0 && bytesSentAndReceived[1] >= 0) { - answer.ipBytes.put(virtualServerIp, bytesSentAndReceived); + answer.ipBytes.put(virtualServerIp, bytesSentAndReceived); } } } catch (Exception e) { @@ -1006,24 +1006,24 @@ public class F5BigIpResource implements ServerResource { } private long getFullUsage(long high, long low) { - Double full; - Double rollOver = new Double((double) 0x7fffffff); - rollOver = new Double(rollOver.doubleValue() + 1.0); + Double full; + Double rollOver = new Double(0x7fffffff); + rollOver = new Double(rollOver.doubleValue() + 1.0); - if (high >= 0) { - // shift left 32 bits and mask off new bits to 0's - full = new Double((high << 32 & 0xffff0000)); + if (high >= 0) { + // shift left 32 bits and mask off new bits to 0's + full = new Double((high << 32 & 0xffff0000)); } else { // mask off sign bits + shift left by 32 bits then add the sign bit back - full = new Double(((high & 0x7fffffff) << 32) + (0x80000000 << 32)); + full = new Double(((high & 0x7fffffff) << 32) + (0x80000000 << 32)); } if (low >= 0) { // add low to full and we're good - full = new Double(full.doubleValue() + (double) low); + full = new Double(full.doubleValue() + low); } else { // add full to low after masking off sign bits and adding 1 to the masked off low order value - full = new Double(full.doubleValue() + (double) ((low & 0x7fffffff)) + rollOver.doubleValue()); + full = new Double(full.doubleValue() + ((low & 0x7fffffff)) + rollOver.doubleValue()); } return full.longValue(); @@ -1058,7 +1058,7 @@ public class F5BigIpResource implements ServerResource { } return objectName; - } + } private long[] genLongArray(long l) { return new long[]{l}; @@ -1096,7 +1096,7 @@ public class F5BigIpResource implements ServerResource { public void setRunLevel(int level) { // TODO Auto-generated method stub - } + } }
