changes:

1. handle vm hostname change for dns registration
2. generate event for dns name collision
3. remove dns record lifecycle subscriber

Author: sudo87

api/src/main/java/com/cloud/event/EventTypes.java

@@ -877,6 +877,7 @@ public class EventTypes {
     public static final String EVENT_DNS_ZONE_DELETE = "DNS.ZONE.DELETE";
     public static final String EVENT_DNS_RECORD_CREATE = "DNS.RECORD.CREATE";
     public static final String EVENT_DNS_RECORD_DELETE = "DNS.RECORD.DELETE";
+    public static final String EVENT_DNS_NAME_COLLISION = "DNS.NAME.COLLISION";
 
     static {
 

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

@@ -1376,6 +1376,7 @@ public class ApiConstants {
     public static final String INSTANCE_ID = "instanceId";
     public static final String OLD_STATE = "oldState";
     public static final String NEW_STATE = "newState";
+    public static final String OLD_HOST_NAME = "oldHostName";
 
 
     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/dns/DnsProvider.java

@@ -24,11 +24,6 @@
 import com.cloud.utils.component.Adapter;
 
 public interface DnsProvider extends Adapter {
-
-    interface Topics {
-        String DNS_RECORD_LIFECYCLE = "dns.record.lifecycle";
-    }
-
     DnsProviderType getProviderType();
 
     // Validates connectivity to the server

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

@@ -37,12 +37,9 @@
 import org.apache.cloudstack.api.response.DnsZoneResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 
-import com.cloud.network.Network;
 import com.cloud.user.Account;
 import com.cloud.utils.component.Manager;
 import com.cloud.utils.component.PluggableService;
-import com.cloud.vm.Nic;
-import com.cloud.vm.VirtualMachine;
 
 public interface DnsProviderManager extends Manager, PluggableService {
 
@@ -75,8 +72,6 @@ public interface DnsProviderManager extends Manager, PluggableService {
 
     boolean disassociateZoneFromNetwork(DisassociateDnsZoneFromNetworkCmd cmd);
 
-    void deleteDnsRecordForVM(VirtualMachine instance, Network network, Nic nic);
-
     void checkDnsServerPermission(Account caller, DnsServer dnsServer);
 
     void checkDnsZonePermission(Account caller, DnsZone dnsZone);

engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java

@@ -112,7 +112,8 @@ public interface VirtualMachineManager extends Manager {
 
     interface Topics {
         String VM_POWER_STATE = "vm.powerstate";
-        String VM_LIFECYCLE = "vm.lifecycle";
+        String VM_LIFECYCLE_STATE = "vm.lifecycle.state";
+        String VM_ACTION = "vm.action";
     }
 
     /**

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -18,10 +18,12 @@
 
 import static com.cloud.event.EventTypes.EVENT_NIC_CREATE;
 import static com.cloud.event.EventTypes.EVENT_NIC_DELETE;
+import static com.cloud.event.EventTypes.EVENT_VM_UPDATE;
 import static com.cloud.hypervisor.Hypervisor.HypervisorType.Functionality;
 import static com.cloud.storage.Volume.IOPS_LIMIT;
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
-import static com.cloud.vm.VirtualMachineManager.Topics.VM_LIFECYCLE;
+import static com.cloud.vm.VirtualMachineManager.Topics.VM_ACTION;
+import static com.cloud.vm.VirtualMachineManager.Topics.VM_LIFECYCLE_STATE;
 import static org.apache.cloudstack.api.ApiConstants.MAX_IOPS;
 import static org.apache.cloudstack.api.ApiConstants.MIN_IOPS;
 
@@ -163,6 +165,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.logging.log4j.util.Strings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -1554,7 +1557,7 @@ private void publishVmLifecycleMessageBus(UserVm instance, @Nullable VirtualMach
             event.put(ApiConstants.OLD_STATE, oldState != null ? oldState : State.Unknown);
             event.put(ApiConstants.NEW_STATE, newState);
             event.put(ApiConstants.TIME_STAMP, System.currentTimeMillis());
-            messageBus.publish(_name, VM_LIFECYCLE, PublishScope.GLOBAL, event);
+            messageBus.publish(_name, VM_LIFECYCLE_STATE, PublishScope.GLOBAL, event);
         } catch (Exception ex) {
             logger.warn("Failed to publish lifecycle event for Instance: {}",  instance.getUuid(), ex);
         }
@@ -1576,6 +1579,24 @@ private void publishNicEventMessageBus(Long instanceId, Long accountId, Long nic
         }
     }
 
+    private void publishVmHostNameUpdateMessageBus(long instanceId, String oldHostName, String hostName) {
+        if (Strings.isBlank(hostName) || oldHostName.equalsIgnoreCase(hostName)) {
+            return;
+        }
+        try {
+            Map<String, Object> event = new HashMap<>();
+            event.put(ApiConstants.EVENT_ID, UUID.randomUUID().toString());
+            event.put(ApiConstants.INSTANCE_ID, instanceId);
+            event.put(ApiConstants.OLD_HOST_NAME, oldHostName);
+            event.put(ApiConstants.HOST_NAME, hostName);
+            event.put(ApiConstants.EVENT_TYPE, EVENT_VM_UPDATE);
+            event.put(ApiConstants.TIME_STAMP, System.currentTimeMillis());
+            messageBus.publish(_name, VM_ACTION, PublishScope.GLOBAL, event);
+        } catch (Exception ex) {
+            logger.error("Failed to publish Instance action event for ID: {}", instanceId, ex);
+        }
+    }
+
     /**
      * Set NIC as default if VM has no default NIC
      * @param vmInstance VM instance to be checked
@@ -2964,7 +2985,7 @@ protected void updateVmExtraConfig(UserVmVO userVm, String extraConfig, boolean
     }
 
     @Override
-    @ActionEvent(eventType = EventTypes.EVENT_VM_UPDATE, eventDescription = "updating Vm")
+    @ActionEvent(eventType = EVENT_VM_UPDATE, eventDescription = "updating Vm")
     public UserVm updateVirtualMachine(UpdateVMCmd cmd) throws ResourceUnavailableException, InsufficientCapacityException {
         validateInputsAndPermissionForUpdateVirtualMachineCommand(cmd);
 
@@ -3340,6 +3361,7 @@ public UserVm updateVirtualMachine(long id, String displayName, String group, Bo
         }
 
         if (State.Running == vm.getState()) {
+            publishVmHostNameUpdateMessageBus(vm.getId(), vm.getHostName(), hostName);
             updateDns(vm, hostName);
         }