1. implement event processing for vm start/stop/destroy, nic create/delete events

2. add dnsrecordurl in nic_details table
3. add dnsrecordurl in vm response

Author: sudo87

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -1353,6 +1353,7 @@ public class ApiConstants {
     public static final String DISABLED = "disabled";
     public static final String CONTENT_TYPE = "Content-Type";
     public static final String NATIVE_ZONE = "Native";
+    public static final String NIC_DNS_RECORD = "nicdnsrecord";
 
 
     public static final String PARAMETER_DESCRIPTION_ACTIVATION_RULE = "Quota tariff's activation rule. It can receive a JS script that results in either " +

api/src/main/java/org/apache/cloudstack/api/command/user/dns/DisassociateDnsZoneFromNetworkCmd.java

@@ -45,13 +45,12 @@
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class DisassociateDnsZoneFromNetworkCmd extends BaseCmd {
 
-    @Parameter(name = ApiConstants.DNS_ZONE_ID, type = CommandType.UUID, entityType = DnsZoneResponse.class,
-            required = true, description = "The ID of the DNS zone")
+    @Parameter(name = ApiConstants.DNS_ZONE_ID, type = CommandType.UUID, entityType = DnsZoneResponse.class, description = "The ID of the DNS zone")
     private Long dnsZoneId;
 
     @ACL(accessType = SecurityChecker.AccessType.OperateEntry)
     @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class,
-            required = true, description = "The ID of the network")
+            required = true, description = "The ID of the Network")
     private Long networkId;
 
     @Override
@@ -78,7 +77,7 @@ public Long getDnsZoneId() {
         return dnsZoneId;
     }
 
-    public void setDnsZoneId(Long dnsZoneId) {
-        this.dnsZoneId = dnsZoneId;
+    public Long getNetworkId() {
+        return networkId;
     }
 }

api/src/main/java/org/apache/cloudstack/api/response/NicResponse.java

