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

add missing license, cleanup, log std

This commit is contained in:
Manoj Kumar 2026-02-18 11:20:22 +05:30
parent 99f8c7dad8
commit e011ce1186
No known key found for this signature in database
GPG Key ID: E952B7234D2C6F88
11 changed files with 77 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/org/apache/cloudstack/dns/DnsProvider.java
View File

@ -28,7 +28,7 @@ public interface DnsProvider extends Adapter {
void validate(DnsServer server) throws Exception;
// Zone Operations
void provisionZone(DnsServer server, DnsZone zone);
String provisionZone(DnsServer server, DnsZone zone);
void deleteZone(DnsServer server, DnsZone zone) ;
void addRecord(DnsServer server, DnsZone zone, DnsRecord record);

10
plugins/dns/powerdns/src/main/java/org/apache/cloudstack/dns/powerdns/PowerDnsClient.java
View File

@ -95,7 +95,7 @@ public class PowerDnsClient implements AutoCloseable {
}
}
public void createZone(String baseUrl, String apiKey, String zoneName, String nameServers) {
public String createZone(String baseUrl, String apiKey, String zoneName, String nameServers) {
String normalizedZone = formatZoneName(zoneName);
try {
String url = buildApiUrl(baseUrl, "/servers/localhost/zones");
@ -125,8 +125,12 @@ public class PowerDnsClient implements AutoCloseable {
String body = response.getEntity() != null ? EntityUtils.toString(response.getEntity()) : null;
if (statusCode == HttpStatus.SC_CREATED) {
logger.debug("Zone {} created successfully", zoneName);
return;
JsonNode root = MAPPER.readTree(body);
String zoneId = root.path("id").asText();
if (StringUtils.isBlank(zoneId)) {
throw new CloudRuntimeException("PowerDNS returned empty zone id");
}
return zoneId;
}
if (statusCode == HttpStatus.SC_CONFLICT) {

4
plugins/dns/powerdns/src/main/java/org/apache/cloudstack/dns/powerdns/PowerDnsProvider.java
View File

@ -46,9 +46,9 @@ public class PowerDnsProvider extends AdapterBase implements DnsProvider {
}
@Override
public void provisionZone(DnsServer server, DnsZone zone) {
public String provisionZone(DnsServer server, DnsZone zone) {
validateServerZoneParams(server, zone);
client.createZone(server.getUrl(), server.getApiKey(), zone.getName(), server.getNameServers());
return client.createZone(server.getUrl(), server.getApiKey(), zone.getName(), server.getNameServers());
}
@Override

57
server/src/main/java/org/apache/cloudstack/dns/DnsProviderManagerImpl.java
View File

@ -18,6 +18,7 @@
package org.apache.cloudstack.dns;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.inject.Inject;
@ -96,7 +97,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
return provider;
}
}
throw new CloudRuntimeException("No plugin found for DNS Provider type: " + type);
throw new CloudRuntimeException("No plugin found for DNS provider type: " + type);
}
@Override
@ -105,7 +106,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
DnsServer existing = dnsServerDao.findByUrlAndAccount(cmd.getUrl(), caller.getId());
if (existing != null) {
throw new InvalidParameterValueException(
"This Account already has a DNS Server integration for URL: " + cmd.getUrl());
"This Account already has a DNS server integration for URL: " + cmd.getUrl());
}
DnsProviderType type = DnsProviderType.fromString(cmd.getProvider());
DnsProvider provider = getProvider(type);
@ -156,7 +157,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
Long dnsServerId = cmd.getId();
DnsServerVO dnsServer = dnsServerDao.findById(dnsServerId);
if (dnsServer == null) {
throw new InvalidParameterValueException(String.format("DNS Server with ID: %s not found.", dnsServerId));
throw new InvalidParameterValueException(String.format("DNS server with ID: %s not found.", dnsServerId));
}
Account caller = CallContext.current().getCallingAccount();
@ -176,7 +177,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
if (!cmd.getUrl().equals(originalUrl)) {
DnsServer duplicate = dnsServerDao.findByUrlAndAccount(cmd.getUrl(), dnsServer.getAccountId());
if (duplicate != null && duplicate.getId() != dnsServer.getId()) {
throw new InvalidParameterValueException("Another DNS Server with this URL already exists.");
throw new InvalidParameterValueException("Another DNS server with this URL already exists.");
}
dnsServer.setUrl(cmd.getUrl());
validationRequired = true;
@ -230,7 +231,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
Long dnsServerId = cmd.getId();
DnsServerVO dnsServer = dnsServerDao.findById(dnsServerId);
if (dnsServer == null) {
throw new InvalidParameterValueException(String.format("DNS Server with ID: %s not found.", dnsServerId));
throw new InvalidParameterValueException(String.format("DNS server with ID: %s not found.", dnsServerId));
}
Account caller = CallContext.current().getCallingAccount();
if (!accountMgr.isRootAdmin(caller.getId()) && dnsServer.getAccountId() != caller.getId()) {
@ -260,7 +261,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
public boolean deleteDnsZone(Long zoneId) {
DnsZoneVO zone = dnsZoneDao.findById(zoneId);
if (zone == null) {
throw new InvalidParameterValueException("DNS Zone with ID " + zoneId + " not found.");
throw new InvalidParameterValueException("DNS zone with ID " + zoneId + " not found.");
}
Account caller = CallContext.current().getCallingAccount();
@ -269,10 +270,10 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
if (server != null && zone.getState() == DnsZone.State.Active) {
try {
DnsProvider provider = getProvider(server.getProviderType());
logger.debug("Deleting DNS zone {} from provider.", zone.getName());
logger.debug("Deleting DNS zone: {} from provider.", zone.getName());
provider.deleteZone(server, zone);
} catch (Exception ex) {
logger.error("Failed to delete zone from provider", ex);
logger.error("Failed to delete DNS zone from provider", ex);
throw new CloudRuntimeException("Failed to delete DNS zone.");
}
}
@ -336,7 +337,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
public DnsRecordResponse createDnsRecord(CreateDnsRecordCmd cmd) {
DnsZoneVO zone = dnsZoneDao.findById(cmd.getDnsZoneId());
if (zone == null) {
throw new InvalidParameterValueException("DNS Zone not found.");
throw new InvalidParameterValueException("DNS zone not found.");
}
Account caller = CallContext.current().getCallingAccount();
@ -358,7 +359,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
public boolean deleteDnsRecord(DeleteDnsRecordCmd cmd) {
DnsZoneVO zone = dnsZoneDao.findById(cmd.getDnsZoneId());
if (zone == null) {
throw new InvalidParameterValueException("DNS Zone not found.");
throw new InvalidParameterValueException("DNS zone not found.");
}
Account caller = CallContext.current().getCallingAccount();
@ -376,7 +377,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
return true;
} catch (Exception ex) {
logger.error("Failed to delete DNS record via provider", ex);
throw new CloudRuntimeException(String.format("Failed to delete record: %s", cmd.getName()));
throw new CloudRuntimeException(String.format("Failed to delete DNS record: %s", cmd.getName()));
}
}
@ -384,13 +385,13 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
public ListResponse<DnsRecordResponse> listDnsRecords(ListDnsRecordsCmd cmd) {
DnsZoneVO zone = dnsZoneDao.findById(cmd.getDnsZoneId());
if (zone == null) {
throw new InvalidParameterValueException(String.format("DNS Zone with ID %s not found.", cmd.getDnsZoneId()));
throw new InvalidParameterValueException(String.format("DNS zone with ID %s not found.", cmd.getDnsZoneId()));
}
Account caller = CallContext.current().getCallingAccount();
accountMgr.checkAccess(caller, null, true, zone);
DnsServerVO server = dnsServerDao.findById(zone.getDnsServerId());
if (server == null) {
throw new CloudRuntimeException("The underlying DNS Server for this zone is missing.");
throw new CloudRuntimeException("The underlying DNS server for this DNS zone is missing.");
}
try {
DnsProvider provider = getProvider(server.getProviderType());
@ -425,23 +426,23 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
Account caller = CallContext.current().getCallingAccount();
DnsServerVO server = dnsServerDao.findById(cmd.getDnsServerId());
if (server == null) {
throw new InvalidParameterValueException("DNS Server not found");
throw new InvalidParameterValueException("DNS server not found");
}
boolean isOwner = (server.getAccountId() == caller.getId());
if (!server.isPublic() && !isOwner) {
throw new PermissionDeniedException("You do not have permission to use this DNS Server.");
throw new PermissionDeniedException("You do not have permission to use this DNS server.");
}
DnsZone.ZoneType type = DnsZone.ZoneType.Public;
if (cmd.getType() != null) {
try {
type = DnsZone.ZoneType.valueOf(cmd.getType());
} catch (IllegalArgumentException e) {
throw new InvalidParameterValueException("Invalid Zone Type");
throw new InvalidParameterValueException("Invalid DNS zone Type");
}
}
DnsZoneVO existing = dnsZoneDao.findByNameServerAndType(cmd.getName(), server.getId(), type);
if (existing != null) {
throw new InvalidParameterValueException("Zone already exists on this server.");
throw new InvalidParameterValueException("DNS zone already exists on this server.");
}
DnsZoneVO dnsZoneVO = new DnsZoneVO(cmd.getName(), type, server.getId(), caller.getId(), caller.getDomainId(), cmd.getDescription());
return dnsZoneDao.persist(dnsZoneVO);
@ -451,20 +452,20 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
public DnsZone provisionDnsZone(long zoneId) {
DnsZoneVO dnsZone = dnsZoneDao.findById(zoneId);
if (dnsZone == null) {
throw new CloudRuntimeException("DNS Zone not found during provisioning");
throw new CloudRuntimeException("DNS zone not found during provisioning");
}
DnsServerVO server = dnsServerDao.findById(dnsZone.getDnsServerId());
try {
DnsProvider provider = getProvider(server.getProviderType());
logger.debug("Provision DNS zone: {} on DNS server: {}", dnsZone.getName(), server.getName());
provider.provisionZone(server, dnsZone);
String externalReferenceId = provider.provisionZone(server, dnsZone);
dnsZone.setExternalReference(externalReferenceId);
dnsZone.setState(DnsZone.State.Active);
logger.debug("DNS zone: {} created successfully on DNS server: {} with ID: {}", dnsZone.getName(), server.getName(), zoneId);
dnsZoneDao.update(dnsZone.getId(), dnsZone);
} catch (Exception ex) {
logger.error("Failed to provision zone: {} on server: {}", dnsZone.getName(), server.getName(), ex);
logger.error("Failed to provision DNS zone: {} on DNS server: {}", dnsZone.getName(), server.getName(), ex);
dnsZoneDao.remove(zoneId);
throw new CloudRuntimeException("Failed to provision zone: " + dnsZone.getName());
throw new CloudRuntimeException("Failed to provision DNS zone: " + dnsZone.getName());
}
return dnsZone;
}
@ -495,7 +496,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
Account caller = CallContext.current().getCallingAccount();
DnsZoneVO zone = dnsZoneDao.findById(cmd.getDnsZoneId());
if (zone == null) {
throw new InvalidParameterValueException("DNS Zone not found.");
throw new InvalidParameterValueException("DNS zone not found.");
}
accountMgr.checkAccess(caller, null, true, zone);
@ -510,7 +511,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
accountMgr.checkAccess(caller, null, true, network);
DnsZoneNetworkMapVO existing = dnsZoneNetworkMapDao.findByZoneAndNetwork(zone.getId(), network.getId());
if (existing != null) {
throw new InvalidParameterValueException("This DNS Zone is already associated with this Network.");
throw new InvalidParameterValueException("This DNS zone is already associated with this Network.");
}
DnsZoneNetworkMapVO mapping = new DnsZoneNetworkMapVO(zone.getId(), network.getId(), cmd.getSubDomain());
dnsZoneNetworkMapDao.persist(mapping);
@ -556,7 +557,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
// 1. Fetch VM and verify access
UserVmVO instance = userVmDao.findById(instanceId);
if (instance == null) {
throw new InvalidParameterValueException("Instance not found.");
throw new InvalidParameterValueException("Provided Instance not found.");
}
accountMgr.checkAccess(CallContext.current().getCallingAccount(), null, true, instance);
@ -599,7 +600,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
DnsProvider provider = getProvider(server.getProviderType());
// Handle IPv4 (A Record)
if (nic.getIPv4Address() != null) {
DnsRecord recordA = new DnsRecord(recordName, DnsRecord.RecordType.A, java.util.Arrays.asList(nic.getIPv4Address()), 3600);
DnsRecord recordA = new DnsRecord(recordName, DnsRecord.RecordType.A, Collections.singletonList(nic.getIPv4Address()), 3600);
if (isAdd) {
provider.addRecord(server, zone, recordA);
} else {
@ -610,7 +611,7 @@ public class DnsProviderManagerImpl extends ManagerBase implements DnsProviderMa
// Handle IPv6 (AAAA Record) if it exists
if (nic.getIPv6Address() != null) {
DnsRecord recordAAAA = new DnsRecord(recordName, DnsRecord.RecordType.AAAA, java.util.Arrays.asList(nic.getIPv6Address()), 3600);
DnsRecord recordAAAA = new DnsRecord(recordName, DnsRecord.RecordType.AAAA, Collections.singletonList(nic.getIPv6Address()), 3600);
if (isAdd) {
provider.addRecord(server, zone, recordAAAA);
} else {

4
server/src/main/java/org/apache/cloudstack/dns/dao/DnsServerDao.java
View File

@ -27,10 +27,6 @@ import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDao;
public interface DnsServerDao extends GenericDao<DnsServerVO, Long> {
List<DnsServerVO> listByProvider(String provider);
DnsServer findByUrlAndAccount(String url, long accountId);
Pair<List<DnsServerVO>, Integer> searchDnsServers(Long id, String keyword, String provider, Long accountId, Filter filter);
}

11
server/src/main/java/org/apache/cloudstack/dns/dao/DnsServerDaoImpl.java
View File

@ -33,15 +33,11 @@ import com.cloud.utils.db.SearchCriteria;
@Component
public class DnsServerDaoImpl extends GenericDaoBase<DnsServerVO, Long> implements DnsServerDao {
SearchBuilder<DnsServerVO> AllFieldsSearch;
SearchBuilder<DnsServerVO> ProviderSearch;
SearchBuilder<DnsServerVO> AccountUrlSearch;
public DnsServerDaoImpl() {
super();
ProviderSearch = createSearchBuilder();
ProviderSearch.and(ApiConstants.PROVIDER_TYPE, ProviderSearch.entity().getProviderType(), SearchCriteria.Op.EQ);
ProviderSearch.done();
AccountUrlSearch = createSearchBuilder();
AccountUrlSearch.and(ApiConstants.URL, AccountUrlSearch.entity().getUrl(), SearchCriteria.Op.EQ);
@ -57,13 +53,6 @@ public class DnsServerDaoImpl extends GenericDaoBase<DnsServerVO, Long> implemen
}
@Override
public List<DnsServerVO> listByProvider(String providerType) {
SearchCriteria<DnsServerVO> sc = ProviderSearch.create();
sc.setParameters(ApiConstants.PROVIDER_TYPE, providerType);
return listBy(sc);
}
@Override
public DnsServer findByUrlAndAccount(String url, long accountId) {
SearchCriteria<DnsServerVO> sc = AccountUrlSearch.create();

1
server/src/main/java/org/apache/cloudstack/dns/dao/DnsZoneDao.java
View File

@ -27,7 +27,6 @@ import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDao;
public interface DnsZoneDao extends GenericDao<DnsZoneVO, Long> {
List<DnsZoneVO> listByServerId(long serverId);
List<DnsZoneVO> listByAccount(long accountId);
DnsZoneVO findByNameServerAndType(String name, long dnsServerId, DnsZone.ZoneType type);
Pair<List<DnsZoneVO>, Integer> searchZones(Long id, Long dnsServerId, String keyword, Long accountId, Filter filter);

11
server/src/main/java/org/apache/cloudstack/dns/dao/DnsZoneDaoImpl.java
View File

@ -33,16 +33,12 @@ import com.cloud.utils.db.SearchCriteria;
@Component
public class DnsZoneDaoImpl extends GenericDaoBase<DnsZoneVO, Long> implements DnsZoneDao {
static final String DNS_SERVER_ID = "dnsServerId";
SearchBuilder<DnsZoneVO> ServerSearch;
SearchBuilder<DnsZoneVO> AccountSearch;
SearchBuilder<DnsZoneVO> NameServerTypeSearch;
SearchBuilder<DnsZoneVO> AllFieldsSearch;
public DnsZoneDaoImpl() {
super();
ServerSearch = createSearchBuilder();
ServerSearch.and(DNS_SERVER_ID, ServerSearch.entity().getDnsServerId(), SearchCriteria.Op.EQ);
ServerSearch.done();
AccountSearch = createSearchBuilder();
AccountSearch.and(ApiConstants.ACCOUNT_ID, AccountSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
@ -62,13 +58,6 @@ public class DnsZoneDaoImpl extends GenericDaoBase<DnsZoneVO, Long> implements D
AllFieldsSearch.done();
}
@Override
public List<DnsZoneVO> listByServerId(long serverId) {
SearchCriteria<DnsZoneVO> sc = ServerSearch.create();
sc.setParameters(DNS_SERVER_ID, serverId);
return listBy(sc);
}
@Override
public List<DnsZoneVO> listByAccount(long accountId) {
SearchCriteria<DnsZoneVO> sc = AccountSearch.create();

18
server/src/main/java/org/apache/cloudstack/dns/dao/DnsZoneNetworkMapDao.java
View File

@ -1,3 +1,20 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// 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
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.dns.dao;
import java.util.List;
@ -7,7 +24,6 @@ import org.apache.cloudstack.dns.vo.DnsZoneNetworkMapVO;
import com.cloud.utils.db.GenericDao;
public interface DnsZoneNetworkMapDao extends GenericDao<DnsZoneNetworkMapVO, Long> {
List<DnsZoneNetworkMapVO> listByDnsZoneId(long dnsZoneId);
DnsZoneNetworkMapVO findByZoneAndNetwork(long dnsZoneId, long networkId);
List<DnsZoneNetworkMapVO> listByNetworkId(long networkId);
}

28
server/src/main/java/org/apache/cloudstack/dns/dao/DnsZoneNetworkMapDaoImpl.java
View File

@ -1,3 +1,20 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// 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
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.dns.dao;
import java.util.List;
@ -13,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria;
@Component
public class DnsZoneNetworkMapDaoImpl extends GenericDaoBase<DnsZoneNetworkMapVO, Long> implements DnsZoneNetworkMapDao {
private final SearchBuilder<DnsZoneNetworkMapVO> ZoneNetworkSearch;
private final SearchBuilder<DnsZoneNetworkMapVO> ZoneSearch;
private final SearchBuilder<DnsZoneNetworkMapVO> NetworkSearch;
public DnsZoneNetworkMapDaoImpl() {
@ -23,20 +39,10 @@ public class DnsZoneNetworkMapDaoImpl extends GenericDaoBase<DnsZoneNetworkMapVO
ZoneNetworkSearch.and(ApiConstants.NETWORK_ID, ZoneNetworkSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
ZoneNetworkSearch.done();
ZoneSearch = createSearchBuilder();
ZoneSearch.and(ApiConstants.DNS_ZONE_ID, ZoneSearch.entity().getDnsZoneId(), SearchCriteria.Op.EQ);
ZoneSearch.done();
NetworkSearch = createSearchBuilder();
NetworkSearch.and(ApiConstants.NETWORK_ID, NetworkSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
NetworkSearch.done();
}
@Override
public List<DnsZoneNetworkMapVO> listByDnsZoneId(long dnsZoneId) {
SearchCriteria<DnsZoneNetworkMapVO> sc = ZoneSearch.create();
sc.setParameters(ApiConstants.DNS_ZONE_ID, dnsZoneId);
return listBy(sc);
}
@Override
public DnsZoneNetworkMapVO findByZoneAndNetwork(long dnsZoneId, long networkId) {

4
server/src/main/java/org/apache/cloudstack/dns/vo/DnsZoneVO.java
View File

@ -157,4 +157,8 @@ public class DnsZoneVO implements DnsZone {
public void setDescription(String description) {
this.description = description;
}
public void setExternalReference(String externalReference) {
this.externalReference = externalReference;
}
}