CLOUDSTACK-7153: addNicToVirtualMachine not BaseAsyncCreate but creates an entity

Damodar · Kishan Kavala · commit c43b56998a7e · 2014-07-23T09:28:32.000+05:30
diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java
@@ -31,6 +31,7 @@
 import com.cloud.server.ResourceTag;
 import com.cloud.storage.snapshot.SnapshotPolicy;
 import com.cloud.vm.ConsoleProxy;
+import com.cloud.vm.Nic;
 import com.cloud.vm.NicSecondaryIp;
 import com.cloud.vm.SecondaryStorageVm;
 import org.apache.cloudstack.config.Configuration;
@@ -575,6 +576,8 @@ public class EventTypes {
         entityEventDetails.put(EVENT_FIREWALL_EGRESS_CLOSE, FirewallRule.class);
         entityEventDetails.put(EVENT_FIREWALL_EGRESS_UPDATE, FirewallRule.class);
 
+        // Nic Events
+        entityEventDetails.put(EVENT_NIC_CREATE, Nic.class);
 
         // Load Balancers
         entityEventDetails.put(EVENT_ASSIGN_TO_LOAD_BALANCER_RULE, FirewallRule.class);
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1041,7 +1041,7 @@ public UserVm addNicToVirtualMachine(AddNicToVMCmd cmd) throws InvalidParameterV
         if (guestNic == null) {
             throw new CloudRuntimeException("Unable to add NIC to " + vmInstance);
         }
-
+        CallContext.current().putContextParameter(Nic.class.getName(), guestNic.getUuid());
         s_logger.debug("Successful addition of " + network + " from " + vmInstance);
         return _vmDao.findById(vmInstance.getId());
     }

Original file line number	Diff line number	Diff line change
`@@ -1041,7 +1041,7 @@ public UserVm addNicToVirtualMachine(AddNicToVMCmd cmd) throws InvalidParameterV`
`1041`	`1041`	`if (guestNic == null) {`
`1042`	`1042`	`throw new CloudRuntimeException("Unable to add NIC to " + vmInstance);`
`1043`	`1043`	`}`
`1044`		`-`
	`1044`	`+ CallContext.current().putContextParameter(Nic.class.getName(), guestNic.getUuid());`
`1045`	`1045`	`s_logger.debug("Successful addition of " + network + " from " + vmInstance);`
`1046`	`1046`	`return _vmDao.findById(vmInstance.getId());`
`1047`	`1047`	`}`