schema,server,api: events improvement

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

@@ -33,4 +33,8 @@
     String eventType();
 
     String eventDescription();
+
+    long resourceId() default -1;
+
+    String resourceType() default "";
 }

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

@@ -33,6 +33,10 @@ public enum State {
 
     String getDescription();
 
+    Long getResourceId();
+
+    String getResourceType();
+
     Date getCreateDate();
 
     long getUserId();

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

@@ -21,6 +21,7 @@
 
 import org.apache.cloudstack.acl.Role;
 import org.apache.cloudstack.acl.RolePermission;
+import org.apache.cloudstack.affinity.AffinityGroup;
 import org.apache.cloudstack.annotation.Annotation;
 import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.HostResponse;
@@ -63,6 +64,7 @@
 import com.cloud.network.vpc.PrivateGateway;
 import com.cloud.network.vpc.StaticRoute;
 import com.cloud.network.vpc.Vpc;
+import com.cloud.network.vpc.VpcOffering;
 import com.cloud.offering.DiskOffering;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.offering.ServiceOffering;
@@ -972,9 +974,9 @@ public class EventTypes {
         entityEventDetails.put(EVENT_VPC_RESTART, Vpc.class);
 
         // VPC offerings
-        entityEventDetails.put(EVENT_VPC_OFFERING_CREATE, Vpc.class);
-        entityEventDetails.put(EVENT_VPC_OFFERING_UPDATE, Vpc.class);
-        entityEventDetails.put(EVENT_VPC_OFFERING_DELETE, Vpc.class);
+        entityEventDetails.put(EVENT_VPC_OFFERING_CREATE, VpcOffering.class);
+        entityEventDetails.put(EVENT_VPC_OFFERING_UPDATE, VpcOffering.class);
+        entityEventDetails.put(EVENT_VPC_OFFERING_DELETE, VpcOffering.class);
 
         // Private gateway
         entityEventDetails.put(EVENT_PRIVATE_GATEWAY_CREATE, PrivateGateway.class);
@@ -1014,6 +1016,11 @@ public class EventTypes {
         entityEventDetails.put(EVENT_GUEST_VLAN_RANGE_DEDICATE, GuestVlan.class);
         entityEventDetails.put(EVENT_DEDICATED_GUEST_VLAN_RANGE_RELEASE, GuestVlan.class);
 
+        entityEventDetails.put(EVENT_AFFINITY_GROUP_CREATE, AffinityGroup.class);
+        entityEventDetails.put(EVENT_AFFINITY_GROUP_DELETE, AffinityGroup.class);
+        entityEventDetails.put(EVENT_AFFINITY_GROUP_ASSIGN, AffinityGroup.class);
+        entityEventDetails.put(EVENT_AFFINITY_GROUP_REMOVE, AffinityGroup.class);
+
         // OpenDaylight
         entityEventDetails.put(EVENT_EXTERNAL_OPENDAYLIGHT_ADD_CONTROLLER, "OpenDaylightController");
         entityEventDetails.put(EVENT_EXTERNAL_OPENDAYLIGHT_DELETE_CONTROLLER, "OpenDaylightController");

api/src/main/java/com/cloud/network/vpn/Site2SiteVpnService.java

@@ -46,6 +46,8 @@ public interface Site2SiteVpnService {
 
     Site2SiteVpnGateway getVpnGateway(Long vpnGatewayId);
 
+    Site2SiteCustomerGateway getCustomerGateway(Long customerGatewayId);
+
     Site2SiteVpnConnection createVpnConnection(CreateVpnConnectionCmd cmd) throws NetworkRuleConflictException;
 
     boolean deleteCustomerGateway(DeleteVpnCustomerGatewayCmd deleteVpnCustomerGatewayCmd);

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

@@ -0,0 +1,118 @@
+// 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.api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.cloudstack.region.PortableIp;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.EnumUtils;
+import org.apache.commons.lang3.StringUtils;
+
+public enum ApiCommandResourceType {
+    None(null),
+    VirtualMachine(com.cloud.vm.VirtualMachine.class),
+    DomainRouter(com.cloud.network.router.VirtualRouter.class),
+    Volume(com.cloud.storage.Volume.class),
+    ConsoleProxy(com.cloud.vm.VirtualMachine.class),
+    Snapshot(com.cloud.storage.Snapshot.class),
+    Backup(org.apache.cloudstack.backup.Backup.class),
+    Template(com.cloud.template.VirtualMachineTemplate.class),
+    Iso(com.cloud.template.VirtualMachineTemplate.class),
+    SystemVm(com.cloud.vm.VirtualMachine.class),
+    Host(com.cloud.host.Host.class),
+    StoragePool(com.cloud.storage.StoragePool.class),
+    ImageStore(com.cloud.storage.ImageStore.class),
+    IpAddress(com.cloud.network.IpAddress.class),
+    PortableIpAddress(PortableIp.class),
+    SecurityGroup(com.cloud.network.security.SecurityGroup.class),
+    PhysicalNetwork(com.cloud.network.PhysicalNetwork.class),
+    TrafficType(com.cloud.network.PhysicalNetworkTrafficType.class),
+    PhysicalNetworkServiceProvider(com.cloud.network.PhysicalNetworkServiceProvider.class),
+    FirewallRule(com.cloud.network.rules.FirewallRule.class),
+    Account(com.cloud.user.Account.class),
+    User(com.cloud.user.User.class),
+    PrivateGateway(com.cloud.network.vpc.PrivateGateway.class),
+    StaticRoute(com.cloud.network.vpc.StaticRoute.class),
+    Counter(com.cloud.network.as.Counter.class),
+    Condition(com.cloud.network.as.Condition.class),
+    AutoScalePolicy(com.cloud.network.as.AutoScalePolicy.class),
+    AutoScaleVmProfile(com.cloud.network.as.AutoScaleVmProfile.class),
+    AutoScaleVmGroup(com.cloud.network.as.AutoScaleVmGroup.class),
+    GlobalLoadBalancerRule(com.cloud.region.ha.GlobalLoadBalancerRule.class),
+    LoadBalancerRule(com.cloud.network.lb.LoadBalancingRule.class),
+    AffinityGroup(org.apache.cloudstack.affinity.AffinityGroup.class),
+    InternalLbVm(com.cloud.network.router.VirtualRouter.class),
+    DedicatedGuestVlanRange(com.cloud.network.GuestVlan.class),
+    GuestOs(com.cloud.storage.GuestOS.class),
+    GuestOsMapping(com.cloud.storage.GuestOSHypervisor.class),
+    Network(com.cloud.network.Network.class),
+    NetworkAcl(com.cloud.network.vpc.NetworkACL.class),
+    NetworkAclItem(com.cloud.network.vpc.NetworkACLItem.class),
+    Project(com.cloud.projects.Project.class),
+    Domain(com.cloud.domain.Domain.class),
+    DiskOffering(com.cloud.offering.DiskOffering.class),
+    ServiceOffering(com.cloud.offering.ServiceOffering.class),
+    NetworkOffering(com.cloud.offering.NetworkOffering.class),
+    VpcOffering(com.cloud.network.vpc.VpcOffering.class),
+    BackupOffering(org.apache.cloudstack.backup.BackupOffering.class),
+    Zone(com.cloud.dc.DataCenter.class),
+    Vpc(com.cloud.network.vpc.Vpc.class),
+    Cluster(com.cloud.org.Cluster.class),
+    Pod(com.cloud.dc.Pod.class),
+    VmSnapshot(com.cloud.vm.snapshot.VMSnapshot.class),
+    Role(org.apache.cloudstack.acl.Role.class),
+    VpnCustomerGateway(com.cloud.network.Site2SiteCustomerGateway.class);
+
+    private final Class<?> clazz;
+
+    private ApiCommandResourceType(Class<?> clazz) {
+        this.clazz = clazz;
+    }
+
+    public Class<?> getAssociatedClass() {
+        return this.clazz;
+    }
+
+    public static List<ApiCommandResourceType> valuesFromAssociatedClass(Class<?> clazz) {
+        List<ApiCommandResourceType> types = new ArrayList<>();
+        for (ApiCommandResourceType type : ApiCommandResourceType.values()) {
+            if (type.getAssociatedClass() == clazz) {
+                types.add(type);
+            }
+        }
+        return types;
+    }
+
+    public static ApiCommandResourceType valueFromAssociatedClass(Class<?> clazz) {
+        List<ApiCommandResourceType> types = valuesFromAssociatedClass(clazz);
+        return CollectionUtils.isEmpty(types) ? null : types.get(0);
+    }
+
+    @Override
+    public String toString() {
+        return this.name();
+    }
+
+    public static ApiCommandResourceType fromString(String value) {
+        if (StringUtils.isNotEmpty(value) && EnumUtils.isValidEnum(ApiCommandResourceType.class, value)) {
+            return valueOf(value);
+        }
+        return null;
+    }
+}

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

@@ -335,6 +335,7 @@ public class ApiConstants {
     public static final String RECONNECT = "reconnect";
     public static final String RECOVER = "recover";
     public static final String REQUIRES_HVM = "requireshvm";
+    public static final String RESOURCE_NAME = "resourcename";
     public static final String RESOURCE_TYPE = "resourcetype";
     public static final String RESOURCE_TYPE_NAME = "resourcetypename";
     public static final String RESPONSE = "response";

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

@@ -74,21 +74,6 @@ public void setStartEventId(Long startEventId) {
         this.startEventId = startEventId;
     }
 
-    /**
-     * Async commands that want to be tracked as part of the listXXX commands need to
-     * provide implementations of the two following methods, getInstanceId() and getInstanceType()
-     *
-     * getObjectId() should return the id of the object the async command is executing on
-     * getObjectType() should return a type from the AsyncJob.Type enumeration
-     */
-    public Long getInstanceId() {
-        return null;
-    }
-
-    public ApiCommandJobType getInstanceType() {
-        return ApiCommandJobType.None;
-    }
-
     public String getSyncObjType() {
         return null;
     }

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

@@ -29,11 +29,6 @@
 
 import javax.inject.Inject;
 
-import com.cloud.server.ManagementService;
-import com.cloud.server.ResourceIconManager;
-import com.cloud.server.ResourceManagerUtil;
-import com.cloud.server.ResourceMetaDataService;
-import com.cloud.server.TaggedResourceService;
 import org.apache.cloudstack.acl.ProjectRoleService;
 import org.apache.cloudstack.acl.RoleService;
 import org.apache.cloudstack.acl.RoleType;
@@ -72,6 +67,11 @@
 import com.cloud.network.vpn.Site2SiteVpnService;
 import com.cloud.projects.ProjectService;
 import com.cloud.resource.ResourceService;
+import com.cloud.server.ManagementService;
+import com.cloud.server.ResourceIconManager;
+import com.cloud.server.ResourceManagerUtil;
+import com.cloud.server.ResourceMetaDataService;
+import com.cloud.server.TaggedResourceService;
 import com.cloud.storage.DataStoreProviderApiService;
 import com.cloud.storage.StorageService;
 import com.cloud.storage.VolumeApiService;
@@ -430,4 +430,21 @@ private Object getEntityVO(Class entityType, Object entityId){
         return null;
     }
 
+    /**
+     * Commands that generate action events associated to a resource and
+     * async commands that want to be tracked as part of the listXXX commands
+     * need to provide implementations of the two following methods,
+     * getApiResourceId() and getApiResourceType()
+     *
+     * getApiResourceId() should return the id of the object the async command is executing on
+     * getApiResourceType() should return a type from the ApiCommandResourceType enumeration
+     */
+    public Long getApiResourceId() {
+        return null;
+    }
+
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.None;
+    }
+
 }

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

@@ -117,11 +117,6 @@ public Long getStartIndex() {
         return startIndex;
     }
 
-    @Override
-    public ApiCommandJobType getInstanceType() {
-        return ApiCommandJobType.None;
-    }
-
     @Override
     public void validateSpecificParameters(final Map<String, String> params){
         super.validateSpecificParameters(params);

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

@@ -27,6 +27,4 @@ public interface IBaseListCmd {
     Long getPageSizeVal();
 
     Long getStartIndex();
-
-    ApiCommandJobType getInstanceType();
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java

@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
@@ -207,4 +208,9 @@ private void validateParams() {
             throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Neither account type and role ID are not provided");
         }
     }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.Account;
+    }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java

@@ -21,7 +21,7 @@
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.ACL;
 import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiCommandJobType;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
@@ -110,12 +110,12 @@ public void execute() {
     }
 
     @Override
-    public ApiCommandJobType getInstanceType() {
-        return ApiCommandJobType.Account;
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.Account;
     }
 
     @Override
-    public Long getInstanceId() {
+    public Long getApiResourceId() {
         return id;
     }
 }