Merge branch '4.14'

Author: DaanHoogland

api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java

@@ -181,7 +181,7 @@ public void execute() {
                 }
             }
 
-            response.setResponses(usageResponses, usageResponses.size());
+            response.setResponses(usageResponses, usageRecords.second());
         }
 
         response.setResponseName(getCommandName());

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -3436,11 +3436,6 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
                 if (networkId == null) {
                     networkId = ip.getSourceNetworkId();
                 }
-                NetworkDetailVO networkDetail = networkDetailsDao.findDetail(networkId, Network.hideIpAddressUsage);
-                if (networkDetail != null && networkDetail.getValue() != null && networkDetail.getValue().equals("true")) {
-                    // Don't export network usage when admin wants it hidden
-                    return null;
-                }
                 resourceType = ResourceObjectType.PublicIpAddress;
                 resourceId = ip.getId();
                 usageRecResponse.setUsageId(ip.getUuid());

server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java

@@ -171,7 +171,7 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet<HostDetails> detail
 
                 hostResponse.setMemoryTotal(host.getTotalMemory());
                 Float totalMemorywithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId());
-                hostResponse.setMemWithOverprovisioning(totalMemorywithOverprovisioning.toString());
+                hostResponse.setMemWithOverprovisioning(decimalFormat.format(totalMemorywithOverprovisioning));
                 hostResponse.setMemoryAllocated(mem);
 
                 String hostTags = host.getTag();
@@ -192,7 +192,7 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet<HostDetails> detail
 
                 float cpuWithOverprovisioning = host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId());
                 hostResponse.setCpuAllocated(calculateResourceAllocatedPercentage(cpu, cpuWithOverprovisioning));
-                hostResponse.setCpuWithOverprovisioning(Float.toString(cpuWithOverprovisioning));
+                hostResponse.setCpuWithOverprovisioning(decimalFormat.format(cpuWithOverprovisioning));
             }
 
             if (details.contains(HostDetails.all) || details.contains(HostDetails.stats)) {
@@ -320,7 +320,7 @@ public HostForMigrationResponse newHostForMigrationResponse(HostJoinVO host, Enu
 
                 hostResponse.setMemoryTotal(host.getTotalMemory());
                 Float memWithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId());
-                hostResponse.setMemWithOverprovisioning(memWithOverprovisioning.toString());
+                hostResponse.setMemWithOverprovisioning(decimalFormat.format(memWithOverprovisioning));
                 hostResponse.setMemoryAllocated(decimalFormat.format((float) mem / memWithOverprovisioning * 100.0f) +"%");
 
                 String hostTags = host.getTag();
@@ -341,7 +341,7 @@ public HostForMigrationResponse newHostForMigrationResponse(HostJoinVO host, Enu
 
                 float cpuWithOverprovisioning = host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId());
                 hostResponse.setCpuAllocated(calculateResourceAllocatedPercentage(cpu, cpuWithOverprovisioning));
-                hostResponse.setCpuWithOverprovisioning(Float.toString(cpuWithOverprovisioning));
+                hostResponse.setCpuWithOverprovisioning(decimalFormat.format(cpuWithOverprovisioning));
             }
 
             if (details.contains(HostDetails.all) || details.contains(HostDetails.stats)) {

server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java

@@ -562,9 +562,9 @@ public Site2SiteVpnConnection resetVpnConnection(ResetVpnConnectionCmd cmd) thro
         _accountMgr.checkAccess(caller, null, false, conn);
 
         if (conn.getState() == State.Pending) {
-            throw new InvalidParameterValueException("VPN connection " + id + " cannot be reseted when state is Pending!");
+            conn.setState(State.Disconnected);
         }
-        if (conn.getState() == State.Connected || conn.getState() == State.Error) {
+        if (conn.getState() == State.Connected || conn.getState() == State.Error || conn.getState() == State.Disconnected) {
             stopVpnConnection(id);
         }
         startVpnConnection(id);