apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 12746: During network offering update log usage events to reflect the change in network ofeering usage

Browse Source 
Status 12746: resolved fixed
Reviewed-By: Nitin
This commit is contained in:
kishan 2012-01-02 18:16:03 +05:30
parent 4f9cbdaadb
commit 294ad89c38
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -3502,7 +3502,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
} }
} }
@Override @Override @DB
@ActionEvent(eventType = EventTypes.EVENT_NETWORK_UPDATE, eventDescription = "updating network", async = true) @ActionEvent(eventType = EventTypes.EVENT_NETWORK_UPDATE, eventDescription = "updating network", async = true)
public Network updateGuestNetwork(long networkId, String name, String displayText, Account callerAccount, User callerUser, String domainSuffix, Long networkOfferingId) { public Network updateGuestNetwork(long networkId, String name, String displayText, Account callerAccount, User callerUser, String domainSuffix, Long networkOfferingId) {
boolean restartNetwork = false; boolean restartNetwork = false;
@ -3544,6 +3544,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
throw new InvalidParameterValueException("NetworkOffering and domain suffix upgrade can be perfomed for Isolated networks only"); throw new InvalidParameterValueException("NetworkOffering and domain suffix upgrade can be perfomed for Isolated networks only");
} }
boolean networkOfferingChanged = false;
long oldNetworkOfferingId = network.getNetworkOfferingId(); long oldNetworkOfferingId = network.getNetworkOfferingId();
if (networkOfferingId != null) { if (networkOfferingId != null) {
@ -3566,6 +3568,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
throw new InvalidParameterValueException("Can't upgrade from network offering " + oldNetworkOfferingId + " to " + networkOfferingId + "; check logs for more information"); throw new InvalidParameterValueException("Can't upgrade from network offering " + oldNetworkOfferingId + " to " + networkOfferingId + "; check logs for more information");
} }
restartNetwork = true; restartNetwork = true;
networkOfferingChanged = true;
} }
} }
@ -3619,8 +3622,33 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
} }
if (networkOfferingId != null) { if (networkOfferingId != null) {
network.setNetworkOfferingId(networkOfferingId); if(networkOfferingChanged){
_networksDao.update(networkId, network, finalizeServicesAndProvidersForNetwork(_configMgr.getNetworkOffering(networkOfferingId), network.getPhysicalNetworkId())); Transaction txn = Transaction.currentTxn();
txn.start();
network.setNetworkOfferingId(networkOfferingId);
_networksDao.update(networkId, network, finalizeServicesAndProvidersForNetwork(_configMgr.getNetworkOffering(networkOfferingId), network.getPhysicalNetworkId()));
//get all nics using this network
//log remove usage events for old offering
//log assign usage events for new offering
List<NicVO> nics = _nicDao.listByNetworkId(networkId);
for(NicVO nic : nics){
long vmId = nic.getInstanceId();
VMInstanceVO vm = _vmDao.findById(vmId);
if(vm == null){
s_logger.error("Vm for nic "+nic.getId()+" not found with Vm Id:"+vmId);
continue;
}
long isDefault = (nic.isDefaultNic()) ? 1 : 0;
UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vm.getAccountId(), vm.getDataCenterIdToDeployIn(), vm.getId(), null, oldNetworkOfferingId, null, 0L);
_usageEventDao.persist(usageEvent);
usageEvent = new UsageEventVO(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, vm.getAccountId(), vm.getDataCenterIdToDeployIn(), vm.getId(), vm.getHostName(), networkOfferingId, null, isDefault);
_usageEventDao.persist(usageEvent);
}
txn.commit();
} else {
network.setNetworkOfferingId(networkOfferingId);
_networksDao.update(networkId, network, finalizeServicesAndProvidersForNetwork(_configMgr.getNetworkOffering(networkOfferingId), network.getPhysicalNetworkId()));
}
} else { } else {
_networksDao.update(networkId, network); _networksDao.update(networkId, network);
} }