simulator: formatting changes

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-01-09 15:11:05 +05:30
parent 077f47193d
commit b18c03a006

View File

@ -16,27 +16,12 @@
// under the License. // under the License.
package com.cloud.agent.manager; package com.cloud.agent.manager;
import java.util.HashMap;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import com.cloud.agent.api.*; import com.cloud.agent.api.*;
import com.cloud.agent.api.storage.*;
import org.apache.log4j.Logger;
import com.cloud.agent.api.check.CheckSshCommand; import com.cloud.agent.api.check.CheckSshCommand;
import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand; import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand;
import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand; import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand;
import com.cloud.agent.api.routing.DhcpEntryCommand; import com.cloud.agent.api.routing.*;
import com.cloud.agent.api.routing.IpAssocCommand; import com.cloud.agent.api.storage.*;
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
import com.cloud.agent.api.routing.SavePasswordCommand;
import com.cloud.agent.api.routing.SetFirewallRulesCommand;
import com.cloud.agent.api.routing.SetPortForwardingRulesCommand;
import com.cloud.agent.api.routing.SetStaticNatRulesCommand;
import com.cloud.agent.api.routing.VmDataCommand;
import com.cloud.simulator.MockConfigurationVO; import com.cloud.simulator.MockConfigurationVO;
import com.cloud.simulator.MockHost; import com.cloud.simulator.MockHost;
import com.cloud.simulator.MockVMVO; import com.cloud.simulator.MockVMVO;
@ -49,6 +34,12 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction; import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VirtualMachine.State;
import org.apache.log4j.Logger;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import java.util.HashMap;
import java.util.Map;
@Local(value = { SimulatorManager.class }) @Local(value = { SimulatorManager.class })
public class SimulatorManagerImpl implements SimulatorManager { public class SimulatorManagerImpl implements SimulatorManager {
@ -112,14 +103,12 @@ public class SimulatorManagerImpl implements SimulatorManager {
@Override @Override
public Answer simulate(Command cmd, String hostGuid) { public Answer simulate(Command cmd, String hostGuid) {
Transaction txn = Transaction.open(Transaction.SIMULATOR_DB); Transaction txn = Transaction.open(Transaction.SIMULATOR_DB);
// txn.transitToUserManagedConnection(_concierge.conn());
try { try {
MockHost host = _mockHost.findByGuid(hostGuid); MockHost host = _mockHost.findByGuid(hostGuid);
String cmdName = cmd.toString(); String cmdName = cmd.toString();
int index = cmdName.lastIndexOf("."); int index = cmdName.lastIndexOf(".");
if (index != -1) { if (index != -1) {
cmdName = cmdName.substring(index + 1); cmdName = cmdName.substring(index + 1);
} }
MockConfigurationVO config = _mockConfigDao.findByNameBottomUP(host.getDataCenterId(), host.getPodId(), host.getClusterId(), host.getId(), cmdName); MockConfigurationVO config = _mockConfigDao.findByNameBottomUP(host.getDataCenterId(), host.getPodId(), host.getClusterId(), host.getId(), cmdName);
@ -129,24 +118,24 @@ public class SimulatorManagerImpl implements SimulatorManager {
if (config != null) { if (config != null) {
Map<String, String> configParameters = config.getParameters(); Map<String, String> configParameters = config.getParameters();
for (Map.Entry<String, String> entry : configParameters.entrySet()) { for (Map.Entry<String, String> entry : configParameters.entrySet()) {
if (entry.getKey().equalsIgnoreCase("enabled")) { if (entry.getKey().equalsIgnoreCase("enabled")) {
info.setEnabled(Boolean.parseBoolean(entry.getValue())); info.setEnabled(Boolean.parseBoolean(entry.getValue()));
} else if (entry.getKey().equalsIgnoreCase("timeout")) { } else if (entry.getKey().equalsIgnoreCase("timeout")) {
try { try {
info.setTimeout(Integer.valueOf(entry.getValue())); info.setTimeout(Integer.valueOf(entry.getValue()));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
s_logger.debug("invalid timeout parameter: " + e.toString()); s_logger.debug("invalid timeout parameter: " + e.toString());
} }
} else if (entry.getKey().equalsIgnoreCase("wait")) { } else if (entry.getKey().equalsIgnoreCase("wait")) {
try { try {
int wait = Integer.valueOf(entry.getValue()); int wait = Integer.valueOf(entry.getValue());
Thread.sleep(wait * 1000); Thread.sleep(wait);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
s_logger.debug("invalid timeout parameter: " + e.toString()); s_logger.debug("invalid timeout parameter: " + e.toString());
} catch (InterruptedException e) { } catch (InterruptedException e) {
s_logger.debug("thread is interrupted: " + e.toString()); s_logger.debug("thread is interrupted: " + e.toString());
} }
} }
} }
} }