You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2015/09/14 06:16:27 UTC
[5/6] git commit: updated refs/heads/master to f888e93
CLOUDSTACK-8816 Systemvm reboot event doesnt have uuids. Fixed the same
Also removed duplicate console proxy event thats generated both for ssvm
and console proxy reboot.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35884649
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35884649
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35884649
Branch: refs/heads/master
Commit: 358846492a2b7b65683d8b0c4c4bdec78792dc50
Parents: 3bd5352
Author: Rajani Karuturi <ra...@citrix.com>
Authored: Wed Sep 9 14:21:44 2015 +0530
Committer: Rajani Karuturi <ra...@citrix.com>
Committed: Wed Sep 9 14:23:29 2015 +0530
----------------------------------------------------------------------
api/src/com/cloud/event/EventTypes.java | 28 +++++++++-----------
.../com/cloud/server/ManagementServerImpl.java | 1 -
2 files changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35884649/api/src/com/cloud/event/EventTypes.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java
index 870c7e7..9a264a5 100644
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -63,10 +63,8 @@ import com.cloud.storage.snapshot.SnapshotPolicy;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
import com.cloud.user.User;
-import com.cloud.vm.ConsoleProxy;
import com.cloud.vm.Nic;
import com.cloud.vm.NicSecondaryIp;
-import com.cloud.vm.SecondaryStorageVm;
import com.cloud.vm.VirtualMachine;
import org.apache.cloudstack.config.Configuration;
import org.apache.cloudstack.usage.Usage;
@@ -557,13 +555,13 @@ public class EventTypes {
entityEventDetails.put(EVENT_ROUTER_HA, VirtualRouter.class);
entityEventDetails.put(EVENT_ROUTER_UPGRADE, VirtualRouter.class);
- entityEventDetails.put(EVENT_PROXY_CREATE, ConsoleProxy.class);
- entityEventDetails.put(EVENT_PROXY_DESTROY, ConsoleProxy.class);
- entityEventDetails.put(EVENT_PROXY_START, ConsoleProxy.class);
- entityEventDetails.put(EVENT_PROXY_STOP, ConsoleProxy.class);
- entityEventDetails.put(EVENT_PROXY_REBOOT, ConsoleProxy.class);
- entityEventDetails.put(EVENT_ROUTER_HA, ConsoleProxy.class);
- entityEventDetails.put(EVENT_PROXY_HA, ConsoleProxy.class);
+ entityEventDetails.put(EVENT_PROXY_CREATE, VirtualMachine.class);
+ entityEventDetails.put(EVENT_PROXY_DESTROY, VirtualMachine.class);
+ entityEventDetails.put(EVENT_PROXY_START, VirtualMachine.class);
+ entityEventDetails.put(EVENT_PROXY_STOP, VirtualMachine.class);
+ entityEventDetails.put(EVENT_PROXY_REBOOT, VirtualMachine.class);
+ entityEventDetails.put(EVENT_ROUTER_HA, VirtualMachine.class);
+ entityEventDetails.put(EVENT_PROXY_HA, VirtualMachine.class);
entityEventDetails.put(EVENT_VNC_CONNECT, "VNC");
entityEventDetails.put(EVENT_VNC_DISCONNECT, "VNC");
@@ -668,12 +666,12 @@ public class EventTypes {
entityEventDetails.put(EVENT_ISO_UPLOAD, "Iso");
// SSVM
- entityEventDetails.put(EVENT_SSVM_CREATE, SecondaryStorageVm.class);
- entityEventDetails.put(EVENT_SSVM_DESTROY, SecondaryStorageVm.class);
- entityEventDetails.put(EVENT_SSVM_START, SecondaryStorageVm.class);
- entityEventDetails.put(EVENT_SSVM_STOP, SecondaryStorageVm.class);
- entityEventDetails.put(EVENT_SSVM_REBOOT, SecondaryStorageVm.class);
- entityEventDetails.put(EVENT_SSVM_HA, SecondaryStorageVm.class);
+ entityEventDetails.put(EVENT_SSVM_CREATE, VirtualMachine.class);
+ entityEventDetails.put(EVENT_SSVM_DESTROY, VirtualMachine.class);
+ entityEventDetails.put(EVENT_SSVM_START, VirtualMachine.class);
+ entityEventDetails.put(EVENT_SSVM_STOP, VirtualMachine.class);
+ entityEventDetails.put(EVENT_SSVM_REBOOT, VirtualMachine.class);
+ entityEventDetails.put(EVENT_SSVM_HA, VirtualMachine.class);
// Service Offerings
entityEventDetails.put(EVENT_SERVICE_OFFERING_CREATE, ServiceOffering.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35884649/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 8483018..25071a2 100644
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -3250,7 +3250,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
@Override
- @ActionEvent(eventType = EventTypes.EVENT_PROXY_REBOOT, eventDescription = "", async = true)
public VMInstanceVO rebootSystemVM(final RebootSystemVmCmd cmd) {
final VMInstanceVO systemVm = _vmInstanceDao.findByIdTypes(cmd.getId(), VirtualMachine.Type.ConsoleProxy, VirtualMachine.Type.SecondaryStorageVm);