CLOUDSTACK-6787: Publishing uuids missing in some cases, adding/correcting events in some cases.

nitinmeh · nitinmeh · commit 77dadd75c491 · 2014-07-21T14:08:18.000-07:00
Also fixed a bug in the global config framework.
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
@@ -261,6 +261,7 @@ public void create() {
         try {
             FirewallRule result = _firewallService.createEgressFirewallRule(this);
             setEntityId(result.getId());
+            setEntityUuid(result.getUuid());
         } catch (NetworkRuleConflictException ex) {
             s_logger.info("Network rule conflict: " + ex.getMessage());
             s_logger.trace("Network Rule Conflict: ", ex);
diff --git a/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java b/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java
@@ -133,7 +133,7 @@ public boolean equals(Object obj) {
     public T value() {
         if (_value == null || isDynamic()) {
             ConfigurationVO vo = s_depot != null ? s_depot.global().findById(key()) : null;
-            _value = valueOf(vo != null ? vo.getValue() : defaultValue());
+            _value = valueOf((vo != null && vo.getValue() != null) ? vo.getValue() : defaultValue());
         }
 
         return _value;
diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -795,6 +795,7 @@ public AutoScaleVmGroup createAutoScaleVmGroup(CreateAutoScaleVmGroupCmd cmd) {
     }
 
     @Override
+    @ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_CREATE, eventDescription = "creating autoscale vm group", async = true)
     public boolean configureAutoScaleVmGroup(CreateAutoScaleVmGroupCmd cmd) throws ResourceUnavailableException {
         return configureAutoScaleVmGroup(cmd.getEntityId(), AutoScaleVmGroup.State_New);
     }
@@ -823,7 +824,7 @@ private boolean configureAutoScaleVmGroup(long vmGroupid, String currentState) t
 
     @Override
     @DB
-    @ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_DELETE, eventDescription = "deleting autoscale vm group")
+    @ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_DELETE, eventDescription = "deleting autoscale vm group", async = true)
     public boolean deleteAutoScaleVmGroup(final long id) {
         AutoScaleVmGroupVO autoScaleVmGroupVO = getEntityInDatabase(CallContext.current().getCallingAccount(), "AutoScale Vm Group", id, _autoScaleVmGroupDao);
 
@@ -997,7 +998,7 @@ public AutoScaleVmGroupVO doInTransaction(TransactionStatus status) {
     }
 
     @Override
-    @ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_UPDATE, eventDescription = "updating autoscale vm group")
+    @ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_UPDATE, eventDescription = "updating autoscale vm group", async = true)
     public AutoScaleVmGroup updateAutoScaleVmGroup(UpdateAutoScaleVmGroupCmd cmd) {
         Long vmGroupId = cmd.getId();
         Integer minMembers = cmd.getMinMembers();
@@ -1046,7 +1047,7 @@ public AutoScaleVmGroup updateAutoScaleVmGroup(UpdateAutoScaleVmGroupCmd cmd) {
 
     @Override
     @DB
-    @ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_ENABLE, eventDescription = "enabling autoscale vm group")
+    @ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_ENABLE, eventDescription = "enabling autoscale vm group", async = true)
     public AutoScaleVmGroup enableAutoScaleVmGroup(Long id) {
         AutoScaleVmGroupVO vmGroup = getEntityInDatabase(CallContext.current().getCallingAccount(), "AutoScale Vm Group", id, _autoScaleVmGroupDao);
         boolean success = false;
@@ -1072,7 +1073,7 @@ public AutoScaleVmGroup enableAutoScaleVmGroup(Long id) {
     }
 
     @Override
-    @ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_DISABLE, eventDescription = "disabling autoscale vm group")
+    @ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_DISABLE, eventDescription = "disabling autoscale vm group", async = true)
     @DB
     public AutoScaleVmGroup disableAutoScaleVmGroup(Long id) {
         AutoScaleVmGroupVO vmGroup = getEntityInDatabase(CallContext.current().getCallingAccount(), "AutoScale Vm Group", id, _autoScaleVmGroupDao);
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -639,6 +639,7 @@ public boolean deleteSnapshotDirsForAccount(long accountId) {
 
     @Override
     @DB
+    @ActionEvent(eventType = EventTypes.EVENT_SNAPSHOT_POLICY_CREATE, eventDescription = "creating snapshot policy")
     public SnapshotPolicyVO createPolicy(CreateSnapshotPolicyCmd cmd, Account policyOwner) {
         Long volumeId = cmd.getVolumeId();
         boolean display = cmd.isDisplay();
@@ -735,6 +736,8 @@ public SnapshotPolicyVO createPolicy(CreateSnapshotPolicyCmd cmd, Account policy
             }
 
         }
+        // TODO - Make createSnapshotPolicy - BaseAsyncCreate and remove this.
+        CallContext.current().putContextParameter(SnapshotPolicy.class.getName(), policy.getUuid());
         return policy;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public boolean equals(Object obj) {`
`133`	`133`	`public T value() {`
`134`	`134`	`if (_value == null \|\| isDynamic()) {`
`135`	`135`	`ConfigurationVO vo = s_depot != null ? s_depot.global().findById(key()) : null;`
`136`		`- _value = valueOf(vo != null ? vo.getValue() : defaultValue());`
	`136`	`+ _value = valueOf((vo != null && vo.getValue() != null) ? vo.getValue() : defaultValue());`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`return _value;`
Original file line number	Diff line number	Diff line change
`@@ -639,6 +639,7 @@ public boolean deleteSnapshotDirsForAccount(long accountId) {`
`639`	`639`
`640`	`640`	`@Override`
`641`	`641`	`@DB`
	`642`	`+ @ActionEvent(eventType = EventTypes.EVENT_SNAPSHOT_POLICY_CREATE, eventDescription = "creating snapshot policy")`
`642`	`643`	`public SnapshotPolicyVO createPolicy(CreateSnapshotPolicyCmd cmd, Account policyOwner) {`
`643`	`644`	`Long volumeId = cmd.getVolumeId();`
`644`	`645`	`boolean display = cmd.isDisplay();`
`@@ -735,6 +736,8 @@ public SnapshotPolicyVO createPolicy(CreateSnapshotPolicyCmd cmd, Account policy`
`735`	`736`	`}`
`736`	`737`
`737`	`738`	`}`
	`739`	`+ // TODO - Make createSnapshotPolicy - BaseAsyncCreate and remove this.`
	`740`	`+ CallContext.current().putContextParameter(SnapshotPolicy.class.getName(), policy.getUuid());`
`738`	`741`	`return policy;`
`739`	`742`	`}`
`740`	`743`