diff --git a/engine/schema/src/main/java/com/cloud/dc/DataCenterVO.java b/engine/schema/src/main/java/com/cloud/dc/DataCenterVO.java index 38121a72d028..d0f3192c60c2 100644 --- a/engine/schema/src/main/java/com/cloud/dc/DataCenterVO.java +++ b/engine/schema/src/main/java/com/cloud/dc/DataCenterVO.java @@ -476,5 +476,4 @@ public PartitionType partitionType() { public String toString() { return String.format("Zone {\"id\": \"%s\", \"name\": \"%s\", \"uuid\": \"%s\"}", id, name, uuid); } - } diff --git a/engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java index 7868be2ad69a..67b341a93618 100644 --- a/engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java @@ -129,7 +129,6 @@ public void deleteByOfferingId(long networkOfferingId) { @Override public List listProvidersForServiceForNetworkOffering(long networkOfferingId, Service service) { SearchCriteria sc = ProvidersSearch.create(); - ; sc.setParameters("networkOfferingId", networkOfferingId); sc.setParameters("service", service.getName()); @@ -140,21 +139,16 @@ public List listProvidersForServiceForNetworkOffering(long networkOfferi @Override public boolean isProviderForNetworkOffering(long networkOfferingId, Provider provider) { SearchCriteria sc = AllFieldsSearch.create(); - ; sc.setParameters("networkOfferingId", networkOfferingId); sc.setParameters("provider", provider.getName()); - if (findOneBy(sc) != null) { - return true; - } - return false; + return findOneBy(sc) != null; } @Override public List listServicesForNetworkOffering(long networkOfferingId) { SearchCriteria sc = ServicesSearch.create(); - ; sc.setParameters("networkOfferingId", networkOfferingId); return customSearch(sc, null); } diff --git a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java index 3a6e1842b182..949feee1d4e4 100644 --- a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java +++ b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java @@ -838,11 +838,11 @@ public List doInTransaction(TransactionStatus status) throws Insuff } if (vlanUse == VlanType.VirtualNetwork) { - if (dedicatedVlanDbIds != null && !dedicatedVlanDbIds.isEmpty()) { + if (!dedicatedVlanDbIds.isEmpty()) { fetchFromDedicatedRange = true; sc.setParameters("vlanId", dedicatedVlanDbIds.toArray()); errorMessage.append(", vlanId id=" + Arrays.toString(dedicatedVlanDbIds.toArray())); - } else if (nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) { + } else if (!nonDedicatedVlanDbIds.isEmpty()) { sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray()); errorMessage.append(", vlanId id=" + Arrays.toString(nonDedicatedVlanDbIds.toArray())); } else { @@ -898,7 +898,7 @@ public List doInTransaction(TransactionStatus status) throws Insuff if ((!lockOneRow || (lockOneRow && addrs.size() == 0)) && fetchFromDedicatedRange && vlanUse == VlanType.VirtualNetwork) { // Verify if account is allowed to acquire IPs from the system boolean useSystemIps = UseSystemPublicIps.valueIn(owner.getId()); - if (useSystemIps && nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) { + if (useSystemIps && !nonDedicatedVlanDbIds.isEmpty()) { fetchFromDedicatedRange = false; sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray()); errorMessage.append(", vlanId id=" + Arrays.toString(nonDedicatedVlanDbIds.toArray())); @@ -1124,6 +1124,10 @@ public boolean applyIpAssociations(Network network, boolean postApplyRules, bool return success; } + private String generateErrorMessageForOperationOnDisabledZone(String operation, DataCenter zone) { + return String.format("Cannot %s, %s is currently disabled.", operation, zone); + } + @DB @Override public AcquirePodIpCmdResponse allocatePodIp(String zoneId, String podId) throws ConcurrentOperationException, ResourceAllocationException { @@ -1131,8 +1135,8 @@ public AcquirePodIpCmdResponse allocatePodIp(String zoneId, String podId) throws DataCenter zone = _entityMgr.findByUuid(DataCenter.class, zoneId); Account caller = CallContext.current().getCallingAccount(); if (Grouping.AllocationState.Disabled == zone.getAllocationState() && !_accountMgr.isRootAdmin(caller.getId())) { - ResourceAllocationException ex = new ResourceAllocationException("Cannot perform this operation, " + "Zone is currently disabled" + "zoneId=" + zone.getUuid(), - ResourceType.network); + ResourceAllocationException ex = new ResourceAllocationException( + generateErrorMessageForOperationOnDisabledZone("allocate Pod IP addresses", zone), ResourceType.network); throw ex; } @@ -1142,7 +1146,7 @@ public AcquirePodIpCmdResponse allocatePodIp(String zoneId, String podId) throws HostPodVO podvo = null; podvo = _hpDao.findByUuid(podId); if (podvo == null) - throw new ResourceAllocationException("No sush pod exists", ResourceType.network); + throw new ResourceAllocationException("No such pod exists", ResourceType.network); vo = _privateIPAddressDao.takeIpAddress(zone.getId(), podvo.getId(), 0, caller.getId() + "", false); if(vo == null) @@ -1181,7 +1185,7 @@ public void releasePodIp(Long id) throws CloudRuntimeException { DataCenter zone = _entityMgr.findById(DataCenter.class, ipVO.getDataCenterId()); Account caller = CallContext.current().getCallingAccount(); if (Grouping.AllocationState.Disabled == zone.getAllocationState() && !_accountMgr.isRootAdmin(caller.getId())) { - throw new CloudRuntimeException("Cannot perform this operation, " + "Zone is currently disabled" + "zoneId=" + ipVO.getDataCenterId()); + throw new CloudRuntimeException(generateErrorMessageForOperationOnDisabledZone("release Pod IP", zone)); } try { _privateIPAddressDao.releasePodIpAddress(id); @@ -1201,7 +1205,7 @@ public IpAddress allocateIp(final Account ipOwner, final boolean isSystem, Accou if (Grouping.AllocationState.Disabled == zone.getAllocationState() && !_accountMgr.isRootAdmin(caller.getId())) { // zone is of type DataCenter. See DataCenterVO.java. - PermissionDeniedException ex = new PermissionDeniedException("Cannot perform this operation, " + "Zone is currently disabled"); + PermissionDeniedException ex = new PermissionDeniedException(generateErrorMessageForOperationOnDisabledZone("allocate IP addresses", zone)); ex.addProxyObject(zone.getUuid(), "zoneId"); throw ex; } @@ -1385,7 +1389,7 @@ public IPAddressVO associateIPToGuestNetwork(long ipId, long networkId, boolean } if (ipToAssoc.getAssociatedWithNetworkId() != null) { - s_logger.debug("IP " + ipToAssoc + " is already assocaited with network id" + networkId); + s_logger.debug("IP " + ipToAssoc + " is already associated with network id" + networkId); return ipToAssoc; } @@ -1463,7 +1467,7 @@ public IPAddressVO associateIPToGuestNetwork(long ipId, long networkId, boolean s_logger.warn("Failed to associate ip address, so releasing ip from the database " + ip); _ipAddressDao.markAsUnavailable(ip.getId()); if (!applyIpAssociations(network, true)) { - // if fail to apply ip assciations again, unassign ip address without updating resource + // if fail to apply ip associations again, unassign ip address without updating resource // count and generating usage event as there is no need to keep it in the db _ipAddressDao.unassignIpAddress(ip.getId()); } diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java index 4322478d93e1..572576412af5 100644 --- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java @@ -1554,6 +1554,7 @@ public boolean areServicesEnabledInZone(long zoneId, NetworkOffering offering, L if (!checkedProvider.contains(providerName)) { result = result && isProviderEnabledInPhysicalNetwork(physicalNtwkId, providerName); } + checkedProvider.add(providerName); } }