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

Renamed IPAssoc to IpAssoc to be consistent with agent commands

Browse Source
This commit is contained in:
Alex Huang 2011-06-21 09:25:29 -07:00
parent 22d5eac400
commit a254e90ab3
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
View File

@ -135,7 +135,7 @@ import com.cloud.agent.api.check.CheckSshCommand;
import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand;
import com.cloud.agent.api.proxy.ConsoleProxyLoadAnswer;
import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand;
import com.cloud.agent.api.routing.IPAssocCommand;
import com.cloud.agent.api.routing.IpAssocCommand;
import com.cloud.agent.api.routing.IpAssocAnswer;
import com.cloud.agent.api.routing.NetworkElementCommand;
import com.cloud.agent.api.storage.CreateAnswer;
@ -882,8 +882,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return execute((FenceCommand) cmd);
} else if (cmd instanceof StartCommand ) {
return execute((StartCommand) cmd);
} else if (cmd instanceof IPAssocCommand) {
return execute((IPAssocCommand)cmd);
} else if (cmd instanceof IpAssocCommand) {
return execute((IpAssocCommand)cmd);
}else if (cmd instanceof NetworkElementCommand) {
return _virtRouterResource.executeRequest(cmd);
} else if (cmd instanceof CheckSshCommand) {
@ -1031,7 +1031,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
vm.attachDevice(nic.toString());
}
public Answer execute(IPAssocCommand cmd) {
public Answer execute(IpAssocCommand cmd) {
String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
String[] results = new String[cmd.getIpAddresses().length];

2
api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
View File

@ -33,7 +33,7 @@ public class IpAssocAnswer extends Answer{
super();
}
public IpAssocAnswer(IPAssocCommand cmd, String[] results) {
public IpAssocAnswer(IpAssocCommand cmd, String[] results) {
boolean finalResult = true;
for (String result : results) {

6
api/src/com/cloud/agent/api/routing/IPAssocCommand.java → api/src/com/cloud/agent/api/routing/IpAssocCommand.java
View File

@ -24,14 +24,14 @@ import com.cloud.agent.api.to.IpAddressTO;
* @author alena
*
*/
public class IPAssocCommand extends NetworkElementCommand {
public class IpAssocCommand extends NetworkElementCommand {
IpAddressTO[] ipAddresses;
protected IPAssocCommand() {
protected IpAssocCommand() {
}
public IPAssocCommand(IpAddressTO[] ips) {
public IpAssocCommand(IpAddressTO[] ips) {
this.ipAddresses = ips;
}

8
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -45,7 +45,7 @@ import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand;
import com.cloud.agent.api.proxy.ConsoleProxyLoadAnswer;
import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand;
import com.cloud.agent.api.routing.DhcpEntryCommand;
import com.cloud.agent.api.routing.IPAssocCommand;
import com.cloud.agent.api.routing.IpAssocCommand;
import com.cloud.agent.api.routing.IpAssocAnswer;
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
import com.cloud.agent.api.routing.NetworkElementCommand;
@ -104,8 +104,8 @@ public class VirtualRoutingResource implements Manager {
return execute((SetStaticNatRulesCommand)cmd);
}else if (cmd instanceof LoadBalancerConfigCommand) {
return execute((LoadBalancerConfigCommand)cmd);
} else if (cmd instanceof IPAssocCommand) {
return execute((IPAssocCommand)cmd);
} else if (cmd instanceof IpAssocCommand) {
return execute((IpAssocCommand)cmd);
} else if (cmd instanceof CheckConsoleProxyLoadCommand) {
return execute((CheckConsoleProxyLoadCommand)cmd);
} else if(cmd instanceof WatchConsoleProxyLoadCommand) {
@ -266,7 +266,7 @@ public class VirtualRoutingResource implements Manager {
return new Answer(cmd);
}
protected Answer execute(final IPAssocCommand cmd) {
protected Answer execute(final IpAssocCommand cmd) {
IpAddressTO[] ips = cmd.getIpAddresses();
String[] results = new String[cmd.getIpAddresses().length];
int i = 0;

8
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -131,7 +131,7 @@ import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand;
import com.cloud.agent.api.proxy.ConsoleProxyLoadAnswer;
import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand;
import com.cloud.agent.api.routing.DhcpEntryCommand;
import com.cloud.agent.api.routing.IPAssocCommand;
import com.cloud.agent.api.routing.IpAssocCommand;
import com.cloud.agent.api.routing.IpAssocAnswer;
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
import com.cloud.agent.api.routing.NetworkElementCommand;
@ -384,8 +384,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
return execute((SetStaticNatRulesCommand) cmd);
} else if (clazz == LoadBalancerConfigCommand.class) {
return execute((LoadBalancerConfigCommand) cmd);
} else if (clazz == IPAssocCommand.class) {
return execute((IPAssocCommand) cmd);
} else if (clazz == IpAssocCommand.class) {
return execute((IpAssocCommand) cmd);
} else if (clazz == CheckConsoleProxyLoadCommand.class) {
return execute((CheckConsoleProxyLoadCommand) cmd);
} else if (clazz == WatchConsoleProxyLoadCommand.class) {
@ -1547,7 +1547,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
return null;
}
protected Answer execute(final IPAssocCommand cmd) {
protected Answer execute(final IpAssocCommand cmd) {
Connection conn = getConnection();
String[] results = new String[cmd.getIpAddresses().length];
int i = 0;

4
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -43,7 +43,7 @@ import com.cloud.agent.api.StopAnswer;
import com.cloud.agent.api.check.CheckSshAnswer;
import com.cloud.agent.api.check.CheckSshCommand;
import com.cloud.agent.api.routing.DhcpEntryCommand;
import com.cloud.agent.api.routing.IPAssocCommand;
import com.cloud.agent.api.routing.IpAssocCommand;
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
import com.cloud.agent.api.routing.NetworkElementCommand;
import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand;
@ -1505,7 +1505,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
ipsToSend[i++] = ip;
firstIP = false;
}
IPAssocCommand cmd = new IPAssocCommand(ipsToSend);
IpAssocCommand cmd = new IpAssocCommand(ipsToSend);
cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, router.getPrivateIpAddress());
cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, router.getGuestIpAddress());
cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());