apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 6176: Included domR name in networkUsage command

Browse Source 
status 6176: resolved fixed
This commit is contained in:
kishan 2010-09-27 16:26:56 +05:30
parent 26fc22160c
commit 6e4fa7fcd1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/cloud/agent/api/NetworkUsageCommand.java
View File

@ -20,20 +20,26 @@ package com.cloud.agent.api;
public class NetworkUsageCommand extends Command { public class NetworkUsageCommand extends Command {
private String privateIP; private String privateIP;
private String domRName;
protected NetworkUsageCommand() { protected NetworkUsageCommand() {
} }
public NetworkUsageCommand(String privateIP) public NetworkUsageCommand(String privateIP, String domRName)
{ {
this.privateIP = privateIP; this.privateIP = privateIP;
this.domRName = domRName;
} }
public String getPrivateIP() { public String getPrivateIP() {
return privateIP; return privateIP;
} }
public String getDomRName() {
return domRName;
}
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */

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

@ -2559,7 +2559,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager
for (DomainRouterVO router : routers) { for (DomainRouterVO router : routers) {
String privateIP = router.getPrivateIpAddress(); String privateIP = router.getPrivateIpAddress();
if(privateIP != null){ if(privateIP != null){
final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP); final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getName());
final NetworkUsageAnswer answer = (NetworkUsageAnswer)_agentMgr.easySend(router.getHostId(), usageCmd); final NetworkUsageAnswer answer = (NetworkUsageAnswer)_agentMgr.easySend(router.getHostId(), usageCmd);
if(answer != null){ if(answer != null){
Transaction txn = Transaction.open(Transaction.CLOUD_DB); Transaction txn = Transaction.open(Transaction.CLOUD_DB);