@@ -146,6 +146,10 @@ public class NicResponse extends BaseResponse {
     @Param(description = "Public IP address associated with this NIC via Static NAT rule")
     private String publicIp;
 
+    @SerializedName("dnsrecordurl")
+    @Param(description = "Public IP address associated with this NIC via Static NAT rule")
+    private String dnsRecordUrl;
+
     public void setVmId(String vmId) {
         this.vmId = vmId;
     }
@@ -416,4 +420,8 @@ public void setPublicIpId(String publicIpId) {
     public void setPublicIp(String publicIp) {
         this.publicIp = publicIp;
     }
+
+    public void setDnsRecordUrl(String dnsRecordUrl) {
+        this.dnsRecordUrl = dnsRecordUrl;
+    }
 }

api/src/main/java/org/apache/cloudstack/dns/DnsProvider.java

@@ -40,5 +40,5 @@ public interface DnsProvider extends Adapter {
     String addRecord(DnsServer server, DnsZone zone, DnsRecord record) throws DnsProviderException;
     List<DnsRecord> listRecords(DnsServer server, DnsZone zone) throws DnsProviderException;
     String updateRecord(DnsServer server, DnsZone zone, DnsRecord record) throws DnsProviderException;
-    void deleteRecord(DnsServer server, DnsZone zone, DnsRecord record) throws DnsProviderException;
+    String deleteRecord(DnsServer server, DnsZone zone, DnsRecord record) throws DnsProviderException;
 }

api/src/main/java/org/apache/cloudstack/dns/DnsProviderManager.java

@@ -77,5 +77,5 @@ public interface DnsProviderManager extends Manager, PluggableService {
 
     void checkDnsServerPermissions(Account caller, DnsServer server);
 
-    boolean processDnsRecordForInstance(VirtualMachine instance, Network network, Nic nic, boolean isAdd);
+    String processDnsRecordForInstance(VirtualMachine instance, Network network, Nic nic, boolean isAdd);
 }

engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql

@@ -141,6 +141,7 @@ SELECT
     `nics`.`mac_address` AS `mac_address`,
     `nics`.`broadcast_uri` AS `broadcast_uri`,
     `nics`.`isolation_uri` AS `isolation_uri`,
+    `nic_details`.`value` AS `dns_record_url`,
     `vpc`.`id` AS `vpc_id`,
     `vpc`.`uuid` AS `vpc_uuid`,
     `networks`.`uuid` AS `network_uuid`,
@@ -185,7 +186,7 @@ SELECT
     `lease_expiry_action`.`value` AS `lease_expiry_action`,
     `lease_action_execution`.`value` AS `lease_action_execution`
 FROM
-    (((((((((((((((((((((((((((((((((((((`user_vm`
+    ((((((((((((((((((((((((((((((((((((((`user_vm`
         JOIN `vm_instance` ON (((`vm_instance`.`id` = `user_vm`.`id`)
             AND ISNULL(`vm_instance`.`removed`))))
         JOIN `account` ON ((`vm_instance`.`account_id` = `account`.`id`)))
@@ -212,6 +213,7 @@ FROM
         LEFT JOIN `user_data` ON ((`user_data`.`id` = `user_vm`.`user_data_id`)))
         LEFT JOIN `nics` ON (((`vm_instance`.`id` = `nics`.`instance_id`)
         AND ISNULL(`nics`.`removed`))))
+        LEFT JOIN `nic_details` ON ((`nic_details`.`nic_id` = `nics`.`id`) AND (`nic_details`.`name` = 'nicdnsrecord')))
         LEFT JOIN `networks` ON ((`nics`.`network_id` = `networks`.`id`)))
         LEFT JOIN `vpc` ON (((`networks`.`vpc_id` = `vpc`.`id`)
         AND ISNULL(`vpc`.`removed`))))

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

@@ -223,7 +223,7 @@ public String modifyRecord(String baseUrl, Integer port, String apiKey, String e
         HttpPatch request = new HttpPatch(buildUrl(baseUrl, port, "/servers/" + externalServerId + "/zones/" + encodedZone));
         request.setEntity(new org.apache.http.entity.StringEntity(root.toString(), StandardCharsets.UTF_8));
         execute(request, apiKey, 204);
-        return normalizedRecord;
+        return normalizedRecord.endsWith(".") ? normalizedRecord.substring(0, normalizedRecord.length() - 1) : normalizedRecord;
     }
 
     public Iterable<JsonNode> listRecords(String baseUrl, Integer port, String apiKey, String externalServerId, String zoneName) throws DnsProviderException {

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

@@ -105,9 +105,9 @@ public String updateRecord(DnsServer server, DnsZone zone, DnsRecord record) thr
     }
 
     @Override
-    public void deleteRecord(DnsServer server, DnsZone zone, DnsRecord record) throws DnsProviderException {
+    public String deleteRecord(DnsServer server, DnsZone zone, DnsRecord record) throws DnsProviderException {
         validateRequiredServerAndZoneFields(server, zone);
-        applyRecord(server.getUrl(),
+        return applyRecord(server.getUrl(),
                 server.getPort(),
                 server.getApiKey(),
                 server.getExternalServerId(),

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

@@ -17,14 +17,13 @@
 package com.cloud.api.query.dao;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
-
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
@@ -34,8 +33,6 @@
 
 import javax.inject.Inject;
 
-import com.cloud.gpu.dao.VgpuProfileDao;
-import com.cloud.service.dao.ServiceOfferingDao;
 import org.apache.cloudstack.affinity.AffinityGroupResponse;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
@@ -61,11 +58,13 @@
 import com.cloud.api.ApiResponseHelper;
 import com.cloud.api.query.vo.UserVmJoinVO;
 import com.cloud.gpu.GPU;
+import com.cloud.gpu.dao.VgpuProfileDao;
 import com.cloud.host.ControlState;
 import com.cloud.network.IpAddress;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.service.ServiceOfferingDetailsVO;
+import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.GuestOS;
 import com.cloud.storage.Storage.TemplateType;
@@ -92,9 +91,9 @@
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.VmStats;
+import com.cloud.vm.dao.NicDetailsDao;
 import com.cloud.vm.dao.NicExtraDhcpOptionDao;
 import com.cloud.vm.dao.NicSecondaryIpVO;
-
 import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 @Component
@@ -128,6 +127,8 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
     private VgpuProfileDao vgpuProfileDao;
     @Inject
     VMTemplateDao vmTemplateDao;
+    @Inject
+    NicDetailsDao nicDetailsDao;
 
     private final SearchBuilder<UserVmJoinVO> VmDetailSearch;
     private final SearchBuilder<UserVmJoinVO> activeVmByIsoSearch;
@@ -358,6 +359,7 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us
                 nicResponse.setIp6Address(userVm.getIp6Address());
                 nicResponse.setIp6Gateway(userVm.getIp6Gateway());
                 nicResponse.setIp6Cidr(userVm.getIp6Cidr());
+                nicResponse.setDnsRecordUrl(userVm.getDnsRecordUrl());
                 if (userVm.getBroadcastUri() != null) {
                     nicResponse.setBroadcastUri(userVm.getBroadcastUri().toString());
                 }
@@ -611,6 +613,9 @@ public UserVmResponse setUserVmResponse(ResponseView view, UserVmResponse userVm
             nicResponse.setIp6Gateway(uvo.getIp6Gateway());
             /*13: IPv6Cidr*/
             nicResponse.setIp6Cidr(uvo.getIp6Cidr());
+            /* dnsRecordUrl */
+            nicResponse.setDnsRecordUrl(uvo.getDnsRecordUrl());
+
             /*14: deviceId*/
 // where do we find           nicResponse.setDeviceId(
 // this is probably not String.valueOf(uvo.getNicId())); as this is a db-id

server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java

@@ -32,21 +32,22 @@
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
+import org.apache.cloudstack.util.HypervisorTypeConverter;
+
 import com.cloud.host.Status;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.Network.GuestType;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.resource.ResourceState;
 import com.cloud.storage.Storage;
-import com.cloud.storage.Storage.TemplateType;
 import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.storage.Storage.TemplateType;
 import com.cloud.storage.Volume;
 import com.cloud.user.Account;
 import com.cloud.util.StoragePoolTypeConverter;
 import com.cloud.utils.db.GenericDao;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
-import org.apache.cloudstack.util.HypervisorTypeConverter;
 
 @Entity
 @Table(name = "user_vm_view")
@@ -398,6 +399,9 @@ public class UserVmJoinVO extends BaseViewWithTagInformationVO implements Contro
     @Column(name = "public_ip_address")
     private String publicIpAddress;
 
+    @Column(name = "dns_record_url")
+    private String dnsRecordUrl;
+
     @Column(name = "user_data", updatable = true, nullable = true, length = 2048)
     private String userData;
 
@@ -1089,4 +1093,8 @@ public void setLeaseExpiryAction(String leaseExpiryAction) {
     public String getLeaseActionExecution() {
         return leaseActionExecution;
     }
+
+    public String getDnsRecordUrl() {
+        return dnsRecordUrl;
+    }
 }