etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7153: addNicToVirtualMachine not BaseAsyncCreate but creates an entity

This commit is contained in:
Damodar 2014-07-22 14:42:44 +05:30 committed by Kishan Kavala
parent d3af2dbeca
commit c43b56998a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/com/cloud/event/EventTypes.java
View File

@ -31,6 +31,7 @@ import com.cloud.network.Site2SiteVpnConnection;
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);

2
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1041,7 +1041,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
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());
}