diff --git a/agent/.classpath b/agent/.classpath
index f36c50ee1f6..f2bd7d7bc6e 100644
--- a/agent/.classpath
+++ b/agent/.classpath
@@ -12,5 +12,6 @@
+
diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
index e5319d555d8..8598b9fa29b 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
@@ -53,6 +53,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.apache.xmlrpc.XmlRpcException;
import org.libvirt.Connect;
import org.libvirt.Domain;
import org.libvirt.DomainInfo;
@@ -78,6 +79,7 @@ import com.cloud.agent.api.CheckHealthCommand;
import com.cloud.agent.api.CheckStateCommand;
import com.cloud.agent.api.CheckVirtualMachineAnswer;
import com.cloud.agent.api.CheckVirtualMachineCommand;
+import com.cloud.agent.api.CleanupNetworkRulesCmd;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.CreatePrivateTemplateFromSnapshotCommand;
import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand;
@@ -104,16 +106,17 @@ import com.cloud.agent.api.ManageSnapshotAnswer;
import com.cloud.agent.api.ManageSnapshotCommand;
import com.cloud.agent.api.MigrateAnswer;
import com.cloud.agent.api.MigrateCommand;
-import com.cloud.agent.api.MirrorCommand;
import com.cloud.agent.api.ModifySshKeysCommand;
import com.cloud.agent.api.ModifyStoragePoolAnswer;
import com.cloud.agent.api.ModifyStoragePoolCommand;
+import com.cloud.agent.api.NetworkRulesSystemVmCommand;
import com.cloud.agent.api.NetworkUsageAnswer;
import com.cloud.agent.api.NetworkUsageCommand;
import com.cloud.agent.api.PingCommand;
import com.cloud.agent.api.PingRoutingCommand;
import com.cloud.agent.api.PingRoutingWithNwGroupsCommand;
import com.cloud.agent.api.PingTestCommand;
+import com.cloud.agent.api.PrepareForMigrationAnswer;
import com.cloud.agent.api.PrepareForMigrationCommand;
import com.cloud.agent.api.ReadyAnswer;
import com.cloud.agent.api.ReadyCommand;
@@ -165,8 +168,9 @@ import com.cloud.agent.resource.virtualnetwork.VirtualRoutingResource;
import com.cloud.exception.InternalErrorException;
import com.cloud.host.Host.Type;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.NetworkEnums.RouterPrivateIpStrategy;
import com.cloud.network.Networks.BroadcastDomainType;
+import com.cloud.network.Networks.RouterPrivateIpStrategy;
+import com.cloud.network.Networks.IsolationType;
import com.cloud.network.Networks.TrafficType;
import com.cloud.resource.ServerResource;
import com.cloud.resource.ServerResourceBase;
@@ -798,8 +802,6 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return execute((GetHostStatsCommand)cmd);
} else if (cmd instanceof CheckStateCommand) {
return executeRequest(cmd);
- } else if (cmd instanceof MirrorCommand) {
- return executeRequest(cmd);
} else if (cmd instanceof CheckHealthCommand) {
return execute((CheckHealthCommand)cmd);
} else if (cmd instanceof PrepareForMigrationCommand) {
@@ -866,6 +868,10 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return execute((CheckSshCommand) cmd);
} else if (cmd instanceof NetworkUsageCommand) {
return execute((NetworkUsageCommand) cmd);
+ } else if (cmd instanceof NetworkRulesSystemVmCommand) {
+ return execute((NetworkRulesSystemVmCommand)cmd);
+ } else if (cmd instanceof CleanupNetworkRulesCmd) {
+ return execute((CleanupNetworkRulesCmd)cmd);
} else {
s_logger.warn("Unsupported command ");
return Answer.createUnsupportedCommandAnswer(cmd);
@@ -887,7 +893,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
KVMHABase.NfsStoragePool sp = new KVMHABase.NfsStoragePool(cmd.getPool().getUuid(),
- cmd.getPool().getHostAddress(),
+ cmd.getPool().getHost(),
cmd.getPool().getPath(),
_mountPoint + File.separator + cmd.getPool().getUuid(),
PoolType.PrimaryStorage);
@@ -1083,7 +1089,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
String result = command.execute();
if (result != null) {
s_logger.debug("Failed to backup snaptshot: " + result);
- return new BackupSnapshotAnswer(cmd, false, result, null);
+ return new BackupSnapshotAnswer(cmd, false, result, null, true);
}
/*Delete the snapshot on primary*/
@@ -1119,15 +1125,15 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
result = command.execute();
if (result != null) {
s_logger.debug("Failed to backup snapshot: " + result);
- return new BackupSnapshotAnswer(cmd, false, "Failed to backup snapshot: " + result, null);
+ return new BackupSnapshotAnswer(cmd, false, "Failed to backup snapshot: " + result, null, true);
}
}
} catch (LibvirtException e) {
- return new BackupSnapshotAnswer(cmd, false, e.toString(), null);
+ return new BackupSnapshotAnswer(cmd, false, e.toString(), null, true);
} catch (URISyntaxException e) {
- return new BackupSnapshotAnswer(cmd, false, e.toString(), null);
+ return new BackupSnapshotAnswer(cmd, false, e.toString(), null, true);
}
- return new BackupSnapshotAnswer(cmd, true, null, snapshotDestPath + File.separator + snapshotName);
+ return new BackupSnapshotAnswer(cmd, true, null, snapshotDestPath + File.separator + snapshotName, true);
}
protected DeleteSnapshotBackupAnswer execute(final DeleteSnapshotBackupCommand cmd) {
@@ -1571,6 +1577,11 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
}
+ private Answer execute(CleanupNetworkRulesCmd cmd) {
+ boolean result = cleanup_rules();
+ return new Answer(cmd, result, "");
+ }
+
protected GetVncPortAnswer execute(GetVncPortCommand cmd) {
try {
Connect conn = LibvirtConnection.getConnection();
@@ -1725,6 +1736,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
_vms.put(cmd.getVmName(), State.Running);
}
}
+
return new CheckVirtualMachineAnswer(cmd, state, vncPort);
} catch (LibvirtException e) {
return new CheckVirtualMachineAnswer(cmd, e.getMessage());
@@ -1816,26 +1828,44 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
private synchronized Answer execute(PrepareForMigrationCommand cmd) {
-// final String vmName = cmd.getVmName();
-// String result = null;
-//
-// if (cmd.getVnet() != null && !isDirectAttachedNetwork(cmd.getVnet())) {
-// final String vnet = getVnetId(cmd.getVnet());
-// if (vnet != null) {
-// try {
-// createVnet(vnet, _pifs.first()); /*TODO: Need to add public network for domR*/
-// } catch (InternalErrorException e) {
-// return new PrepareForMigrationAnswer(cmd, false, result);
-// }
-// }
-// }
-//
-// synchronized(_vms) {
-// _vms.put(vmName, State.Migrating);
-// }
-//
-// return new PrepareForMigrationAnswer(cmd, result == null, result);
- return null;
+
+ VirtualMachineTO vm = cmd.getVirtualMachine();
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Preparing host for migrating " + vm);
+ }
+
+ NicTO[] nics = vm.getNics();
+ try {
+ Connect conn = LibvirtConnection.getConnection();
+ for (NicTO nic : nics) {
+ String vlanId = null;
+ if (nic.getBroadcastType() == BroadcastDomainType.Vlan) {
+ URI broadcastUri = nic.getBroadcastUri();
+ vlanId = broadcastUri.getHost();
+ }
+ if (nic.getType() == TrafficType.Guest) {
+ if (nic.getBroadcastType() == BroadcastDomainType.Vlan && !vlanId.equalsIgnoreCase("untagged")){
+ createVlanBr(vlanId, _pifs.first());
+ }
+ } else if (nic.getType() == TrafficType.Control) {
+ /*Make sure the network is still there*/
+ createControlNetwork(conn);
+ } else if (nic.getType() == TrafficType.Public) {
+ if (nic.getBroadcastType() == BroadcastDomainType.Vlan && !vlanId.equalsIgnoreCase("untagged")) {
+ createVlanBr(vlanId, _pifs.second());
+ }
+ }
+ }
+ synchronized (_vms) {
+ _vms.put(vm.getName(), State.Migrating);
+ }
+
+ return new PrepareForMigrationAnswer(cmd);
+ } catch (LibvirtException e) {
+ return new PrepareForMigrationAnswer(cmd, e.toString());
+ } catch (InternalErrorException e) {
+ return new PrepareForMigrationAnswer(cmd, e.toString());
+ }
}
public void createVnet(String vnetId, String pif) throws InternalErrorException {
@@ -2207,7 +2237,12 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
if (vmSpec.getType() != VirtualMachine.Type.User) {
default_network_rules_for_systemvm(vmName);
} else {
- default_network_rules(vmName, vmSpec.getNics()[0].getIp(), vmSpec.getId(), vmSpec.getNics()[0].getMac());
+ NicTO[] nics = vmSpec.getNics();
+ for (NicTO nic : nics) {
+ if (nic.getIsolationUri() != null && nic.getIsolationUri().getScheme().equalsIgnoreCase(IsolationType.Ec2.toString())) {
+ default_network_rules(vmName, vmSpec.getNics()[0].getIp(), vmSpec.getId(), vmSpec.getNics()[0].getMac());
+ }
+ }
}
// Attach each data volume to the VM, if there is a deferred attached disk
@@ -2220,8 +2255,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return new StartAnswer(cmd);
} catch (Exception e) {
s_logger.warn("Exception ", e);
- if (conn != null)
- handleVmStartFailure(conn, vmName, vm);
+ if (conn != null) {
+ handleVmStartFailure(conn, vmName, vm);
+ }
return new StartAnswer(cmd, e.getMessage());
} finally {
synchronized (_vms) {
@@ -3472,6 +3508,19 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return true;
}
+ private boolean cleanup_rules() {
+ if (!_can_bridge_firewall) {
+ return false;
+ }
+ Script cmd = new Script(_securityGroupPath, _timeout, s_logger);
+ cmd.add("cleanup_rules");
+ String result = cmd.execute();
+ if (result != null) {
+ return false;
+ }
+ return true;
+ }
+
private String get_rule_logs_for_vms() {
Script cmd = new Script(_securityGroupPath, _timeout, s_logger);
cmd.add("get_rule_logs_for_vms");
@@ -3575,4 +3624,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
return storage;
}
+
+ private Answer execute(NetworkRulesSystemVmCommand cmd) {
+ boolean success = false;
+ if (cmd.getType() != VirtualMachine.Type.User) {
+ success = default_network_rules_for_systemvm(cmd.getVmName());
+ }
+
+ return new Answer(cmd, success, "");
+ }
}
diff --git a/api/.classpath b/api/.classpath
index e52580d102b..dc73036afd7 100644
--- a/api/.classpath
+++ b/api/.classpath
@@ -5,5 +5,6 @@
+
diff --git a/core/src/com/cloud/agent/api/AgentControlAnswer.java b/api/src/com/cloud/agent/api/AgentControlAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/AgentControlAnswer.java
rename to api/src/com/cloud/agent/api/AgentControlAnswer.java
diff --git a/core/src/com/cloud/agent/api/AgentControlCommand.java b/api/src/com/cloud/agent/api/AgentControlCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/AgentControlCommand.java
rename to api/src/com/cloud/agent/api/AgentControlCommand.java
diff --git a/core/src/com/cloud/agent/api/AttachIsoCommand.java b/api/src/com/cloud/agent/api/AttachIsoCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/AttachIsoCommand.java
rename to api/src/com/cloud/agent/api/AttachIsoCommand.java
diff --git a/core/src/com/cloud/agent/api/AttachVolumeAnswer.java b/api/src/com/cloud/agent/api/AttachVolumeAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/AttachVolumeAnswer.java
rename to api/src/com/cloud/agent/api/AttachVolumeAnswer.java
diff --git a/core/src/com/cloud/agent/api/AttachVolumeCommand.java b/api/src/com/cloud/agent/api/AttachVolumeCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/AttachVolumeCommand.java
rename to api/src/com/cloud/agent/api/AttachVolumeCommand.java
diff --git a/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java b/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java
similarity index 87%
rename from core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
rename to api/src/com/cloud/agent/api/BackupSnapshotAnswer.java
index 93b5fe78520..807ce0d3851 100644
--- a/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
+++ b/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java
@@ -20,14 +20,16 @@ package com.cloud.agent.api;
public class BackupSnapshotAnswer extends Answer {
private String backupSnapshotName;
+ private boolean full;
protected BackupSnapshotAnswer() {
}
- public BackupSnapshotAnswer(BackupSnapshotCommand cmd, boolean success, String result, String backupSnapshotName) {
+ public BackupSnapshotAnswer(BackupSnapshotCommand cmd, boolean success, String result, String backupSnapshotName, boolean full) {
super(cmd, success, result);
this.backupSnapshotName = backupSnapshotName;
+ this.full = full;
}
/**
@@ -36,4 +38,8 @@ public class BackupSnapshotAnswer extends Answer {
public String getBackupSnapshotName() {
return backupSnapshotName;
}
+
+ public boolean isFull() {
+ return full;
+ }
}
diff --git a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java b/api/src/com/cloud/agent/api/BackupSnapshotCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/BackupSnapshotCommand.java
rename to api/src/com/cloud/agent/api/BackupSnapshotCommand.java
diff --git a/core/src/com/cloud/agent/api/CancelCommand.java b/api/src/com/cloud/agent/api/CancelCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CancelCommand.java
rename to api/src/com/cloud/agent/api/CancelCommand.java
diff --git a/core/src/com/cloud/agent/api/ChangeAgentAnswer.java b/api/src/com/cloud/agent/api/ChangeAgentAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ChangeAgentAnswer.java
rename to api/src/com/cloud/agent/api/ChangeAgentAnswer.java
diff --git a/core/src/com/cloud/agent/api/ChangeAgentCommand.java b/api/src/com/cloud/agent/api/ChangeAgentCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ChangeAgentCommand.java
rename to api/src/com/cloud/agent/api/ChangeAgentCommand.java
diff --git a/core/src/com/cloud/agent/api/CheckHealthAnswer.java b/api/src/com/cloud/agent/api/CheckHealthAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckHealthAnswer.java
rename to api/src/com/cloud/agent/api/CheckHealthAnswer.java
diff --git a/core/src/com/cloud/agent/api/CheckHealthCommand.java b/api/src/com/cloud/agent/api/CheckHealthCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckHealthCommand.java
rename to api/src/com/cloud/agent/api/CheckHealthCommand.java
diff --git a/core/src/com/cloud/agent/api/CheckOnHostAnswer.java b/api/src/com/cloud/agent/api/CheckOnHostAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckOnHostAnswer.java
rename to api/src/com/cloud/agent/api/CheckOnHostAnswer.java
diff --git a/core/src/com/cloud/agent/api/CheckOnHostCommand.java b/api/src/com/cloud/agent/api/CheckOnHostCommand.java
similarity index 93%
rename from core/src/com/cloud/agent/api/CheckOnHostCommand.java
rename to api/src/com/cloud/agent/api/CheckOnHostCommand.java
index 38f808713ba..2bbb564acd4 100644
--- a/core/src/com/cloud/agent/api/CheckOnHostCommand.java
+++ b/api/src/com/cloud/agent/api/CheckOnHostCommand.java
@@ -18,7 +18,7 @@
package com.cloud.agent.api;
import com.cloud.agent.api.to.HostTO;
-import com.cloud.host.HostVO;
+import com.cloud.host.Host;
public class CheckOnHostCommand extends Command {
HostTO host;
@@ -27,7 +27,7 @@ public class CheckOnHostCommand extends Command {
}
- public CheckOnHostCommand(HostVO host) {
+ public CheckOnHostCommand(Host host) {
this.host = new HostTO(host);
}
diff --git a/core/src/com/cloud/agent/api/CheckStateAnswer.java b/api/src/com/cloud/agent/api/CheckStateAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckStateAnswer.java
rename to api/src/com/cloud/agent/api/CheckStateAnswer.java
diff --git a/core/src/com/cloud/agent/api/CheckStateCommand.java b/api/src/com/cloud/agent/api/CheckStateCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckStateCommand.java
rename to api/src/com/cloud/agent/api/CheckStateCommand.java
diff --git a/core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java b/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
rename to api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
diff --git a/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java b/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
rename to api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
diff --git a/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java b/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
rename to api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
diff --git a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java b/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
rename to api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
diff --git a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java b/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
rename to api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
diff --git a/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java b/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
rename to api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java b/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
rename to api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java b/api/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
rename to api/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java b/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
rename to api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java b/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
rename to api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
diff --git a/core/src/com/cloud/agent/api/CronCommand.java b/api/src/com/cloud/agent/api/CronCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CronCommand.java
rename to api/src/com/cloud/agent/api/CronCommand.java
diff --git a/core/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java b/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java
rename to api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java
diff --git a/core/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java b/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java
rename to api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java
diff --git a/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java b/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
rename to api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
diff --git a/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java b/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
similarity index 70%
rename from core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
rename to api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
index 5f16b454bbb..98972e2be31 100644
--- a/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
+++ b/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
@@ -21,34 +21,34 @@ package com.cloud.agent.api;
import java.io.File;
import java.util.UUID;
-import com.cloud.storage.StoragePoolVO;
+import com.cloud.agent.api.to.StorageFilerTO;
+import com.cloud.storage.StoragePool;
public class DeleteStoragePoolCommand extends Command {
- StoragePoolVO pool;
+ StorageFilerTO pool;
public static final String LOCAL_PATH_PREFIX="/mnt/";
String localPath;
-
public DeleteStoragePoolCommand() {
}
- public DeleteStoragePoolCommand(StoragePoolVO pool, String localPath) {
- this.pool = new StoragePoolVO(pool);
+ public DeleteStoragePoolCommand(StoragePool pool, String localPath) {
+ this.pool = new StorageFilerTO(pool);
this.localPath = localPath;
}
- public DeleteStoragePoolCommand(StoragePoolVO pool) {
- this(new StoragePoolVO(pool), LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
+ public DeleteStoragePoolCommand(StoragePool pool) {
+ this(pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
}
- public StoragePoolVO getPool() {
+ public StorageFilerTO getPool() {
return pool;
}
- public void setPool(StoragePoolVO pool) {
- this.pool = new StoragePoolVO(pool);
+ public void setPool(StoragePool pool) {
+ this.pool = new StorageFilerTO(pool);
}
@Override
diff --git a/core/src/com/cloud/agent/api/FenceAnswer.java b/api/src/com/cloud/agent/api/FenceAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/FenceAnswer.java
rename to api/src/com/cloud/agent/api/FenceAnswer.java
diff --git a/core/src/com/cloud/agent/api/FenceCommand.java b/api/src/com/cloud/agent/api/FenceCommand.java
similarity index 92%
rename from core/src/com/cloud/agent/api/FenceCommand.java
rename to api/src/com/cloud/agent/api/FenceCommand.java
index 3b47909ce87..ffbc01e51aa 100644
--- a/core/src/com/cloud/agent/api/FenceCommand.java
+++ b/api/src/com/cloud/agent/api/FenceCommand.java
@@ -17,8 +17,8 @@
*/
package com.cloud.agent.api;
-import com.cloud.host.HostVO;
-import com.cloud.vm.VMInstanceVO;
+import com.cloud.host.Host;
+import com.cloud.vm.VirtualMachine;
public class FenceCommand extends Command {
@@ -30,7 +30,7 @@ public class FenceCommand extends Command {
String hostGuid;
String hostIp;
- public FenceCommand(VMInstanceVO vm, HostVO host) {
+ public FenceCommand(VirtualMachine vm, Host host) {
super();
vmName = vm.getInstanceName();
hostGuid = host.getGuid();
diff --git a/core/src/com/cloud/agent/api/GetFileStatsAnswer.java b/api/src/com/cloud/agent/api/GetFileStatsAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/GetFileStatsAnswer.java
rename to api/src/com/cloud/agent/api/GetFileStatsAnswer.java
diff --git a/core/src/com/cloud/agent/api/GetFileStatsCommand.java b/api/src/com/cloud/agent/api/GetFileStatsCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/GetFileStatsCommand.java
rename to api/src/com/cloud/agent/api/GetFileStatsCommand.java
diff --git a/core/src/com/cloud/agent/api/GetHostStatsAnswer.java b/api/src/com/cloud/agent/api/GetHostStatsAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/GetHostStatsAnswer.java
rename to api/src/com/cloud/agent/api/GetHostStatsAnswer.java
diff --git a/core/src/com/cloud/agent/api/GetHostStatsCommand.java b/api/src/com/cloud/agent/api/GetHostStatsCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/GetHostStatsCommand.java
rename to api/src/com/cloud/agent/api/GetHostStatsCommand.java
diff --git a/core/src/com/cloud/agent/api/GetStorageStatsAnswer.java b/api/src/com/cloud/agent/api/GetStorageStatsAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/GetStorageStatsAnswer.java
rename to api/src/com/cloud/agent/api/GetStorageStatsAnswer.java
diff --git a/core/src/com/cloud/agent/api/GetStorageStatsCommand.java b/api/src/com/cloud/agent/api/GetStorageStatsCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/GetStorageStatsCommand.java
rename to api/src/com/cloud/agent/api/GetStorageStatsCommand.java
diff --git a/core/src/com/cloud/agent/api/GetVmStatsAnswer.java b/api/src/com/cloud/agent/api/GetVmStatsAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/GetVmStatsAnswer.java
rename to api/src/com/cloud/agent/api/GetVmStatsAnswer.java
diff --git a/core/src/com/cloud/agent/api/GetVmStatsCommand.java b/api/src/com/cloud/agent/api/GetVmStatsCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/GetVmStatsCommand.java
rename to api/src/com/cloud/agent/api/GetVmStatsCommand.java
diff --git a/core/src/com/cloud/agent/api/GetVncPortAnswer.java b/api/src/com/cloud/agent/api/GetVncPortAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/GetVncPortAnswer.java
rename to api/src/com/cloud/agent/api/GetVncPortAnswer.java
diff --git a/core/src/com/cloud/agent/api/GetVncPortCommand.java b/api/src/com/cloud/agent/api/GetVncPortCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/GetVncPortCommand.java
rename to api/src/com/cloud/agent/api/GetVncPortCommand.java
diff --git a/core/src/com/cloud/agent/api/HostStatsEntry.java b/api/src/com/cloud/agent/api/HostStatsEntry.java
similarity index 100%
rename from core/src/com/cloud/agent/api/HostStatsEntry.java
rename to api/src/com/cloud/agent/api/HostStatsEntry.java
diff --git a/core/src/com/cloud/agent/api/MaintainAnswer.java b/api/src/com/cloud/agent/api/MaintainAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/MaintainAnswer.java
rename to api/src/com/cloud/agent/api/MaintainAnswer.java
diff --git a/core/src/com/cloud/agent/api/MaintainCommand.java b/api/src/com/cloud/agent/api/MaintainCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/MaintainCommand.java
rename to api/src/com/cloud/agent/api/MaintainCommand.java
diff --git a/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java b/api/src/com/cloud/agent/api/ManageSnapshotAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ManageSnapshotAnswer.java
rename to api/src/com/cloud/agent/api/ManageSnapshotAnswer.java
diff --git a/core/src/com/cloud/agent/api/ManageSnapshotCommand.java b/api/src/com/cloud/agent/api/ManageSnapshotCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ManageSnapshotCommand.java
rename to api/src/com/cloud/agent/api/ManageSnapshotCommand.java
diff --git a/core/src/com/cloud/agent/api/MigrateAnswer.java b/api/src/com/cloud/agent/api/MigrateAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/MigrateAnswer.java
rename to api/src/com/cloud/agent/api/MigrateAnswer.java
diff --git a/core/src/com/cloud/agent/api/MigrateCommand.java b/api/src/com/cloud/agent/api/MigrateCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/MigrateCommand.java
rename to api/src/com/cloud/agent/api/MigrateCommand.java
diff --git a/core/src/com/cloud/agent/api/ModifySshKeysCommand.java b/api/src/com/cloud/agent/api/ModifySshKeysCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ModifySshKeysCommand.java
rename to api/src/com/cloud/agent/api/ModifySshKeysCommand.java
diff --git a/core/src/com/cloud/agent/api/NetworkUsageAnswer.java b/api/src/com/cloud/agent/api/NetworkUsageAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/NetworkUsageAnswer.java
rename to api/src/com/cloud/agent/api/NetworkUsageAnswer.java
diff --git a/core/src/com/cloud/agent/api/NetworkUsageCommand.java b/api/src/com/cloud/agent/api/NetworkUsageCommand.java
similarity index 82%
rename from core/src/com/cloud/agent/api/NetworkUsageCommand.java
rename to api/src/com/cloud/agent/api/NetworkUsageCommand.java
index 5ecf9741959..43472fe4383 100644
--- a/core/src/com/cloud/agent/api/NetworkUsageCommand.java
+++ b/api/src/com/cloud/agent/api/NetworkUsageCommand.java
@@ -21,6 +21,7 @@ package com.cloud.agent.api;
public class NetworkUsageCommand extends Command {
private String privateIP;
private String domRName;
+ private String option;
protected NetworkUsageCommand() {
@@ -31,6 +32,13 @@ public class NetworkUsageCommand extends Command {
this.privateIP = privateIP;
this.domRName = domRName;
}
+
+ public NetworkUsageCommand(String privateIP, String domRName, String option)
+ {
+ this.privateIP = privateIP;
+ this.domRName = domRName;
+ this.option = option;
+ }
public String getPrivateIP() {
return privateIP;
@@ -40,6 +48,10 @@ public class NetworkUsageCommand extends Command {
return domRName;
}
+ public String getOption() {
+ return option;
+ }
+
/**
* {@inheritDoc}
*/
diff --git a/core/src/com/cloud/agent/api/PingAnswer.java b/api/src/com/cloud/agent/api/PingAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/PingAnswer.java
rename to api/src/com/cloud/agent/api/PingAnswer.java
diff --git a/core/src/com/cloud/agent/api/PingCommand.java b/api/src/com/cloud/agent/api/PingCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/PingCommand.java
rename to api/src/com/cloud/agent/api/PingCommand.java
diff --git a/core/src/com/cloud/agent/api/PingRoutingCommand.java b/api/src/com/cloud/agent/api/PingRoutingCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/PingRoutingCommand.java
rename to api/src/com/cloud/agent/api/PingRoutingCommand.java
diff --git a/api/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java b/api/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java
new file mode 100644
index 00000000000..06a4de581b7
--- /dev/null
+++ b/api/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (C) 2010 Cloud.com. All rights reserved.
+ *
+ * This software is licensed under the GNU General Public License v3 or later.
+ *
+ * It is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later
+version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+package com.cloud.agent.api;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.cloud.host.Host;
+import com.cloud.utils.Pair;
+import com.cloud.vm.VirtualMachine.State;
+
+
+public class PingRoutingWithNwGroupsCommand extends PingRoutingCommand {
+ HashMap> newGroupStates;
+
+ protected PingRoutingWithNwGroupsCommand() {
+ super();
+ }
+
+ public PingRoutingWithNwGroupsCommand(Host.Type type, long id, Map states, HashMap> nwGrpStates) {
+ super(type, id, states);
+ newGroupStates = nwGrpStates;
+ }
+
+ public HashMap> getNewGroupStates() {
+ return newGroupStates;
+ }
+
+ public void setNewGroupStates(HashMap> newGroupStates) {
+ this.newGroupStates = newGroupStates;
+ }
+}
diff --git a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java b/api/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
rename to api/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
diff --git a/core/src/com/cloud/agent/api/PingStorageCommand.java b/api/src/com/cloud/agent/api/PingStorageCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/PingStorageCommand.java
rename to api/src/com/cloud/agent/api/PingStorageCommand.java
diff --git a/core/src/com/cloud/agent/api/PingTestCommand.java b/api/src/com/cloud/agent/api/PingTestCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/PingTestCommand.java
rename to api/src/com/cloud/agent/api/PingTestCommand.java
diff --git a/core/src/com/cloud/agent/api/PoolEjectCommand.java b/api/src/com/cloud/agent/api/PoolEjectCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/PoolEjectCommand.java
rename to api/src/com/cloud/agent/api/PoolEjectCommand.java
diff --git a/core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java b/api/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
rename to api/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
diff --git a/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java b/api/src/com/cloud/agent/api/PrepareForMigrationCommand.java
similarity index 81%
rename from core/src/com/cloud/agent/api/PrepareForMigrationCommand.java
rename to api/src/com/cloud/agent/api/PrepareForMigrationCommand.java
index c9d7e87fcb1..f73b75c752f 100644
--- a/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java
+++ b/api/src/com/cloud/agent/api/PrepareForMigrationCommand.java
@@ -17,10 +17,7 @@
*/
package com.cloud.agent.api;
-import java.util.List;
-
import com.cloud.agent.api.to.VirtualMachineTO;
-import com.cloud.storage.VolumeVO;
public class PrepareForMigrationCommand extends StartCommand {
@@ -31,10 +28,6 @@ public class PrepareForMigrationCommand extends StartCommand {
super(vm);
}
- public PrepareForMigrationCommand(String vmName, String vnet, String[] storageHosts, List vols, boolean mirrored) {
- //super(vmName, storageHosts, vols, mirrored);
- }
-
@Override
public boolean executeInSequence() {
return true;
diff --git a/core/src/com/cloud/agent/api/ReadyAnswer.java b/api/src/com/cloud/agent/api/ReadyAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ReadyAnswer.java
rename to api/src/com/cloud/agent/api/ReadyAnswer.java
diff --git a/core/src/com/cloud/agent/api/ReadyCommand.java b/api/src/com/cloud/agent/api/ReadyCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ReadyCommand.java
rename to api/src/com/cloud/agent/api/ReadyCommand.java
diff --git a/core/src/com/cloud/agent/api/RebootAnswer.java b/api/src/com/cloud/agent/api/RebootAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/RebootAnswer.java
rename to api/src/com/cloud/agent/api/RebootAnswer.java
diff --git a/core/src/com/cloud/agent/api/RebootCommand.java b/api/src/com/cloud/agent/api/RebootCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/RebootCommand.java
rename to api/src/com/cloud/agent/api/RebootCommand.java
diff --git a/core/src/com/cloud/agent/api/RebootRouterCommand.java b/api/src/com/cloud/agent/api/RebootRouterCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/RebootRouterCommand.java
rename to api/src/com/cloud/agent/api/RebootRouterCommand.java
diff --git a/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java b/api/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
similarity index 50%
rename from core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
rename to api/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
index a27cbfa95ab..1b2f7b3e84b 100644
--- a/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
+++ b/api/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
@@ -18,74 +18,17 @@
package com.cloud.agent.api;
-import java.lang.reflect.Type;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.log4j.Logger;
-import com.cloud.agent.transport.Request;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
import com.google.gson.annotations.Expose;
-import com.google.gson.reflect.TypeToken;
public class SecStorageFirewallCfgCommand extends Command {
private static final Logger s_logger = Logger.getLogger(SecStorageFirewallCfgCommand.class);
- public static class PortConfigListTypeAdaptor implements JsonDeserializer>, JsonSerializer> {
- static final GsonBuilder s_gBuilder;
- static {
- s_gBuilder = Request.initBuilder();
- }
-
- static final Type listType = new TypeToken>() {}.getType();
-
- public PortConfigListTypeAdaptor() {
- }
-
- public JsonElement serialize(List src, Type typeOfSrc, JsonSerializationContext context) {
- if (src.size() == 0) {
- s_logger.info("Returning JsonNull");
- return new JsonNull();
- }
- Gson json = s_gBuilder.create();
- s_logger.debug("Returning gson tree");
- JsonArray array = new JsonArray();
- for (PortConfig pc : src) {
- array.add(json.toJsonTree(pc));
- }
-
- return array;
- }
-
- public List deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
- throws JsonParseException {
- if (json.isJsonNull()) {
- return new ArrayList();
- }
- Gson jsonp = s_gBuilder.create();
- List pcs = new ArrayList();
- JsonArray array = json.getAsJsonArray();
- Iterator it = array.iterator();
- while (it.hasNext()) {
- JsonElement element = it.next();
- pcs.add(jsonp.fromJson(element, PortConfig.class));
- }
- return pcs;
- }
-
- }
public static class PortConfig {
@Expose boolean add;
@Expose String sourceIp;
diff --git a/core/src/com/cloud/agent/api/SecStorageSetupCommand.java b/api/src/com/cloud/agent/api/SecStorageSetupCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/SecStorageSetupCommand.java
rename to api/src/com/cloud/agent/api/SecStorageSetupCommand.java
diff --git a/core/src/com/cloud/agent/api/SecurityIngressRuleAnswer.java b/api/src/com/cloud/agent/api/SecurityIngressRuleAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/SecurityIngressRuleAnswer.java
rename to api/src/com/cloud/agent/api/SecurityIngressRuleAnswer.java
diff --git a/core/src/com/cloud/agent/api/SecurityIngressRulesCmd.java b/api/src/com/cloud/agent/api/SecurityIngressRulesCmd.java
similarity index 100%
rename from core/src/com/cloud/agent/api/SecurityIngressRulesCmd.java
rename to api/src/com/cloud/agent/api/SecurityIngressRulesCmd.java
diff --git a/core/src/com/cloud/agent/api/SetupAnswer.java b/api/src/com/cloud/agent/api/SetupAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/SetupAnswer.java
rename to api/src/com/cloud/agent/api/SetupAnswer.java
diff --git a/core/src/com/cloud/agent/api/SetupCommand.java b/api/src/com/cloud/agent/api/SetupCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/SetupCommand.java
rename to api/src/com/cloud/agent/api/SetupCommand.java
diff --git a/core/src/com/cloud/agent/api/ShutdownCommand.java b/api/src/com/cloud/agent/api/ShutdownCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ShutdownCommand.java
rename to api/src/com/cloud/agent/api/ShutdownCommand.java
diff --git a/core/src/com/cloud/agent/api/SnapshotCommand.java b/api/src/com/cloud/agent/api/SnapshotCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/SnapshotCommand.java
rename to api/src/com/cloud/agent/api/SnapshotCommand.java
diff --git a/core/src/com/cloud/agent/api/StartAnswer.java b/api/src/com/cloud/agent/api/StartAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/StartAnswer.java
rename to api/src/com/cloud/agent/api/StartAnswer.java
diff --git a/core/src/com/cloud/agent/api/StartupAnswer.java b/api/src/com/cloud/agent/api/StartupAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/StartupAnswer.java
rename to api/src/com/cloud/agent/api/StartupAnswer.java
diff --git a/core/src/com/cloud/agent/api/StartupCommand.java b/api/src/com/cloud/agent/api/StartupCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/StartupCommand.java
rename to api/src/com/cloud/agent/api/StartupCommand.java
diff --git a/core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java b/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
rename to api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
diff --git a/core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java b/api/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java
rename to api/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java
diff --git a/core/src/com/cloud/agent/api/StartupProxyCommand.java b/api/src/com/cloud/agent/api/StartupProxyCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/StartupProxyCommand.java
rename to api/src/com/cloud/agent/api/StartupProxyCommand.java
diff --git a/core/src/com/cloud/agent/api/StartupRoutingCommand.java b/api/src/com/cloud/agent/api/StartupRoutingCommand.java
similarity index 98%
rename from core/src/com/cloud/agent/api/StartupRoutingCommand.java
rename to api/src/com/cloud/agent/api/StartupRoutingCommand.java
index f55bad47a01..390a4787431 100755
--- a/core/src/com/cloud/agent/api/StartupRoutingCommand.java
+++ b/api/src/com/cloud/agent/api/StartupRoutingCommand.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.NetworkEnums.RouterPrivateIpStrategy;
+import com.cloud.network.Networks.RouterPrivateIpStrategy;
import com.cloud.vm.VirtualMachine.State;
public class StartupRoutingCommand extends StartupCommand {
diff --git a/core/src/com/cloud/agent/api/StartupStorageCommand.java b/api/src/com/cloud/agent/api/StartupStorageCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/StartupStorageCommand.java
rename to api/src/com/cloud/agent/api/StartupStorageCommand.java
diff --git a/core/src/com/cloud/agent/api/StopAnswer.java b/api/src/com/cloud/agent/api/StopAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/StopAnswer.java
rename to api/src/com/cloud/agent/api/StopAnswer.java
diff --git a/core/src/com/cloud/agent/api/StopCommand.java b/api/src/com/cloud/agent/api/StopCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/StopCommand.java
rename to api/src/com/cloud/agent/api/StopCommand.java
diff --git a/core/src/com/cloud/agent/api/UpgradeAnswer.java b/api/src/com/cloud/agent/api/UpgradeAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/UpgradeAnswer.java
rename to api/src/com/cloud/agent/api/UpgradeAnswer.java
diff --git a/core/src/com/cloud/agent/api/UpgradeCommand.java b/api/src/com/cloud/agent/api/UpgradeCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/UpgradeCommand.java
rename to api/src/com/cloud/agent/api/UpgradeCommand.java
diff --git a/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java b/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
rename to api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
diff --git a/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java b/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ValidateSnapshotCommand.java
rename to api/src/com/cloud/agent/api/ValidateSnapshotCommand.java
diff --git a/core/src/com/cloud/agent/api/VmStatsEntry.java b/api/src/com/cloud/agent/api/VmStatsEntry.java
similarity index 100%
rename from core/src/com/cloud/agent/api/VmStatsEntry.java
rename to api/src/com/cloud/agent/api/VmStatsEntry.java
diff --git a/core/src/com/cloud/agent/api/check/CheckSshAnswer.java b/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/check/CheckSshAnswer.java
rename to api/src/com/cloud/agent/api/check/CheckSshAnswer.java
diff --git a/core/src/com/cloud/agent/api/check/CheckSshCommand.java b/api/src/com/cloud/agent/api/check/CheckSshCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/check/CheckSshCommand.java
rename to api/src/com/cloud/agent/api/check/CheckSshCommand.java
diff --git a/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java b/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
rename to api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
diff --git a/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java b/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
rename to api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
diff --git a/core/src/com/cloud/agent/api/proxy/ProxyCommand.java b/api/src/com/cloud/agent/api/proxy/ProxyCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/proxy/ProxyCommand.java
rename to api/src/com/cloud/agent/api/proxy/ProxyCommand.java
diff --git a/core/src/com/cloud/agent/api/proxy/UpdateCertificateCommand.java b/api/src/com/cloud/agent/api/proxy/UpdateCertificateCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/proxy/UpdateCertificateCommand.java
rename to api/src/com/cloud/agent/api/proxy/UpdateCertificateCommand.java
diff --git a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
rename to api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
diff --git a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
index e1078227cec..a672fdb4100 100644
--- a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
+++ b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
@@ -26,10 +26,14 @@ import com.cloud.agent.api.to.LoadBalancerTO;
public class LoadBalancerConfigCommand extends NetworkElementCommand {
LoadBalancerTO[] loadBalancers;
+ protected LoadBalancerConfigCommand() {
+
+ }
+
public LoadBalancerConfigCommand( LoadBalancerTO[] loadBalancers) {
this.loadBalancers = loadBalancers;
}
-
+
public LoadBalancerTO[] getLoadBalancers() {
return loadBalancers;
diff --git a/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java b/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
rename to api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
diff --git a/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java b/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/routing/SavePasswordCommand.java
rename to api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
diff --git a/core/src/com/cloud/agent/api/routing/UserDataCommand.java b/api/src/com/cloud/agent/api/routing/UserDataCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/routing/UserDataCommand.java
rename to api/src/com/cloud/agent/api/routing/UserDataCommand.java
diff --git a/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java b/api/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
rename to api/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java b/api/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
rename to api/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java b/api/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
rename to api/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java b/api/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
rename to api/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java b/api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
similarity index 87%
rename from core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
rename to api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
index 152bd1563e0..3e367230795 100644
--- a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
+++ b/api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
@@ -19,13 +19,14 @@
package com.cloud.agent.api.storage;
import com.cloud.agent.api.Command;
-import com.cloud.storage.StoragePoolVO;
+import com.cloud.agent.api.to.StorageFilerTO;
+import com.cloud.storage.StoragePool;
public class CopyVolumeCommand extends Command {
long volumeId;
String volumePath;
- StoragePoolVO pool;
+ StorageFilerTO pool;
String secondaryStorageURL;
boolean toSecondaryStorage;
String vmName;
@@ -33,10 +34,10 @@ public class CopyVolumeCommand extends Command {
public CopyVolumeCommand() {
}
- public CopyVolumeCommand(long volumeId, String volumePath, StoragePoolVO pool, String secondaryStorageURL, boolean toSecondaryStorage) {
+ public CopyVolumeCommand(long volumeId, String volumePath, StoragePool pool, String secondaryStorageURL, boolean toSecondaryStorage) {
this.volumeId = volumeId;
this.volumePath = volumePath;
- this.pool = pool;
+ this.pool = new StorageFilerTO(pool);
this.secondaryStorageURL = secondaryStorageURL;
this.toSecondaryStorage = toSecondaryStorage;
}
@@ -54,7 +55,7 @@ public class CopyVolumeCommand extends Command {
return volumeId;
}
- public StoragePoolVO getPool() {
+ public StorageFilerTO getPool() {
return pool;
}
diff --git a/core/src/com/cloud/agent/api/storage/CreateAnswer.java b/api/src/com/cloud/agent/api/storage/CreateAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/CreateAnswer.java
rename to api/src/com/cloud/agent/api/storage/CreateAnswer.java
diff --git a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java b/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
rename to api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
diff --git a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java b/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
rename to api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java b/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
rename to api/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java b/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
rename to api/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java b/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java
rename to api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java
diff --git a/core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java b/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
rename to api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java b/api/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java
similarity index 96%
rename from core/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java
rename to api/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java
index f65b07d755f..5d09d3dd9d8 100644
--- a/core/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java
+++ b/api/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java
@@ -19,7 +19,6 @@
package com.cloud.agent.api.storage;
import com.cloud.agent.api.Command;
-import com.cloud.storage.StoragePoolVO;
public class DeleteTemplateCommand extends Command {
diff --git a/core/src/com/cloud/agent/api/storage/DestroyAnswer.java b/api/src/com/cloud/agent/api/storage/DestroyAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/DestroyAnswer.java
rename to api/src/com/cloud/agent/api/storage/DestroyAnswer.java
diff --git a/core/src/com/cloud/agent/api/storage/DestroyCommand.java b/api/src/com/cloud/agent/api/storage/DestroyCommand.java
similarity index 85%
rename from core/src/com/cloud/agent/api/storage/DestroyCommand.java
rename to api/src/com/cloud/agent/api/storage/DestroyCommand.java
index 6a624e983c2..c5e3de08b85 100755
--- a/core/src/com/cloud/agent/api/storage/DestroyCommand.java
+++ b/api/src/com/cloud/agent/api/storage/DestroyCommand.java
@@ -19,9 +19,9 @@ package com.cloud.agent.api.storage;
import com.cloud.agent.api.to.VolumeTO;
import com.cloud.storage.Storage;
-import com.cloud.storage.StoragePoolVO;
-import com.cloud.storage.VMTemplateStoragePoolVO;
-import com.cloud.storage.VolumeVO;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.VMTemplateStorageResourceAssoc;
+import com.cloud.storage.Volume;
public class DestroyCommand extends StorageCommand {
// in VMware, things are designed around VM instead of volume, we need it the volume VM context if the volume is attached
@@ -31,12 +31,12 @@ public class DestroyCommand extends StorageCommand {
protected DestroyCommand() {
}
- public DestroyCommand(StoragePoolVO pool, VolumeVO volume, String vmName) {
+ public DestroyCommand(StoragePool pool, Volume volume, String vmName) {
this.volume = new VolumeTO(volume, pool);
this.vmName = vmName;
}
- public DestroyCommand(StoragePoolVO pool, VMTemplateStoragePoolVO templatePoolRef) {
+ public DestroyCommand(StoragePool pool, VMTemplateStorageResourceAssoc templatePoolRef) {
volume = new VolumeTO(templatePoolRef.getId(), null, Storage.StorageResourceType.STORAGE_POOL, pool.getPoolType(),
pool.getUuid(), null, pool.getPath(),
templatePoolRef.getInstallPath(), templatePoolRef.getTemplateSize(), null);
diff --git a/core/src/com/cloud/agent/api/storage/DownloadAnswer.java b/api/src/com/cloud/agent/api/storage/DownloadAnswer.java
similarity index 91%
rename from core/src/com/cloud/agent/api/storage/DownloadAnswer.java
rename to api/src/com/cloud/agent/api/storage/DownloadAnswer.java
index 6fc8599374d..5b361944f39 100644
--- a/core/src/com/cloud/agent/api/storage/DownloadAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/DownloadAnswer.java
@@ -21,14 +21,14 @@ import java.io.File;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
-import com.cloud.storage.VMTemplateHostVO;
+import com.cloud.storage.VMTemplateStorageResourceAssoc;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
public class DownloadAnswer extends Answer {
private String jobId;
private int downloadPct;
private String errorString;
- private VMTemplateHostVO.Status downloadStatus;
+ private VMTemplateStorageResourceAssoc.Status downloadStatus;
private String downloadPath;
private String installPath;
private long templateSize = 0L;
@@ -45,7 +45,7 @@ public class DownloadAnswer extends Answer {
return downloadStatus.toString();
}
- public VMTemplateHostVO.Status getDownloadStatus() {
+ public VMTemplateStorageResourceAssoc.Status getDownloadStatus() {
return downloadStatus;
}
@@ -94,8 +94,9 @@ public class DownloadAnswer extends Answer {
}
private static String fixPath(String path){
- if (path == null)
- return path;
+ if (path == null) {
+ return path;
+ }
if (path.startsWith(File.separator)) {
path=path.substring(File.separator.length());
}
@@ -105,7 +106,7 @@ public class DownloadAnswer extends Answer {
return path;
}
- public void setDownloadStatus(VMTemplateHostVO.Status downloadStatus) {
+ public void setDownloadStatus(VMTemplateStorageResourceAssoc.Status downloadStatus) {
this.downloadStatus = downloadStatus;
}
diff --git a/core/src/com/cloud/agent/api/storage/DownloadCommand.java b/api/src/com/cloud/agent/api/storage/DownloadCommand.java
similarity index 94%
rename from core/src/com/cloud/agent/api/storage/DownloadCommand.java
rename to api/src/com/cloud/agent/api/storage/DownloadCommand.java
index ea5c37806f0..700eb0e40a4 100644
--- a/core/src/com/cloud/agent/api/storage/DownloadCommand.java
+++ b/api/src/com/cloud/agent/api/storage/DownloadCommand.java
@@ -17,8 +17,8 @@
*/
package com.cloud.agent.api.storage;
-import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.template.VirtualMachineTemplate;
/**
@@ -64,9 +64,9 @@ public class DownloadCommand extends AbstractDownloadCommand {
this.maxDownloadSizeInBytes = that.getMaxDownloadSizeInBytes();
}
- public DownloadCommand(VMTemplateVO template, Long maxDownloadSizeInBytes) {
+ public DownloadCommand(VirtualMachineTemplate template, Long maxDownloadSizeInBytes) {
super(template.getUniqueName(), template.getUrl(), template.getFormat(), template.getAccountId());
- this.hvm = template.requiresHvm();
+ this.hvm = template.isRequiresHvm();
this.checksum = template.getChecksum();
this.id = template.getId();
this.description = template.getDisplayText();
diff --git a/core/src/com/cloud/agent/api/storage/DownloadProgressCommand.java b/api/src/com/cloud/agent/api/storage/DownloadProgressCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/DownloadProgressCommand.java
rename to api/src/com/cloud/agent/api/storage/DownloadProgressCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java b/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
rename to api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
diff --git a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java b/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
rename to api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java b/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
rename to api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
diff --git a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java b/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
rename to api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/StorageCommand.java b/api/src/com/cloud/agent/api/storage/StorageCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/StorageCommand.java
rename to api/src/com/cloud/agent/api/storage/StorageCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java b/api/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java
rename to api/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java
diff --git a/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java b/api/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java
rename to api/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java
diff --git a/core/src/com/cloud/agent/api/storage/UploadAnswer.java b/api/src/com/cloud/agent/api/storage/UploadAnswer.java
similarity index 83%
rename from core/src/com/cloud/agent/api/storage/UploadAnswer.java
rename to api/src/com/cloud/agent/api/storage/UploadAnswer.java
index b878bf7ca6b..d122218fcda 100755
--- a/core/src/com/cloud/agent/api/storage/UploadAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/UploadAnswer.java
@@ -4,7 +4,7 @@ import java.io.File;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
-import com.cloud.storage.UploadVO;
+import com.cloud.storage.Upload;
public class UploadAnswer extends Answer {
@@ -12,7 +12,7 @@ public class UploadAnswer extends Answer {
private String jobId;
private int uploadPct;
private String errorString;
- private UploadVO.Status uploadStatus;
+ private Upload.Status uploadStatus;
private String uploadPath;
private String installPath;
public Long templateSize = 0L;
@@ -28,7 +28,7 @@ public class UploadAnswer extends Answer {
return uploadStatus.toString();
}
- public UploadVO.Status getUploadStatus() {
+ public Upload.Status getUploadStatus() {
return uploadStatus;
}
@@ -50,7 +50,7 @@ public class UploadAnswer extends Answer {
}
public UploadAnswer(String jobId, int uploadPct, String errorString,
- UploadVO.Status uploadStatus, String fileSystemPath, String installPath, long templateSize) {
+ Upload.Status uploadStatus, String fileSystemPath, String installPath, long templateSize) {
super();
this.jobId = jobId;
this.uploadPct = uploadPct;
@@ -62,7 +62,7 @@ public class UploadAnswer extends Answer {
}
public UploadAnswer(String jobId, int uploadPct, Command command,
- UploadVO.Status uploadStatus, String fileSystemPath, String installPath) {
+ Upload.Status uploadStatus, String fileSystemPath, String installPath) {
super(command);
this.jobId = jobId;
this.uploadPct = uploadPct;
@@ -72,8 +72,9 @@ public class UploadAnswer extends Answer {
}
private static String fixPath(String path){
- if (path == null)
- return path;
+ if (path == null) {
+ return path;
+ }
if (path.startsWith(File.separator)) {
path=path.substring(File.separator.length());
}
@@ -83,7 +84,7 @@ public class UploadAnswer extends Answer {
return path;
}
- public void setUploadStatus(UploadVO.Status uploadStatus) {
+ public void setUploadStatus(Upload.Status uploadStatus) {
this.uploadStatus = uploadStatus;
}
diff --git a/core/src/com/cloud/agent/api/storage/UploadCommand.java b/api/src/com/cloud/agent/api/storage/UploadCommand.java
similarity index 78%
rename from core/src/com/cloud/agent/api/storage/UploadCommand.java
rename to api/src/com/cloud/agent/api/storage/UploadCommand.java
index a3f0695694b..6b50bba308b 100644
--- a/core/src/com/cloud/agent/api/storage/UploadCommand.java
+++ b/api/src/com/cloud/agent/api/storage/UploadCommand.java
@@ -1,15 +1,14 @@
package com.cloud.agent.api.storage;
-import com.cloud.storage.VMTemplateHostVO;
-import com.cloud.storage.Upload.Type;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.agent.api.storage.AbstractUploadCommand;
import com.cloud.agent.api.storage.DownloadCommand.PasswordAuth;
+import com.cloud.agent.api.to.TemplateTO;
+import com.cloud.storage.Upload.Type;
+import com.cloud.template.VirtualMachineTemplate;
public class UploadCommand extends AbstractUploadCommand {
- private VMTemplateVO template;
+ private TemplateTO template;
private String url;
private String installPath;
private boolean hvm;
@@ -20,14 +19,14 @@ public class UploadCommand extends AbstractUploadCommand {
private long id;
private Type type;
- public UploadCommand(VMTemplateVO template, String url, VMTemplateHostVO vmTemplateHost) {
+ public UploadCommand(VirtualMachineTemplate template, String url, String installPath, long sizeInBytes) {
- this.template = template;
+ this.template = new TemplateTO(template);
this.url = url;
- this.installPath = vmTemplateHost.getInstallPath();
+ this.installPath = installPath;
this.checksum = template.getChecksum();
this.id = template.getId();
- this.templateSizeInBytes = vmTemplateHost.getSize();
+ this.templateSizeInBytes = sizeInBytes;
}
@@ -56,19 +55,21 @@ public class UploadCommand extends AbstractUploadCommand {
}
- public VMTemplateVO getTemplate() {
+ public TemplateTO getTemplate() {
return template;
}
- public void setTemplate(VMTemplateVO template) {
+ public void setTemplate(TemplateTO template) {
this.template = template;
}
- public String getUrl() {
+ @Override
+ public String getUrl() {
return url;
}
- public void setUrl(String url) {
+ @Override
+ public void setUrl(String url) {
this.url = url;
}
diff --git a/core/src/com/cloud/agent/api/storage/UploadProgressCommand.java b/api/src/com/cloud/agent/api/storage/UploadProgressCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/storage/UploadProgressCommand.java
rename to api/src/com/cloud/agent/api/storage/UploadProgressCommand.java
diff --git a/core/src/com/cloud/agent/api/to/HostTO.java b/api/src/com/cloud/agent/api/to/HostTO.java
similarity index 97%
rename from core/src/com/cloud/agent/api/to/HostTO.java
rename to api/src/com/cloud/agent/api/to/HostTO.java
index 91cfa65437e..bb80215666d 100644
--- a/core/src/com/cloud/agent/api/to/HostTO.java
+++ b/api/src/com/cloud/agent/api/to/HostTO.java
@@ -17,7 +17,7 @@
*/
package com.cloud.agent.api.to;
-import com.cloud.host.HostVO;
+import com.cloud.host.Host;
public class HostTO {
private String guid;
@@ -29,7 +29,7 @@ public class HostTO {
protected HostTO() {
}
- public HostTO(HostVO vo) {
+ public HostTO(Host vo) {
guid = vo.getGuid();
privateNetwork = new NetworkTO(vo.getPrivateIpAddress(), vo.getPrivateNetmask(), vo.getPrivateMacAddress());
if (vo.getPublicIpAddress() != null) {
diff --git a/api/src/com/cloud/agent/api/to/IpAddressTO.java b/api/src/com/cloud/agent/api/to/IpAddressTO.java
index d85998e4941..799a1658f69 100644
--- a/api/src/com/cloud/agent/api/to/IpAddressTO.java
+++ b/api/src/com/cloud/agent/api/to/IpAddressTO.java
@@ -13,9 +13,10 @@ public class IpAddressTO {
private String vlanNetmask;
private String vifMacAddress;
private String guestIp;
+ private Integer networkRate;
- public IpAddressTO(String ipAddress, boolean add, boolean firstIP, boolean sourceNat, String vlanId, String vlanGateway, String vlanNetmask, String vifMacAddress, String guestIp) {
+ public IpAddressTO(String ipAddress, boolean add, boolean firstIP, boolean sourceNat, String vlanId, String vlanGateway, String vlanNetmask, String vifMacAddress, String guestIp, Integer networkRate) {
this.publicIp = ipAddress;
this.add = add;
this.firstIP = firstIP;
@@ -25,6 +26,7 @@ public class IpAddressTO {
this.vlanNetmask = vlanNetmask;
this.vifMacAddress = vifMacAddress;
this.guestIp = guestIp;
+ this.networkRate = networkRate;
}
protected IpAddressTO() {
@@ -73,5 +75,9 @@ public class IpAddressTO {
public String getVifMacAddress() {
return vifMacAddress;
}
+
+ public Integer getNetworkRate() {
+ return networkRate;
+ }
}
diff --git a/api/src/com/cloud/agent/api/to/NicTO.java b/api/src/com/cloud/agent/api/to/NicTO.java
index 95e0de0447e..3b73ca1f0b0 100644
--- a/api/src/com/cloud/agent/api/to/NicTO.java
+++ b/api/src/com/cloud/agent/api/to/NicTO.java
@@ -5,7 +5,7 @@ package com.cloud.agent.api.to;
public class NicTO extends NetworkTO {
int deviceId;
- Integer networkRateMbps;
+ int networkRateMbps;
Integer networkRateMulticastMbps;
boolean defaultNic;
diff --git a/core/src/com/cloud/agent/api/to/TemplateTO.java b/api/src/com/cloud/agent/api/to/TemplateTO.java
similarity index 89%
rename from core/src/com/cloud/agent/api/to/TemplateTO.java
rename to api/src/com/cloud/agent/api/to/TemplateTO.java
index 02372598170..126a7b911e1 100644
--- a/core/src/com/cloud/agent/api/to/TemplateTO.java
+++ b/api/src/com/cloud/agent/api/to/TemplateTO.java
@@ -17,9 +17,8 @@
*/
package com.cloud.agent.api.to;
-import com.cloud.storage.VMTemplateStoragePoolVO;
-import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.template.VirtualMachineTemplate;
public class TemplateTO {
private long id;
@@ -29,7 +28,7 @@ public class TemplateTO {
protected TemplateTO() {
}
- public TemplateTO(VMTemplateVO template, VMTemplateStoragePoolVO storedAt) {
+ public TemplateTO(VirtualMachineTemplate template) {
this.id = template.getId();
this.uniqueName = template.getUniqueName();
this.format = template.getFormat();
diff --git a/api/src/com/cloud/api/ApiConstants.java b/api/src/com/cloud/api/ApiConstants.java
index 7b9f96a1bcf..d2c3fcc80ff 100755
--- a/api/src/com/cloud/api/ApiConstants.java
+++ b/api/src/com/cloud/api/ApiConstants.java
@@ -129,6 +129,7 @@ public class ApiConstants {
public static final String SECRET_KEY = "secretkey";
public static final String SECURITY_GROUP_LIST = "securitygrouplist";
public static final String SECURITY_GROUP_NAME = "securitygroupname";
+ public static final String SECURITY_GROUP_ID = "securitygroupid";
public static final String SENT = "sent";
public static final String SENT_BYTES = "sentbytes";
public static final String SERVICE_OFFERING_ID = "serviceofferingid";
@@ -178,5 +179,6 @@ public class ApiConstants {
public static final String IS_DEFAULT = "isdefault";
public static final String IS_SYSTEM = "issystem";
public static final String AVAILABILITY = "availability";
+ public static final String NETWORKRATE = "networkrate";
}
diff --git a/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java b/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java
index 1dc774b402b..17ff761afb9 100644
--- a/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java
+++ b/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java
@@ -32,6 +32,7 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
+import com.cloud.api.BaseCmd.CommandType;
import com.cloud.api.response.IngressRuleResponse;
import com.cloud.api.response.SecurityGroupResponse;
import com.cloud.event.EventTypes;
@@ -65,8 +66,8 @@ public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd {
@Parameter(name=ApiConstants.ICMP_CODE, type=CommandType.INTEGER, description="error code for this icmp message")
private Integer icmpCode;
- @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, required=true, description="the security group name")
- private String securityGroupName;
+ @Parameter(name=ApiConstants.SECURITY_GROUP_ID, type=CommandType.LONG, required=true, description="The ID of the security group")
+ private Long securityGroupId;
@Parameter(name=ApiConstants.CIDR_LIST, type=CommandType.LIST, collectionType=CommandType.STRING, description="the cidr list associated")
private List cidrList;
@@ -109,8 +110,8 @@ public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd {
return icmpType;
}
- public String getSecurityGroupName() {
- return securityGroupName;
+ public Long getSecurityGroupId() {
+ return securityGroupId;
}
public String getProtocol() {
@@ -192,7 +193,7 @@ public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd {
sb.append("");
}
- return "authorizing ingress to group: " + getSecurityGroupName() + " to " + sb.toString();
+ return "authorizing ingress to group: " + getSecurityGroupId() + " to " + sb.toString();
}
@Override
diff --git a/api/src/com/cloud/api/commands/CreateNetworkOfferingCmd.java b/api/src/com/cloud/api/commands/CreateNetworkOfferingCmd.java
index 2c6822254f5..9e95f07bb1f 100644
--- a/api/src/com/cloud/api/commands/CreateNetworkOfferingCmd.java
+++ b/api/src/com/cloud/api/commands/CreateNetworkOfferingCmd.java
@@ -58,6 +58,9 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
@Parameter(name=ApiConstants.AVAILABILITY, type=CommandType.STRING, description="the availability of network offering. Default value is Required")
private String availability;
+
+ @Parameter(name=ApiConstants.NETWORKRATE, type=CommandType.INTEGER, description="data transfer rate in megabits per second allowed.")
+ private Integer networkRate;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
@@ -91,6 +94,10 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
//Verify availability
return availability == null ? Availability.Required.toString() : availability;
}
+
+ public Integer getNetworkRate() {
+ return networkRate;
+ }
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
diff --git a/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java b/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
index 51fe94a76c0..8501b7c2147 100644
--- a/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
+++ b/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
@@ -31,6 +31,7 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.PortForwardingRule;
+import com.cloud.user.Account;
import com.cloud.user.UserContext;
import com.cloud.utils.net.Ip;
@@ -163,7 +164,13 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements
@Override
public long getEntityOwnerId() {
- return _entityMgr.findById(PortForwardingRule.class, getEntityId()).getAccountId();
+ Account account = UserContext.current().getCaller();
+
+ if (account != null) {
+ return account.getId();
+ }
+
+ return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
}
@Override
diff --git a/api/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java b/api/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java
index d746eace132..66300fa072b 100644
--- a/api/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java
+++ b/api/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java
@@ -29,6 +29,7 @@ import com.cloud.api.response.VlanIpRangeResponse;
import com.cloud.dc.Vlan;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
@Implementation(description="Creates a VLAN IP range.", responseObject=VlanIpRangeResponse.class)
public class CreateVlanIpRangeCmd extends BaseCmd {
@@ -132,7 +133,7 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
}
@Override
- public void execute(){
+ public void execute() throws ResourceUnavailableException{
try {
Vlan result = _configService.createVlanAndPublicIpRange(this);
if (result != null) {
@@ -148,6 +149,6 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
} catch (InsufficientCapacityException ex) {
s_logger.info(ex);
throw new ServerApiException(BaseCmd.INSUFFICIENT_CAPACITY_ERROR, ex.getMessage());
- }
+ }
}
}
diff --git a/api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java b/api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java
index 46ca04a800d..515cabd1b11 100644
--- a/api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java
+++ b/api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java
@@ -7,6 +7,7 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
+import com.cloud.api.BaseCmd.CommandType;
import com.cloud.api.response.SuccessResponse;
import com.cloud.exception.ResourceInUseException;
@@ -25,8 +26,8 @@ public class DeleteSecurityGroupCmd extends BaseCmd {
@Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.LONG, description="the domain ID of account owning the security group")
private Long domainId;
- @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, required=true, description="the security group name")
- private String securityGroupName;
+ @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="The ID of the security group")
+ private Long id;
/////////////////////////////////////////////////////
@@ -41,11 +42,12 @@ public class DeleteSecurityGroupCmd extends BaseCmd {
return domainId;
}
- public String getSecurityGroupName() {
- return securityGroupName;
+ public Long getId() {
+ return id;
}
+
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
diff --git a/api/src/com/cloud/api/commands/DeployVMCmd.java b/api/src/com/cloud/api/commands/DeployVMCmd.java
index c0a7fc2abd3..6f4343f365f 100644
--- a/api/src/com/cloud/api/commands/DeployVMCmd.java
+++ b/api/src/com/cloud/api/commands/DeployVMCmd.java
@@ -215,7 +215,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
@Override
public String getEventType() {
- return EventTypes.EVENT_VM_START;
+ return EventTypes.EVENT_VM_CREATE;
}
@Override
diff --git a/api/src/com/cloud/api/commands/ListAccountsCmd.java b/api/src/com/cloud/api/commands/ListAccountsCmd.java
index 004f62a4952..e8a7ac0b3ec 100644
--- a/api/src/com/cloud/api/commands/ListAccountsCmd.java
+++ b/api/src/com/cloud/api/commands/ListAccountsCmd.java
@@ -26,6 +26,7 @@ import com.cloud.api.ApiConstants;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
+import com.cloud.api.BaseCmd.CommandType;
import com.cloud.api.response.AccountResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.user.Account;
@@ -57,7 +58,9 @@ public class ListAccountsCmd extends BaseListCmd {
@Parameter(name=ApiConstants.STATE, type=CommandType.STRING, description="list accounts by state. Valid states are enabled, disabled, and locked.")
private String state;
-
+ @Parameter(name=ApiConstants.IS_RECURSIVE, type=CommandType.BOOLEAN, description="defaults to false, but if true, lists all accounts from the parent specified by the domain id till leaves.")
+ private Boolean recursive;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -85,6 +88,10 @@ public class ListAccountsCmd extends BaseListCmd {
public String getState() {
return state;
}
+
+ public Boolean isRecursive() {
+ return recursive;
+ }
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
diff --git a/api/src/com/cloud/api/commands/ListHypervisorsCmd.java b/api/src/com/cloud/api/commands/ListHypervisorsCmd.java
index 60fc69bfae0..e017fc2eb66 100644
--- a/api/src/com/cloud/api/commands/ListHypervisorsCmd.java
+++ b/api/src/com/cloud/api/commands/ListHypervisorsCmd.java
@@ -21,8 +21,10 @@ import java.util.ArrayList;
import org.apache.log4j.Logger;
+import com.cloud.api.ApiConstants;
import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
+import com.cloud.api.Parameter;
import com.cloud.api.response.HypervisorResponse;
import com.cloud.api.response.ListResponse;
@@ -36,18 +38,39 @@ public class ListHypervisorsCmd extends BaseCmd {
return s_name;
}
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, description="the zone id for listing hypervisors.")
+ private Long zoneId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getZoneId() {
+ return this.zoneId;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
@Override
public void execute(){
String[] result = _mgr.getHypervisors(this);
ListResponse response = new ListResponse();
ArrayList responses = new ArrayList();
- for (String hypervisor : result) {
- HypervisorResponse hypervisorResponse = new HypervisorResponse();
- hypervisorResponse.setName(hypervisor);
- hypervisorResponse.setObjectName("hypervisor");
- responses.add(hypervisorResponse);
+ if(result != null) {
+ for (String hypervisor : result) {
+ HypervisorResponse hypervisorResponse = new HypervisorResponse();
+ hypervisorResponse.setName(hypervisor);
+ hypervisorResponse.setObjectName("hypervisor");
+ responses.add(hypervisorResponse);
+ }
}
-
response.setResponses(responses);
response.setResponseName(getCommandName());
this.setResponseObject(response);
diff --git a/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java b/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
index 3d0ce6d3c81..bb012859a13 100644
--- a/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
+++ b/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
@@ -42,6 +42,12 @@ public class ListPortForwardingRulesCmd extends BaseListCmd {
@Parameter(name=ApiConstants.IP_ADDRESS, type=CommandType.STRING, description="the IP address of the port forwarding services")
private String ipAddress;
+
+ @Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING, description="account. Must be used with the domainId parameter.")
+ private String accountName;
+
+ @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.LONG, description="the domain ID. If used with the account parameter, lists port forwarding rules for the specified account in this domain.")
+ private Long domainId;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
@@ -50,6 +56,14 @@ public class ListPortForwardingRulesCmd extends BaseListCmd {
public String getIpAddress() {
return ipAddress;
}
+
+ public String getAccountName() {
+ return accountName;
+ }
+
+ public Long getDomainId() {
+ return domainId;
+ }
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
diff --git a/api/src/com/cloud/api/commands/ListSnapshotsCmd.java b/api/src/com/cloud/api/commands/ListSnapshotsCmd.java
index e01f0e7a71b..0e8b4cd048a 100644
--- a/api/src/com/cloud/api/commands/ListSnapshotsCmd.java
+++ b/api/src/com/cloud/api/commands/ListSnapshotsCmd.java
@@ -26,6 +26,7 @@ import com.cloud.api.ApiConstants;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
+import com.cloud.api.BaseCmd.CommandType;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.SnapshotResponse;
import com.cloud.async.AsyncJob;
@@ -62,6 +63,8 @@ public class ListSnapshotsCmd extends BaseListCmd {
@Parameter(name=ApiConstants.VOLUME_ID, type=CommandType.LONG, description="the ID of the disk volume")
private Long volumeId;
+ @Parameter(name=ApiConstants.IS_RECURSIVE, type=CommandType.BOOLEAN, description="defaults to false, but if true, lists all snapshots from the parent specified by the domain id till leaves.")
+ private Boolean recursive;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -94,6 +97,10 @@ public class ListSnapshotsCmd extends BaseListCmd {
return volumeId;
}
+ public Boolean isRecursive() {
+ return recursive;
+
+ }
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
diff --git a/api/src/com/cloud/api/commands/ListVMsCmd.java b/api/src/com/cloud/api/commands/ListVMsCmd.java
index db5f7238e78..d90cf80128c 100644
--- a/api/src/com/cloud/api/commands/ListVMsCmd.java
+++ b/api/src/com/cloud/api/commands/ListVMsCmd.java
@@ -47,6 +47,9 @@ public class ListVMsCmd extends BaseListCmd {
@Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.LONG, description="the domain ID. If used with the account parameter, lists virtual machines for the specified account in this domain.")
private Long domainId;
+ @Parameter(name=ApiConstants.IS_RECURSIVE, type=CommandType.BOOLEAN, description="defaults to false, but if true, lists all vms from the parent specified by the domain id till leaves.")
+ private Boolean recursive;
+
@Parameter(name=ApiConstants.GROUP_ID, type=CommandType.LONG, description="the group ID")
private Long groupId;
@@ -126,6 +129,9 @@ public class ListVMsCmd extends BaseListCmd {
return networkId;
}
+ public Boolean isRecursive() {
+ return recursive;
+ }
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
diff --git a/api/src/com/cloud/api/commands/ListVolumesCmd.java b/api/src/com/cloud/api/commands/ListVolumesCmd.java
index 368aeade8fe..ee4282e2d2f 100755
--- a/api/src/com/cloud/api/commands/ListVolumesCmd.java
+++ b/api/src/com/cloud/api/commands/ListVolumesCmd.java
@@ -26,6 +26,7 @@ import com.cloud.api.ApiConstants;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
+import com.cloud.api.BaseCmd.CommandType;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.VolumeResponse;
import com.cloud.async.AsyncJob;
@@ -68,6 +69,9 @@ public class ListVolumesCmd extends BaseListCmd {
@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, description="the ID of the availability zone")
private Long zoneId;
+ @Parameter(name=ApiConstants.IS_RECURSIVE, type=CommandType.BOOLEAN, description="defaults to false, but if true, lists all volumes from the parent specified by the domain id till leaves.")
+ private Boolean recursive;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -108,6 +112,10 @@ public class ListVolumesCmd extends BaseListCmd {
return zoneId;
}
+ public Boolean isRecursive() {
+ return recursive;
+ }
+
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
diff --git a/api/src/com/cloud/api/commands/RebootVMCmd.java b/api/src/com/cloud/api/commands/RebootVMCmd.java
index f63833f7bec..d88386ceb29 100644
--- a/api/src/com/cloud/api/commands/RebootVMCmd.java
+++ b/api/src/com/cloud/api/commands/RebootVMCmd.java
@@ -28,6 +28,8 @@ import com.cloud.api.ServerApiException;
import com.cloud.api.response.UserVmResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@@ -89,7 +91,7 @@ public class RebootVMCmd extends BaseAsyncCmd {
}
@Override
- public void execute(){
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException{
UserVm result = _userVmService.rebootVirtualMachine(this);
if (result !=null){
UserVmResponse response = _responseGenerator.createUserVmResponse(result);
diff --git a/api/src/com/cloud/api/commands/ResetVMPasswordCmd.java b/api/src/com/cloud/api/commands/ResetVMPasswordCmd.java
index 234156fd7ec..4b62ab30de0 100644
--- a/api/src/com/cloud/api/commands/ResetVMPasswordCmd.java
+++ b/api/src/com/cloud/api/commands/ResetVMPasswordCmd.java
@@ -30,6 +30,8 @@ import com.cloud.api.ServerApiException;
import com.cloud.api.response.UserVmResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@@ -107,7 +109,7 @@ public class ResetVMPasswordCmd extends BaseAsyncCmd {
Random _rand = new Random(System.currentTimeMillis());
@Override
- public void execute(){
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException{
password = Long.toHexString(_rand.nextLong());
UserVm result = _userVmService.resetVMPassword(this, password);
if (result != null){
diff --git a/api/src/com/cloud/api/commands/RestartNetworkCmd.java b/api/src/com/cloud/api/commands/RestartNetworkCmd.java
index b03c5d73ca9..32a91b75afd 100644
--- a/api/src/com/cloud/api/commands/RestartNetworkCmd.java
+++ b/api/src/com/cloud/api/commands/RestartNetworkCmd.java
@@ -44,20 +44,14 @@ public class RestartNetworkCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=true, description="the ID of the availability zone you want to acquire an public IP address from")
- private Long zoneId;
- @Parameter(name=ApiConstants.NETWORK_ID, type=CommandType.LONG, description="The network this ip address should be associated to.")
- private Long networkId;
+ @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="The network this ip address should be associated to.")
+ private Long id;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
-
- public long getZoneId() {
- return zoneId;
- }
public String getEventDescription() {
return "Restarting network: " + getNetworkId();
@@ -68,13 +62,13 @@ public class RestartNetworkCmd extends BaseAsyncCmd {
}
public long getEntityOwnerId() {
- return _networkService.getNetwork(networkId).getAccountId();
+ return _networkService.getNetwork(id).getAccountId();
}
public Long getNetworkId() {
- Network network = _networkService.getNetwork(networkId);
+ Network network = _networkService.getNetwork(id);
if (network == null) {
- throw new InvalidParameterValueException("Unable to find network by id " + networkId);
+ throw new InvalidParameterValueException("Unable to find network by id " + id);
} else {
return network.getId();
}
diff --git a/api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java b/api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java
index 916a72153f1..75032d2ac12 100644
--- a/api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java
+++ b/api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java
@@ -13,6 +13,7 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
+import com.cloud.api.BaseCmd.CommandType;
import com.cloud.api.response.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
@@ -47,8 +48,8 @@ public class RevokeSecurityGroupIngressCmd extends BaseAsyncCmd {
@Parameter(name=ApiConstants.ICMP_TYPE, type=CommandType.INTEGER, description="type for this icmp message")
private Integer icmpType;
- @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, required=true, description="name of the security group")
- private String securityGroupName;
+ @Parameter(name=ApiConstants.SECURITY_GROUP_ID, type=CommandType.LONG, required=true, description="The ID of the security group")
+ private Long securityGroupId;
@Parameter(name=ApiConstants.PROTOCOL, type=CommandType.STRING, description="protocol used")
private String protocol;
@@ -87,8 +88,8 @@ public class RevokeSecurityGroupIngressCmd extends BaseAsyncCmd {
return icmpType;
}
- public String getSecurityGroupName() {
- return securityGroupName;
+ public Long getSecurityGroupId() {
+ return securityGroupId;
}
public String getProtocol() {
@@ -165,7 +166,7 @@ public class RevokeSecurityGroupIngressCmd extends BaseAsyncCmd {
sb.append("");
}
- return "revoking ingress from group: " + getSecurityGroupName() + " for " + sb.toString();
+ return "revoking ingress from group: " + getSecurityGroupId() + " for " + sb.toString();
}
@Override
diff --git a/api/src/com/cloud/api/response/AccountResponse.java b/api/src/com/cloud/api/response/AccountResponse.java
index a4ed2931ea8..98f4172757a 100644
--- a/api/src/com/cloud/api/response/AccountResponse.java
+++ b/api/src/com/cloud/api/response/AccountResponse.java
@@ -17,6 +17,8 @@
*/
package com.cloud.api.response;
+import java.util.List;
+
import com.cloud.api.ApiConstants;
import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
@@ -99,6 +101,9 @@ public class AccountResponse extends BaseResponse {
@SerializedName(ApiConstants.IS_CLEANUP_REQUIRED) @Param(description="true if the account requires cleanup")
private Boolean cleanupRequired;
+
+ @SerializedName("user") @Param(description="the list of users associated with account", responseObject = NicResponse.class)
+ private List users;
public Long getId() {
return id;
@@ -307,4 +312,12 @@ public class AccountResponse extends BaseResponse {
public void setCleanupRequired(Boolean cleanupRequired) {
this.cleanupRequired = cleanupRequired;
}
+
+ public List getUsers() {
+ return this.users;
+ }
+
+ public void setUsers(List users) {
+ this.users = users;
+ }
}
diff --git a/api/src/com/cloud/api/response/NetworkOfferingResponse.java b/api/src/com/cloud/api/response/NetworkOfferingResponse.java
index 47bf6e98436..c0310bf51f6 100644
--- a/api/src/com/cloud/api/response/NetworkOfferingResponse.java
+++ b/api/src/com/cloud/api/response/NetworkOfferingResponse.java
@@ -2,6 +2,7 @@ package com.cloud.api.response;
import java.util.Date;
+import com.cloud.api.ApiConstants;
import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
@@ -35,6 +36,9 @@ public class NetworkOfferingResponse extends BaseResponse{
@SerializedName("availability") @Param(description="availability of the network offering")
private String availability;
+
+ @SerializedName(ApiConstants.NETWORKRATE) @Param(description="data transfer rate in megabits per second allowed.")
+ private Integer networkRate;
public Long getId() {
return id;
@@ -123,4 +127,12 @@ public class NetworkOfferingResponse extends BaseResponse{
public void setAvailability(String availability) {
this.availability = availability;
}
+
+ public Integer getNetworkRate() {
+ return networkRate;
+ }
+
+ public void setNetworkRate(Integer networkRate) {
+ this.networkRate = networkRate;
+ }
}
diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java
index a98965e23c9..b4e9f404890 100644
--- a/api/src/com/cloud/configuration/ConfigurationService.java
+++ b/api/src/com/cloud/configuration/ConfigurationService.java
@@ -28,9 +28,12 @@ import com.cloud.dc.Vlan;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.Networks.TrafficType;
import com.cloud.offering.DiskOffering;
import com.cloud.offering.NetworkOffering;
import com.cloud.offering.ServiceOffering;
+import com.cloud.user.Account;
public interface ConfigurationService {
@@ -173,7 +176,7 @@ public interface ConfigurationService {
* @throws
* @return The new Vlan object
*/
- Vlan createVlanAndPublicIpRange(CreateVlanIpRangeCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException;
+ Vlan createVlanAndPublicIpRange(CreateVlanIpRangeCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException, ResourceUnavailableException;
boolean deleteVlanIpRange(DeleteVlanIpRangeCmd cmd);
@@ -184,5 +187,13 @@ public interface ConfigurationService {
List searchForNetworkOfferings(ListNetworkOfferingsCmd cmd);
boolean deleteNetworkOffering(DeleteNetworkOfferingCmd cmd);
+
+ NetworkOffering getNetworkOffering(long id);
+
+ Integer getNetworkRate(long networkOfferingId);
+
+ Account getVlanAccount(long vlanId);
+
+ List listNetworkOfferings(TrafficType trafficType, boolean systemOnly);
}
diff --git a/api/src/com/cloud/event/ActionEvent.java b/api/src/com/cloud/event/ActionEvent.java
index f489e380cb2..61ff14ba968 100644
--- a/api/src/com/cloud/event/ActionEvent.java
+++ b/api/src/com/cloud/event/ActionEvent.java
@@ -28,6 +28,7 @@ import java.lang.annotation.Target;
@Retention(RUNTIME)
public @interface ActionEvent {
boolean create() default false;
+ boolean async() default false;
String eventType();
String eventDescription();
}
diff --git a/api/src/com/cloud/host/Host.java b/api/src/com/cloud/host/Host.java
index 3aaa504069c..ef5baf1cb53 100755
--- a/api/src/com/cloud/host/Host.java
+++ b/api/src/com/cloud/host/Host.java
@@ -19,8 +19,7 @@ package com.cloud.host;
import java.util.Date;
-import com.cloud.host.Status;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
/**
@@ -56,7 +55,7 @@ public interface Host {
/**
* @return id of the host.
*/
- Long getId();
+ long getId();
/**
* @return name of the machine.
@@ -145,27 +144,46 @@ public interface Host {
/**
* @return version
*/
- public String getVersion();
+ String getVersion();
/*
* @return total size
*/
- public long getTotalSize();
+ long getTotalSize();
/*
* @return capabilities
*/
- public String getCapabilities();
+ String getCapabilities();
/*
* @return last pinged time
*/
- public long getLastPinged();
+ long getLastPinged();
/*
* @return management server id
*/
- public Long getManagementServerId();
+ Long getManagementServerId();
/*
*@return removal date
*/
- public Date getRemoved();
+ Date getRemoved();
+
+ Long getClusterId();
+
+ String getPublicIpAddress();
+
+ String getPublicNetmask();
+
+ String getPrivateNetmask();
+
+ String getStorageNetmask();
+
+ String getStorageMacAddress();
+
+ String getPublicMacAddress();
+
+ String getPrivateMacAddress();
+
+ String getStorageNetmaskDeux();
+
+ String getStorageMacAddressDeux();
- public Long getClusterId();
}
diff --git a/core/src/com/cloud/host/HostEnvironment.java b/api/src/com/cloud/host/HostEnvironment.java
similarity index 100%
rename from core/src/com/cloud/host/HostEnvironment.java
rename to api/src/com/cloud/host/HostEnvironment.java
diff --git a/core/src/com/cloud/host/HostStats.java b/api/src/com/cloud/host/HostStats.java
similarity index 100%
rename from core/src/com/cloud/host/HostStats.java
rename to api/src/com/cloud/host/HostStats.java
diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java
index 5b0a9da8860..a6a83d83f85 100644
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -26,6 +26,7 @@ import com.cloud.api.commands.ListNetworksCmd;
import com.cloud.api.commands.RestartNetworkCmd;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
@@ -51,7 +52,7 @@ public interface NetworkService {
List searchForNetworks(ListNetworksCmd cmd) throws InvalidParameterValueException, PermissionDeniedException;
boolean deleteNetwork(long networkId) throws InvalidParameterValueException, PermissionDeniedException;
- boolean restartNetwork(RestartNetworkCmd cmd) throws ConcurrentOperationException, ResourceUnavailableException;
+ boolean restartNetwork(RestartNetworkCmd cmd) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
int getActiveNicsInNetwork(long networkId);
diff --git a/api/src/com/cloud/network/Networks.java b/api/src/com/cloud/network/Networks.java
index 889ca567047..4527574a4d3 100644
--- a/api/src/com/cloud/network/Networks.java
+++ b/api/src/com/cloud/network/Networks.java
@@ -36,6 +36,14 @@ public class Networks {
Firewall
}
+ public enum RouterPrivateIpStrategy {
+ None,
+ DcGlobal, //global to data center
+ HostLocal;
+
+ public static String DummyPrivateIp = "169.254.1.1";
+ }
+
/**
* Different ways to assign ip address to this network.
*/
diff --git a/api/src/com/cloud/network/element/NetworkElement.java b/api/src/com/cloud/network/element/NetworkElement.java
index ec49880afe5..36a20dc0cc3 100644
--- a/api/src/com/cloud/network/element/NetworkElement.java
+++ b/api/src/com/cloud/network/element/NetworkElement.java
@@ -78,6 +78,15 @@ public interface NetworkElement extends Adapter {
*/
boolean shutdown(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException;
+ /**
+ * The network is being restarted.
+ * @param network
+ * @param context
+ * @return
+ * @throws ConcurrentOperationException
+ * @throws ResourceUnavailableException
+ */
+ boolean restart(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
/**
* The network is being destroyed.
diff --git a/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java b/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
new file mode 100644
index 00000000000..3c4cc45aef4
--- /dev/null
+++ b/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
@@ -0,0 +1,68 @@
+package com.cloud.network.ovs;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+
+public class OvsCreateTunnelAnswer extends Answer {
+ Long from;
+ Long to;
+ long account;
+ String inPortName;
+
+ //for debug info
+ String fromIp;
+ String toIp;
+ String key;
+ String bridge;
+
+ public OvsCreateTunnelAnswer(Command cmd, boolean success, String details, String bridge) {
+ super(cmd, success, details);
+ OvsCreateTunnelCommand c = (OvsCreateTunnelCommand)cmd;
+ from = c.getFrom();
+ to = c.getTo();
+ account = c.getAccount();
+ inPortName = "[]";
+ fromIp = c.getFromIp();
+ toIp = c.getRemoteIp();
+ key = c.getKey();
+ this.bridge = bridge;
+ }
+
+ public OvsCreateTunnelAnswer(Command cmd, boolean success, String details, String inPortName, String bridge) {
+ this(cmd, success, details, bridge);
+ this.inPortName = inPortName;
+ }
+
+
+ public Long getFrom() {
+ return from;
+ }
+
+ public Long getTo() {
+ return to;
+ }
+
+ public long getAccount() {
+ return account;
+ }
+
+ public String getInPortName() {
+ return inPortName;
+ }
+
+ public String getFromIp() {
+ return fromIp;
+ }
+
+ public String getToIp() {
+ return toIp;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public String getBridge() {
+ return bridge;
+ }
+}
diff --git a/api/src/com/cloud/network/ovs/OvsCreateTunnelCommand.java b/api/src/com/cloud/network/ovs/OvsCreateTunnelCommand.java
new file mode 100644
index 00000000000..8ac772d07e2
--- /dev/null
+++ b/api/src/com/cloud/network/ovs/OvsCreateTunnelCommand.java
@@ -0,0 +1,53 @@
+package com.cloud.network.ovs;
+
+import com.cloud.agent.api.Command;
+
+public class OvsCreateTunnelCommand extends Command {
+ String key;
+ String remoteIp;
+ Long from;
+ Long to;
+ long account;
+
+ //for debug info
+ String fromIp;
+
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
+
+ public OvsCreateTunnelCommand(String remoteIp, String key, Long from, Long to, long account, String fromIp) {
+ this.remoteIp = remoteIp;
+ this.key = key;
+ this.from = from;
+ this.to = to;
+ this.account = account;
+ this.fromIp = fromIp;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public String getRemoteIp() {
+ return remoteIp;
+ }
+
+ public Long getFrom() {
+ return from;
+ }
+
+ public Long getTo() {
+ return to;
+ }
+
+ public long getAccount() {
+ return account;
+ }
+
+ public String getFromIp() {
+ return fromIp;
+ }
+
+}
diff --git a/api/src/com/cloud/network/ovs/OvsDestroyTunnelCommand.java b/api/src/com/cloud/network/ovs/OvsDestroyTunnelCommand.java
new file mode 100644
index 00000000000..65e12179ab0
--- /dev/null
+++ b/api/src/com/cloud/network/ovs/OvsDestroyTunnelCommand.java
@@ -0,0 +1,27 @@
+package com.cloud.network.ovs;
+
+import com.cloud.agent.api.Command;
+
+public class OvsDestroyTunnelCommand extends Command {
+ long account;
+ String inPortName;
+
+ public OvsDestroyTunnelCommand(long account, String inPortName) {
+ this.account = account;
+ this.inPortName = inPortName;
+ }
+
+ public long getAccount() {
+ return account;
+ }
+
+ public String getInPortName() {
+ return inPortName;
+ }
+
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
+
+}
diff --git a/api/src/com/cloud/network/router/VirtualRouter.java b/api/src/com/cloud/network/router/VirtualRouter.java
index 51c9cb2341a..152611f3bdb 100755
--- a/api/src/com/cloud/network/router/VirtualRouter.java
+++ b/api/src/com/cloud/network/router/VirtualRouter.java
@@ -39,21 +39,6 @@ public interface VirtualRouter extends VirtualMachine {
public String getPublicNetmask();
- public String getPrivateNetmask();
-
- public String getVnet();
-
- public String getVlanId();
-
- public String getZoneVlan();
-
- public String getGuestZoneMacAddress();
-
- /**
- * @return the gateway address for the router to use.
- */
- public String getGateway();
-
/**
* @return the ram size for this machine.
*/
@@ -66,26 +51,9 @@ public interface VirtualRouter extends VirtualMachine {
*/
String getPublicIpAddress();
- String getDns1();
- String getDns2();
String getDomain();
- /**
- * @return account id that the domain router belongs to.
- */
- long getAccountId();
-
- /**
- * @return domain id that the domain router belongs to.
- */
- long getDomainId();
-
Role getRole();
-
- /**
- * @return the range of dhcp addresses served (start and end)
- */
- String[] getDhcpRange();
void setRamSize(int ramSize);
}
diff --git a/api/src/com/cloud/resource/Concierge.java b/api/src/com/cloud/resource/Concierge.java
deleted file mode 100644
index 04b1538ef5b..00000000000
--- a/api/src/com/cloud/resource/Concierge.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- *
- */
-package com.cloud.resource;
-
-import com.cloud.utils.component.Adapter;
-
-public interface Concierge extends Adapter {
-
-}
diff --git a/api/src/com/cloud/resource/Resource.java b/api/src/com/cloud/resource/Resource.java
deleted file mode 100644
index cb76142513e..00000000000
--- a/api/src/com/cloud/resource/Resource.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- *
- */
-package com.cloud.resource;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import com.cloud.utils.fsm.FiniteState;
-import com.cloud.utils.fsm.StateMachine;
-
-/**
- * Indicates a resource in CloudStack.
- * Any resource that requires an reservation and release system
- * must implement this interface.
- *
- */
-public interface Resource {
- enum Event {
- ReservationRequested,
- ReleaseRequested,
- CancelRequested,
- OperationCompleted,
- OperationFailed,
- }
-
- enum State implements FiniteState {
- Allocated("Resource is allocated but not reserved"),
- Reserving("Resource is being reserved right now"),
- Reserved("Resource has been reserved."),
- Releasing("Resource is being released"),
- Deallocating("Resource is being deallocated");
-
- String _description;
-
- @Override
- public StateMachine getStateMachine() {
- return s_fsm;
- }
-
- @Override
- public State getNextState(Event event) {
- return s_fsm.getNextState(this, event);
- }
-
- @Override
- public List getFromStates(Event event) {
- return s_fsm.getFromStates(this, event);
- }
-
- @Override
- public Set getPossibleEvents() {
- return s_fsm.getPossibleEvents(this);
- }
-
- private State(String description) {
- _description = description;
- }
-
- @Override
- public String getDescription() {
- return _description;
- }
-
- final static private StateMachine s_fsm = new StateMachine();
- static {
- s_fsm.addTransition(State.Allocated, Event.ReservationRequested, State.Reserving);
- s_fsm.addTransition(State.Reserving, Event.CancelRequested, State.Allocated);
- s_fsm.addTransition(State.Reserving, Event.OperationCompleted, State.Reserved);
- s_fsm.addTransition(State.Reserving, Event.OperationFailed, State.Allocated);
- s_fsm.addTransition(State.Reserved, Event.ReleaseRequested, State.Releasing);
- s_fsm.addTransition(State.Releasing, Event.OperationCompleted, State.Allocated);
- s_fsm.addTransition(State.Releasing, Event.OperationFailed, State.Reserved);
- }
- }
-
- enum ReservationStrategy {
- PlaceHolder,
- Create,
- Start;
- }
-
- /**
- * @return id in the CloudStack database
- */
- long getId();
-
- /**
- * @return reservation id returned by the allocation source. This can be the
- * String version of the database id if the allocation source does not need it's
- * own implementation of the reservation id. This is passed back to the
- * allocation source to release the resource.
- */
- String getReservationId();
-
- /**
- * @return unique name for the allocation source.
- */
- String getReserver();
-
- /**
- * @return the time a reservation request was made to the allocation source.
- */
- Date getUpdateTime();
-
- /**
- * @return the expected reservation interval. -1 indicates
- */
- int getExpectedReservationInterval();
-
- /**
- * @return the expected release interval.
- */
- int getExpectedReleaseInterval();
-
- /**
- * @return the reservation state of the resource.
- */
- State getState();
-
- ReservationStrategy getReservationStrategy();
-}
diff --git a/core/src/com/cloud/storage/StorageStats.java b/api/src/com/cloud/storage/StorageStats.java
similarity index 100%
rename from core/src/com/cloud/storage/StorageStats.java
rename to api/src/com/cloud/storage/StorageStats.java
diff --git a/core/src/com/cloud/storage/VMTemplateStorageResourceAssoc.java b/api/src/com/cloud/storage/VMTemplateStorageResourceAssoc.java
similarity index 61%
rename from core/src/com/cloud/storage/VMTemplateStorageResourceAssoc.java
rename to api/src/com/cloud/storage/VMTemplateStorageResourceAssoc.java
index d42c7f10cb7..a78db8d3ac4 100644
--- a/core/src/com/cloud/storage/VMTemplateStorageResourceAssoc.java
+++ b/api/src/com/cloud/storage/VMTemplateStorageResourceAssoc.java
@@ -26,40 +26,42 @@ import java.util.Date;
public interface VMTemplateStorageResourceAssoc {
public static enum Status {UNKNOWN, DOWNLOAD_ERROR, NOT_DOWNLOADED, DOWNLOAD_IN_PROGRESS, DOWNLOADED, ABANDONED, UPLOADED, NOT_UPLOADED, UPLOAD_ERROR, UPLOAD_IN_PROGRESS}
- public String getInstallPath();
+ String getInstallPath();
- public long getTemplateId();
+ long getTemplateId();
- public void setTemplateId(long templateId);
+ void setTemplateId(long templateId);
- public int getDownloadPercent();
+ int getDownloadPercent();
- public void setDownloadPercent(int downloadPercent);
+ void setDownloadPercent(int downloadPercent);
- public void setDownloadState(Status downloadState);
+ void setDownloadState(Status downloadState);
- public Long getId();
+ long getId();
- public Date getCreated();
+ Date getCreated();
- public Date getLastUpdated();
+ Date getLastUpdated();
- public void setLastUpdated(Date date);
+ void setLastUpdated(Date date);
- public void setInstallPath(String installPath);
+ void setInstallPath(String installPath);
- public Status getDownloadState();
+ Status getDownloadState();
- public void setLocalDownloadPath(String localPath);
+ void setLocalDownloadPath(String localPath);
- public String getLocalDownloadPath();
+ String getLocalDownloadPath();
- public void setErrorString(String errorString);
+ void setErrorString(String errorString);
- public String getErrorString();
+ String getErrorString();
- public void setJobId(String jobId);
+ void setJobId(String jobId);
- public String getJobId();;
+ String getJobId();;
+
+ long getTemplateSize();
}
diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java
index 2e650fb5179..b830eefb8ac 100755
--- a/api/src/com/cloud/storage/Volume.java
+++ b/api/src/com/cloud/storage/Volume.java
@@ -152,7 +152,6 @@ public interface Volume extends ControlledEntity, BasedOn {
Date getCreated();
AsyncInstanceCreateStatus getStatus();
- boolean getDestroyed();
long getDiskOfferingId();
diff --git a/core/src/com/cloud/storage/VolumeStats.java b/api/src/com/cloud/storage/VolumeStats.java
similarity index 100%
rename from core/src/com/cloud/storage/VolumeStats.java
rename to api/src/com/cloud/storage/VolumeStats.java
diff --git a/api/src/com/cloud/template/VirtualMachineTemplate.java b/api/src/com/cloud/template/VirtualMachineTemplate.java
index 6228f95ac3e..3a40f25f1fb 100755
--- a/api/src/com/cloud/template/VirtualMachineTemplate.java
+++ b/api/src/com/cloud/template/VirtualMachineTemplate.java
@@ -77,4 +77,10 @@ public interface VirtualMachineTemplate extends ControlledEntity {
HypervisorType getHypervisorType();
int getBits();
+
+ String getUniqueName();
+
+ String getUrl();
+
+ String getChecksum();
}
diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java
index 839abac4864..20019cbfa12 100644
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -33,10 +33,12 @@ import com.cloud.api.commands.UpdateAccountCmd;
import com.cloud.api.commands.UpdateResourceLimitCmd;
import com.cloud.api.commands.UpdateUserCmd;
import com.cloud.configuration.ResourceLimit;
+import com.cloud.domain.Domain;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.Pair;
public interface AccountService {
@@ -143,6 +145,8 @@ public interface AccountService {
Account finalizeOwner(Account caller, String accountName, Long domainId);
+ Pair finalizeAccountDomainForList(Account caller, String accountName, Long domainId);
+
Account getActiveAccount(String accountName, Long domainId);
Account getActiveAccount(Long accountId);
@@ -150,5 +154,7 @@ public interface AccountService {
Account getAccount(Long accountId);
User getActiveUser(long userId);
+
+ Domain getDomain(long id);
}
diff --git a/api/src/com/cloud/user/UserContext.java b/api/src/com/cloud/user/UserContext.java
index 1a48d159bd5..c4ec8ef7d93 100644
--- a/api/src/com/cloud/user/UserContext.java
+++ b/api/src/com/cloud/user/UserContext.java
@@ -32,6 +32,7 @@ public class UserContext {
private String sessionId;
private Account account;
private long startEventId = 0;
+ private long accountId;
private boolean apiServer;
@@ -112,4 +113,12 @@ public class UserContext {
return startEventId;
}
+ public long getAccountId() {
+ return accountId;
+ }
+
+ public void setAccountId(long accountId) {
+ this.accountId = accountId;
+ }
+
}
diff --git a/api/src/com/cloud/uservm/UserVm.java b/api/src/com/cloud/uservm/UserVm.java
index 4b0c90abe73..3cfe57babda 100755
--- a/api/src/com/cloud/uservm/UserVm.java
+++ b/api/src/com/cloud/uservm/UserVm.java
@@ -25,38 +25,6 @@ import com.cloud.vm.VirtualMachine;
*/
public interface UserVm extends VirtualMachine, ControlledEntity {
- /**
- * @return service offering id
- */
- @Override
- long getServiceOfferingId();
-
- /**
- * @return the domain router associated with this vm.
- Long getDomainRouterId();
- */
-
- /**
- * @return the vnet associated with this vm.
- */
- String getVnet();
-
- /**
- * @return the domain this vm instance belongs to.
- */
- @Override
- long getDomainId();
-
- /**
- * @return ip address within the guest network.
- */
- String getGuestIpAddress();
-
- /**
- * @return mac address of the guest network.
- */
- String getGuestMacAddress();
-
Long getIsoId();
String getDisplayName();
@@ -65,8 +33,6 @@ public interface UserVm extends VirtualMachine, ControlledEntity {
String getPassword();
- Long getDomainRouterId();
-
void setUserData(String userData);
String getDetail(String name);
diff --git a/api/src/com/cloud/vm/Nic.java b/api/src/com/cloud/vm/Nic.java
index 0576b553e6a..951dbe22950 100644
--- a/api/src/com/cloud/vm/Nic.java
+++ b/api/src/com/cloud/vm/Nic.java
@@ -18,15 +18,112 @@
package com.cloud.vm;
import java.net.URI;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
import com.cloud.network.Networks.Mode;
-import com.cloud.resource.Resource;
+import com.cloud.utils.fsm.FiniteState;
+import com.cloud.utils.fsm.StateMachine;
/**
* Nic represents one nic on the VM.
*/
-public interface Nic extends Resource {
+public interface Nic {
+ enum Event {
+ ReservationRequested,
+ ReleaseRequested,
+ CancelRequested,
+ OperationCompleted,
+ OperationFailed,
+ }
+
+ public enum State implements FiniteState {
+ Allocated("Resource is allocated but not reserved"),
+ Reserving("Resource is being reserved right now"),
+ Reserved("Resource has been reserved."),
+ Releasing("Resource is being released"),
+ Deallocating("Resource is being deallocated");
+
+ String _description;
+
+ @Override
+ public StateMachine getStateMachine() {
+ return s_fsm;
+ }
+
+ @Override
+ public State getNextState(Event event) {
+ return s_fsm.getNextState(this, event);
+ }
+
+ @Override
+ public List getFromStates(Event event) {
+ return s_fsm.getFromStates(this, event);
+ }
+
+ @Override
+ public Set getPossibleEvents() {
+ return s_fsm.getPossibleEvents(this);
+ }
+
+ private State(String description) {
+ _description = description;
+ }
+
+ @Override
+ public String getDescription() {
+ return _description;
+ }
+
+ final static private StateMachine s_fsm = new StateMachine();
+ static {
+ s_fsm.addTransition(State.Allocated, Event.ReservationRequested, State.Reserving);
+ s_fsm.addTransition(State.Reserving, Event.CancelRequested, State.Allocated);
+ s_fsm.addTransition(State.Reserving, Event.OperationCompleted, State.Reserved);
+ s_fsm.addTransition(State.Reserving, Event.OperationFailed, State.Allocated);
+ s_fsm.addTransition(State.Reserved, Event.ReleaseRequested, State.Releasing);
+ s_fsm.addTransition(State.Releasing, Event.OperationCompleted, State.Allocated);
+ s_fsm.addTransition(State.Releasing, Event.OperationFailed, State.Reserved);
+ }
+ }
+
+ public enum ReservationStrategy {
+ PlaceHolder,
+ Create,
+ Start;
+ }
+
+ /**
+ * @return id in the CloudStack database
+ */
+ long getId();
+
+ /**
+ * @return reservation id returned by the allocation source. This can be the
+ * String version of the database id if the allocation source does not need it's
+ * own implementation of the reservation id. This is passed back to the
+ * allocation source to release the resource.
+ */
+ String getReservationId();
+
+ /**
+ * @return unique name for the allocation source.
+ */
+ String getReserver();
+
+ /**
+ * @return the time a reservation request was made to the allocation source.
+ */
+ Date getUpdateTime();
+
+ /**
+ * @return the reservation state of the resource.
+ */
+ State getState();
+
+ ReservationStrategy getReservationStrategy();
boolean isDefaultNic();
String getIp4Address();
@@ -54,5 +151,4 @@ public interface Nic extends Resource {
URI getIsolationUri();
URI getBroadcastUri();
-
}
diff --git a/api/src/com/cloud/vm/NicProfile.java b/api/src/com/cloud/vm/NicProfile.java
index 1786e2b2235..519d5e3eb2e 100644
--- a/api/src/com/cloud/vm/NicProfile.java
+++ b/api/src/com/cloud/vm/NicProfile.java
@@ -10,8 +10,7 @@ import com.cloud.network.Networks.AddressFormat;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.Mode;
import com.cloud.network.Networks.TrafficType;
-import com.cloud.resource.Resource;
-import com.cloud.resource.Resource.ReservationStrategy;
+import com.cloud.vm.Nic.ReservationStrategy;
public class NicProfile {
long id;
@@ -34,6 +33,7 @@ public class NicProfile {
Integer deviceId;
String dns1;
String dns2;
+ int networkRate;
public String getDns1() {
return dns1;
@@ -182,8 +182,12 @@ public class NicProfile {
public void setIp4Address(String ip4Address) {
this.ip4Address = ip4Address;
}
+
+ public int getNetworkRate() {
+ return networkRate;
+ }
- public NicProfile(Nic nic, Network network, URI broadcastUri, URI isolationUri) {
+ public NicProfile(Nic nic, Network network, URI broadcastUri, URI isolationUri, Integer networkRate) {
this.id = nic.getId();
this.networkId = network.getId();
this.gateway = nic.getGateway();
@@ -203,6 +207,9 @@ public class NicProfile {
this.netmask = nic.getNetmask();
this.dns1 = network.getDns1();
this.dns2 = network.getDns2();
+ if (networkRate != null) {
+ this.networkRate = networkRate;
+ }
}
public NicProfile(long id, BroadcastDomainType type, Mode mode, long vmId) {
@@ -212,7 +219,7 @@ public class NicProfile {
this.vmId = vmId;
}
- public NicProfile(Resource.ReservationStrategy strategy, String ip4Address, String macAddress, String gateway, String netmask) {
+ public NicProfile(ReservationStrategy strategy, String ip4Address, String macAddress, String gateway, String netmask) {
this.format = AddressFormat.Ip4;
this.ip4Address = ip4Address;
this.macAddress = macAddress;
diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java
index b102c7cbcb0..85b873cdd2b 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -73,7 +73,7 @@ public interface UserVmService {
* @param cmd - the command specifying vmId, password
* @return the VM if reset worked successfully, null otherwise
*/
- UserVm resetVMPassword(ResetVMPasswordCmd cmd, String password);
+ UserVm resetVMPassword(ResetVMPasswordCmd cmd, String password) throws ResourceUnavailableException, InsufficientCapacityException;
/**
* Attaches the specified volume to the specified VM
@@ -93,7 +93,7 @@ public interface UserVmService {
UserVm startVirtualMachine(StartVMCmd cmd) throws StorageUnavailableException, ExecutionException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
UserVm stopVirtualMachine(StopVMCmd cmd) throws ServerApiException, ConcurrentOperationException;
- UserVm rebootVirtualMachine(RebootVMCmd cmd);
+ UserVm rebootVirtualMachine(RebootVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException;
UserVm updateVirtualMachine(UpdateVMCmd cmd);
UserVm recoverVirtualMachine(RecoverVMCmd cmd) throws ResourceAllocationException;
diff --git a/core/src/com/cloud/vm/VmStats.java b/api/src/com/cloud/vm/VmStats.java
similarity index 100%
rename from core/src/com/cloud/vm/VmStats.java
rename to api/src/com/cloud/vm/VmStats.java
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index aa3523cc0fa..18190deb55f 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -36,6 +36,168 @@ label.cluster=Cluster
label.domain.name=Domain Name
label.advanced=Advanced
label.details=Details
+label.users=Users
+label.detaching.disk=Detaching Disk
+label.id=ID
+label.role=Role
+label.account.name=Account Name
+label.vms=VMs
+label.ips=IPs
+label.ip=IP
+label.bytes.received=Bytes Received
+label.bytes.sent=Bytes Sent
+label.state=State
+label.save=Save
+label.cancel=Cancel
+label.add.account=Add Account
+label.add.user=Add User
+label.waiting=Waiting
+label.api.key=API Key
+label.secret.key=Secret Key
+label.email=Email
+label.first.name=First Name
+label.last.name=Last Name
+label.timezone=Timezone
+label.instance.limits=Instance Limits
+label.instance=Instance
+label.ip.limits=Public IP Limits
+label.volume.limits=Volume Limits
+label.snapshot.limits=Snapshot Limits
+label.template.limits=Template Limits
+label.adding=Adding
+label.sent=Sent
+label.user=User
+label.domain.admin=Domain Admin
+label.admin=Admin
+label.by.role=By Role
+label.type=Type
+label.type.id=Type ID
+label.description=Description
+label.hypervisor.type=Hypervisor Type
+label.cluster.type=Cluster Type
+label.host.name=Host Name
+label.vcenter.datastore=vCenter Datastore
+label.vcenter.address=vCenter Address
+label.vcenter.username=vCenter Username
+label.vcenter.password=vCenter Password
+label.vcenter.datacenter=vCenter Datacenter
+label.vcenter.host=vCenter Host
+label.protocol=Protocol
+label.nfs=NFS
+label.iscsi=iSCSI
+label.vmfs=VMFS
+label.server=Server
+label.path=Path
+label.target.iqn=Target IQN
+label.lun=LUN
+label.tags=Tags
+label.system.capacity=System Wide Capacity
+label.public.ips=Public IP Addresses
+label.allocated=Allocated
+label.private.ips=Private IP Addresses
+label.private.ip=Private IP Address
+label.guest.ip=Guest IP Address
+label.memory.allocated=Memory Allocated
+label.memory.used=Memory Used
+label.cpu.allocated=CPU Allocated
+label.primary.allocated=Primary Storage Allocated
+label.used=Used
+label.primary.used=Primary Storage Used
+label.secondary.used=Secondary Storage Used
+label.general.alerts=General Alerts
+label.no.alerts=No Recent Alerts
+label.host.alerts=Host Alerts
+label.disk.volume=Disk Volume
+label.snapshots=Snapshots
+label.accounts=Accounts
+label.recent.errors=Recent Errors
+label.no.errors=No Recent Errors
+label.resources=Resources
+label.running.vms=Running VMs
+label.stopped.vms=Stopped VMs
+label.total.vms=Total VMs
+label.available.public.ips=Available Public IP Addresses
+label.owned.public.ips=Owned Public IP Addresses
+label.my.account=My Account
+label.account.id=Account ID
+label.account=Account
+label.display.text=Display Text
+label.disk.size=Disk Size
+label.add.disk.offering=Add Disk Offering
+label.custom.disk.size=Custom Disk Size
+label.no=No
+label.yes=Yes
+label.public=Public
+label.admin.accounts=Admin Accounts
+label.resource.limits=Resource Limits
+label.instances=Instances
+label.add.domain=Add Domain
+label.parent.domain=Parent Domain
+label.volumes=Volumes
+label.initiated.by=Initiated By
+label.owner.account=Owner Account
+label.level=Level
+label.date=Date
+label.by.type=By Type
+label.by.level=By Level
+label.info=Info
+label.warn=Warn
+label.error=Error
+label.value=Value
+label.edit=Edit
+label.hosts=Hosts
+label.host=Host
+label.virtual.appliances=Virtual Appliances
+label.system.vms=System VMs
+label.statistics=Statistics
+label.ip.address=IP Address
+label.version=Version
+label.os.preference=OS Preference
+label.last.disconnected=Last Disconnected
+label.cpu=CPU
+label.memory.total=Memory Total
+label.network.read=Network Read
+label.network.write=Network Write
+label.ip.or.fqdn=IP or FQDN
+label.disk.total=Disk Total
+label.disk.allocated=Disk Allocated
+label.created=Created
+label.system.vm.type=System VM Type
+label.public.ip=Public IP Address
+label.by.state=By State
+label.port.forwarding=Port Forwarding
+label.load.balancer=Load Balancer
+label.vpn=VPN
+label.vlan=VLAN
+label.source.nat=Source NAT
+label.network.type=Network Type
+label.network.id=Network ID
+label.associated.network.id=Associated Network ID
+label.static.nat=Static NAT
+label.static.nat.to=Static NAT to
+label.public.port=Public Port
+label.private.port=Private Port
+label.protocol=Protocol
+label.algorithm=Algorithm
+label.enabling.vpn=Enabling VPN
+label.acquire.new.ip=Acquire New IP
+label.manage=Manage
+label.delete=Delete
+label.assign=Assign
+label.assign.to.load.balancer=Assigning instance to load balancer
+label.remove.from.load.balancer=Removing instance from load balancer
+label.revoke=Revoke
+label.removing.user=Removing User
+label.enabling.vpn.access=Enabling VPN Access
+label.disabling.vpn.access=Disabling VPN Access
+label.adding.user=Adding User
+label.service.offering=Service Offering
+
+label.lang.english=English
+label.lang.chinese=Chinese
+
+label.theme.default=Default Theme
+label.theme.grey=Custom - Grey
label.menu.dashboard=Dashboard
label.menu.instances=Instances
@@ -58,6 +220,8 @@ label.menu.my.isos=My ISOs
label.menu.featured.isos=Featured ISOs
label.menu.community.isos=Community ISOs
label.menu.accounts=Accounts
+label.menu.my.accounts=My Accounts
+label.menu.all.accounts=All Accounts
label.menu.domains=Domains
label.menu.events=Events
label.menu.alerts=Alerts
@@ -69,15 +233,36 @@ label.menu.system.vms=System VMs
label.menu.configuration=Configuration
label.menu.service.offerings=Service Offerings
label.menu.disk.offerings=Disk Offerings
+label.menu.network.offerings=Network Offerings
label.menu.global.settings=Global Settings
label.menu.security.groups=Security Groups
+
label.vm.start=Start VM
label.vm.stop=Stop VM
label.vm.reboot=Reboot VM
label.vm.destroy=Destroy VM
#Messages
+message.edit.limits=Please specify limits to the following resources. A "-1" indicates no limit to the amount of resources create.
+message.disable.account=Please confirm you want to disable this account. By disabling the account, all users for this account will no longer have access to their cloud resources. All running virtual machines will be immediately shut down.
+message.lock.account=Please confirm you want to lock this account. By locking the account, all users for this account will no longer be able to manage their cloud resources. Existing resources can still be accessed.
+message.enable.account=Please confirm you want to enable this account.user
+message.new.user=Specify the following to add a new user to the account
+message.edit.confirm=Please confirm your changes before clicking 'Save'
+message.add.host=Please specify the following parameters to add a new host
+message.add.primary=Please specify the following parameters to add a new primary storage
+message.add.disk.offering=Please specify the following parameters to add a new disk offering
+message.restart.mgmt.server=Please restart your management server(s) for your new settings to take effect.
+message.update.os.preference=Please choose a OS preference for this host. All virtual instances with similar preferences will be first allocated to this host before choosing another.
+message.enabled.vpn=Your VPN access is currently enabled and can be accessed via the IP
+message.enabled.vpn.ip.sec=Your IPSec pre-shared key is
+message.enable.vpn=VPN access is currently not enabled. Please click here to enable VPN.
+message.remove.vpn.access=Please confirm you want to remove VPN access from the following user
+message.enable.vpn.access=VPN is currently disabled for this IP Address. Would you like to enable VPN access?
+message.disable.vpn.access=Please confirm you want to disable VPN Access.
+message.acquire.public.ip=Please select a zone from which you want to acquire your new IP from.
+message.allow.vpn.access=Please enter a username and password of the user that you want to allow VPN access.
#Errors
error.login=Your username/password does not match our records.
diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index 260e5ca880e..0422dc41523 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -112,43 +112,13 @@ please.specify.the.new.name.you.want.to.change.for.the.virtual.machine = Please
please.specify.the.new.group.you.want.to.assign.the.virtual.machine.to = Please specify the new group you want to assign the virtual machine to
after.changing.service.offering.you.must.restart.the.virtual.machine.for.new.service.offering.to.take.effect = After changing service offering, you must restart the virtual machine for the new service offering to take effect.
creating.a.template.of.disk.volume.could.take.up.to.several.hours.depending.on.the.size.of.the.disk.volume = Creating a template of disk volume could take up to several hours depending on the size of the disk volume
-please.confirm.you.want.to.change.the.root.password.for.the.virtual.machine = Please confirm you want to change the ROOT password for the virtual machine
-please.confirm.you.want.to.enable.HA.for.your.virtual.machine.once.HA.is.enabled.your.virtual.machine.will.be.automatically.restarted.in.the.event.it.is.detected.to.have.failed = Please confirm you want to enable HA for your virtual machine. Once HA is enabled, your virtual machine will be automatically restarted in the event it is detected to have failed.
-please.confirm.you.want.to.disable.HA.for.the.virtual.machine.once.HA.is.disabled.the.virtual.machine.will.no.longer.be.automatically.restarted.in.the.event.of.a.failure = Please confirm you want to disable HA for the virtual machine. Once HA is disabled, the virtual machine will no longer be be automatically restarted in the event of a failure.
-the.ISO.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones = The ISO is used by all zones. Please confirm you want to delete it from all zones.
-please.confirm.you.want.to.delete.the.ISO = Please confirm you want to delete the ISO
-the.template.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones = The template is used by all zones. Please confirm you want to delete it from all zones.
-please.confirm.you.want.to.delete.the.template = Please confirm you want to delete the template
please.specify.limits.to.the.various.resources.-1.means.the.resource.has.no.limits = Please specify limits to the various resources. -1 means the resource has no limits.
please.confirm.you.want.to.disable.account.that.will.prevent.account.access.to.the.cloud.and.shut.down.all.existing.virtual.machines = Please confirm you want to disable account that will prevent account access to the cloud and shut down all existing virtual machines.
please.confirm.you.want.to.lock.account.that.will.prevent.account.access.to.the.cloud = Please confirm you want to lock account that will prevent account access to the cloud.
please.confirm.you.want.to.enable.account = Please confirm you want to enable account.
please.select.an.available.zone.to.associate.your.new.ip.with..acquiring.additional.ip.may.cost.you.an.additional.dollars.per.month. = Please select an availability zone to associate your new IP with. Acquiring additional IP may cost you an additional dollars per month.
-please.confirm.you.want.to.release.this.IP.address = Please confirm you want to release this IP address
please.restart.your.management.server.for.your.new.settings.to.take.effect = Please RESTART your management server for your new settings to take effect
-enabling.maintenance.mode.will.cause.a.live.migration.of.all.running.instances.on.this.host.to.any.available.host = Enabling maintenance mode will cause a live migration of all running instances on this host to any available host.
-please.confirm.you.want.to.cancel.maintenance.for.the.host = Please confirm you want to cancel maintenance for the host
-please.confirm.you.want.to.force.a.reconnection.for.the.host = Please confirm you want to force a reconnection for the host
-please.confirm.you.want.to.remove.the.host.from.the.management.server = Please confirm you want to remove the host from the management server
Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.allocated.to.hosts.with.an.OS.preference.that.matches.with.the.OS.type.of.the.template.chosen.for.the.virtual.machine.before.choosing.other.hosts. = Please choose a OS preference for this host. Virtual machines will always be allocated to hosts with an OS preference that matches with the OS type of the template chosen for the virtual machine before choosing other hosts.
-please.confirm.you.want.to.delete.the.primary.storage = Please confirm you want to delete the primary storage
-please.confirm.you.want.to.delete.the.secondary.storage = Please confirm you want to delete the secondary storage
-
-please.confirm.you.want.to.start.instance = Please confirm you want to start instance
-please.confirm.you.want.to.stop.instance = Please confirm you want to stop instance
-please.confirm.you.want.to.reboot.instance = Please confirm you want to reboot instance
-please.confirm.you.want.to.destroy.instance = Please confirm you want to destroy instance
-please.confirm.you.want.to.restore.instance = Please confirm you want to restore instance
-
-please.confirm.you.want.to.start.router = Please confirm you want to start router
-please.confirm.you.want.to.stop.router = Please confirm you want to stop router
-please.confirm.you.want.to.reboot.router = Please confirm you want to reboot router
-
-
-please.confirm.you.want.to.start.systemVM = Please confirm you want to start system VM
-please.confirm.you.want.to.stop.systemVM = Please confirm you want to stop system VM
-please.confirm.you.want.to.reboot.systemVM = Please confirm you want to reboot system VM
-
customizable.during.VM.creation = Customizable during VM creation
physical.resources = Physical Resources
diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
index 84b56bebca6..f021a7fe50c 100755
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@ -61,9 +61,6 @@
-
-
-
diff --git a/console-proxy/.classpath b/console-proxy/.classpath
index 521b7a55fa9..5a34eae6642 100644
--- a/console-proxy/.classpath
+++ b/console-proxy/.classpath
@@ -4,6 +4,6 @@
-
+
diff --git a/console-viewer/.classpath b/console-viewer/.classpath
index 170f58a8bbb..e8a8d8c0a84 100644
--- a/console-viewer/.classpath
+++ b/console-viewer/.classpath
@@ -2,6 +2,6 @@
-
+
diff --git a/core/.classpath b/core/.classpath
index db9b9a922f1..f014c3e0d03 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -38,6 +38,7 @@
-
+
+
diff --git a/core/src/com/cloud/agent/api/CheckOnVmAnswer.java b/core/src/com/cloud/agent/api/CheckOnVmAnswer.java
deleted file mode 100644
index 84885962223..00000000000
--- a/core/src/com/cloud/agent/api/CheckOnVmAnswer.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.agent.api;
-
-public class CheckOnVmAnswer extends Answer {
- boolean determined;
- boolean alive;
-
- protected CheckOnVmAnswer() {
- }
-
- public CheckOnVmAnswer(CheckOnVmCommand cmd, Boolean alive) {
- this(cmd, alive, null);
- }
-
- public CheckOnVmAnswer(CheckOnVmCommand cmd, Boolean alive, String details) {
- super(cmd, true, details);
- if (alive == null) {
- determined = false;
- } else {
- determined = true;
- this.alive = alive;
- }
- }
-
- public CheckOnVmAnswer(CheckOnVmCommand cmd, Exception e) {
- super(cmd, e);
- }
-
- public boolean isDetermined() {
- return determined;
- }
-
- public boolean isAlive() {
- return alive;
- }
-}
diff --git a/core/src/com/cloud/agent/api/CheckOnVmCommand.java b/core/src/com/cloud/agent/api/CheckOnVmCommand.java
deleted file mode 100644
index 09275570aa0..00000000000
--- a/core/src/com/cloud/agent/api/CheckOnVmCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.agent.api;
-
-import com.cloud.host.HostVO;
-import com.cloud.vm.VMInstanceVO;
-
-/**
- * @author ahuang
- *
- */
-public class CheckOnVmCommand extends Command {
-
- protected CheckOnVmCommand() {
- }
-
- public CheckOnVmCommand(VMInstanceVO vm, HostVO host) {
-
- }
-
- @Override
- public boolean executeInSequence() {
- return false;
- }
-
-}
diff --git a/core/src/com/cloud/agent/api/MirrorAnswer.java b/core/src/com/cloud/agent/api/MirrorAnswer.java
deleted file mode 100644
index eb627ab6a82..00000000000
--- a/core/src/com/cloud/agent/api/MirrorAnswer.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.agent.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.cloud.storage.Volume;
-import com.cloud.storage.VolumeVO;
-
-
-/**
- * @author chiradeep
- *
- */
-public class MirrorAnswer extends Answer {
- public enum MirrorState {
- NOT_MIRRORED,
- ACTIVE,
- DEGRADED,
- FAILED
- }
-
- public enum DiskState {
- ACTIVE,
- REBUILD,
- FAILED
- }
-
- public class MirrorInfo {
- public Volume.VolumeType volType;
- public VolumeVO vol1;
- public VolumeVO vol2;
- public DiskState disk1State;
- public DiskState disk2State;
- public MirrorState mirrorState;
- public int rebuildPct;
- }
-
- String vmName;
- //List mirrorInfo = new ArrayList();
- String error;
-
-
- protected MirrorAnswer() {
- }
-
-
- public MirrorAnswer(MirrorCommand cmd, String vmName, String err) {
- super(cmd, false, err);
- this.vmName = vmName;
- }
-
- public MirrorAnswer(MirrorCommand cmd, String vmName){
- super(cmd, true, null);
- this.vmName = vmName;
- }
-
- public String getVmName() {
- return vmName;
- }
-
-
- public void setVmName(String vmName) {
- this.vmName = vmName;
- }
-
-
-
-}
diff --git a/core/src/com/cloud/agent/api/MirrorCommand.java b/core/src/com/cloud/agent/api/MirrorCommand.java
deleted file mode 100644
index c7d10f4abe5..00000000000
--- a/core/src/com/cloud/agent/api/MirrorCommand.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.agent.api;
-
-import java.util.List;
-
-import com.cloud.storage.VolumeVO;
-
-public class MirrorCommand extends Command {
-
- protected String vmName;
- protected String removeHost;
- protected String addHost;
- protected List removeVols;
- protected List addVols;
-
-
- public MirrorCommand(String vmName, String removeHost, String addHost,
- List removeVols, List addVols) {
- super();
- this.vmName = vmName;
- this.removeHost = removeHost;
- this.addHost = addHost;
- this.removeVols = removeVols;
- this.addVols = addVols;
- }
-
- protected MirrorCommand() {
- //satisfies gson
- }
-
- public String getVmName() {
- return vmName;
- }
-
-
- public void setVmName(String vmName) {
- this.vmName = vmName;
- }
-
-
- public String getRemoveHost() {
- return removeHost;
- }
-
-
- public void setRemoveHost(String removeHost) {
- this.removeHost = removeHost;
- }
-
-
- public String getAddHost() {
- return addHost;
- }
-
-
- public void setAddHost(String addHost) {
- this.addHost = addHost;
- }
-
-
- public List getRemoveVols() {
- return removeVols;
- }
-
-
- public void setRemoveVols(List removeVols) {
- this.removeVols = removeVols;
- }
-
-
- public List getAddVols() {
- return addVols;
- }
-
-
- public void setAddVols(List addVols) {
- this.addVols = addVols;
- }
-
-
- @Override
- public boolean executeInSequence() {
- return true;
- }
-
-
-}
\ No newline at end of file
diff --git a/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java b/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java
new file mode 100644
index 00000000000..79539051334
--- /dev/null
+++ b/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java
@@ -0,0 +1,69 @@
+package com.cloud.agent.api;
+
+import com.cloud.vm.VirtualMachine;
+
+public class NetworkRulesSystemVmCommand extends Command {
+ /**
+ * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
+ *
+ * This software is licensed under the GNU General Public License v3 or later.
+ *
+ * It is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+ private String vmName;
+ private long vmId;
+ private String pubIp;
+ private String mac;
+ private VirtualMachine.Type type;
+
+ protected NetworkRulesSystemVmCommand() {
+
+ }
+
+ public NetworkRulesSystemVmCommand(String vmName, VirtualMachine.Type type) {
+ this.vmName = vmName;
+ }
+
+ public NetworkRulesSystemVmCommand(String vmName, long vmId, String publicIP, String mac, VirtualMachine.Type type) {
+ this.vmName = vmName;
+ this.vmId = vmId;
+ this.pubIp = publicIP;
+ this.mac = mac;
+ this.type = type;
+ }
+
+ public String getVmName() {
+ return vmName;
+ }
+
+ public long getVmId() {
+ return vmId;
+ }
+
+ public String getIp() {
+ return pubIp;
+ }
+
+ public String getMac() {
+ return mac;
+ }
+
+ public VirtualMachine.Type getType() {
+ return type;
+ }
+ @Override
+ public boolean executeInSequence() {
+ return false;
+ }
+}
diff --git a/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java
deleted file mode 100644
index 09b4748ff91..00000000000
--- a/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later
-version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.agent.api;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.cloud.agent.transport.Request;
-import com.cloud.host.Host;
-import com.cloud.utils.Pair;
-import com.cloud.vm.VirtualMachine.State;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-
-public class PingRoutingWithNwGroupsCommand extends PingRoutingCommand {
- HashMap> newGroupStates;
-
- public static class NwGroupsCommandTypeAdaptor implements JsonDeserializer>, JsonSerializer> {
- static final GsonBuilder s_gBuilder;
- static {
- s_gBuilder = Request.initBuilder();
- }
-
- public NwGroupsCommandTypeAdaptor() {
- }
-
- @Override
- public JsonElement serialize(Pair src,
- java.lang.reflect.Type typeOfSrc, JsonSerializationContext context) {
- JsonArray array = new JsonArray();
- Gson json = s_gBuilder.create();
- if(src.first() != null) {
- array.add(json.toJsonTree(src.first()));
- } else {
- array.add(new JsonNull());
- }
-
- if (src.second() != null) {
- array.add(json.toJsonTree(src.second()));
- } else {
- array.add(new JsonNull());
- }
-
- return array;
- }
-
- @Override
- public Pair deserialize(JsonElement json,
- java.lang.reflect.Type type, JsonDeserializationContext context)
- throws JsonParseException {
- Pair pairs = new Pair(null, null);
- JsonArray array = json.getAsJsonArray();
- if (array.size() != 2) {
- return pairs;
- }
- JsonElement element = array.get(0);
- if (!element.isJsonNull()) {
- pairs.first(element.getAsLong());
- }
-
- element = array.get(1);
- if (!element.isJsonNull()) {
- pairs.second(element.getAsLong());
- }
-
- return pairs;
- }
-
- }
- protected PingRoutingWithNwGroupsCommand() {
- super();
- }
-
- public PingRoutingWithNwGroupsCommand(Host.Type type, long id, Map states, HashMap> nwGrpStates) {
- super(type, id, states);
- newGroupStates = nwGrpStates;
- }
-
- public HashMap> getNewGroupStates() {
- return newGroupStates;
- }
-
- public void setNewGroupStates(HashMap> newGroupStates) {
- this.newGroupStates = newGroupStates;
- }
-}
diff --git a/core/src/com/cloud/agent/api/routing/LoadBalancerCfgCommand.java b/core/src/com/cloud/agent/api/routing/LoadBalancerCfgCommand.java
deleted file mode 100644
index 3190e2a35d8..00000000000
--- a/core/src/com/cloud/agent/api/routing/LoadBalancerCfgCommand.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.agent.api.routing;
-
-import com.cloud.network.LoadBalancerConfigurator;
-
-/**
- * @author chiradeep
- *
- */
-public class LoadBalancerCfgCommand extends NetworkElementCommand {
- private String [] config;
- private String [] addFwRules;
- private String [] removeFwRules;;
- private String routerName;
- private String routerIp;
-
- //no-args to satisfy gson
- protected LoadBalancerCfgCommand() {
-
- }
-
- public LoadBalancerCfgCommand(String[] config, String[][] addRemoveRules, String routerName, String routerIp) {
- super();
- this.config = config;
- this.addFwRules = addRemoveRules[LoadBalancerConfigurator.ADD];
- this.removeFwRules = addRemoveRules[LoadBalancerConfigurator.REMOVE];
- this.routerName = routerName;
- this.routerIp = routerIp;
- }
-
- public String getRouterName() {
- return routerName;
- }
-
- public String getRouterIp() {
- return routerIp;
- }
-
- public String[] getConfig() {
- return config;
- }
-
- public void setConfig(String[] config) {
- this.config = config;
- }
-
- public String[] getAddFwRules() {
- return addFwRules;
- }
-
- public String[] getRemoveFwRules() {
- return removeFwRules;
- }
-
- @Override
- public boolean executeInSequence() {
- return false;
- }
-
-}
diff --git a/core/src/com/cloud/agent/api/storage/ShareAnswer.java b/core/src/com/cloud/agent/api/storage/ShareAnswer.java
deleted file mode 100644
index 1ddbdd33505..00000000000
--- a/core/src/com/cloud/agent/api/storage/ShareAnswer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.agent.api.storage;
-
-import java.util.Map;
-
-import com.cloud.agent.api.Answer;
-
-public class ShareAnswer extends Answer {
-
- protected ShareAnswer() {
- }
-
- Map mapping;
-
- public ShareAnswer(ShareCommand cmd, Map mapping) {
- super(cmd, true, null);
- this.mapping = mapping;
- }
-
- public ShareAnswer(ShareCommand cmd, String details) {
- super(cmd, false, details);
- }
-
- public Map getMappings() {
- return mapping;
- }
-
-}
diff --git a/core/src/com/cloud/agent/api/storage/ShareCommand.java b/core/src/com/cloud/agent/api/storage/ShareCommand.java
deleted file mode 100644
index 09ad9957594..00000000000
--- a/core/src/com/cloud/agent/api/storage/ShareCommand.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.agent.api.storage;
-
-import java.util.List;
-
-import com.cloud.storage.VolumeVO;
-
-public class ShareCommand extends StorageCommand {
- public static String UnshareAll = "unshare_all";
-
- private boolean share;
- private boolean removePreviousShare;
- private List volumes;
- private String vmName;
- private String initiatorIqn;
-
- protected ShareCommand() {
- }
-
- public ShareCommand(String vmName, List vols, String initiatorIqn, boolean removePreviousShare) {
- super();
- this.vmName = vmName;
- this.initiatorIqn = initiatorIqn;
- this.share = true;
- this.volumes = vols;
- this.removePreviousShare = removePreviousShare;
- }
-
- public ShareCommand(String vmName, List vols, String initiatorIqn) {
- super();
- this.vmName = vmName;
- this.initiatorIqn = initiatorIqn;
- this.share = false;
- this.volumes = vols;
- this.removePreviousShare = true;
- }
-
- public ShareCommand(String vmName, List vols) {
- super();
- this.vmName = vmName;
- this.initiatorIqn = UnshareAll;
- this.share = false;
- this.volumes = vols;
- this.removePreviousShare = true;
- }
-
- // NOTE: We set this to false because we leave it up to the business logic
- // to make sure it is already created before calling shared.
- @Override
- public boolean executeInSequence() {
- return false;
- }
-
- public boolean isShare() {
- return share;
- }
-
- public List getVolumes() {
- return volumes;
- }
-
- public String getVmName() {
- return vmName;
- }
-
- public String getInitiatorIqn() {
- return initiatorIqn;
- }
-
- public boolean removePreviousShare() {
- return removePreviousShare;
- }
-}
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index c1357c1385d..393198c0fe7 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -47,9 +47,8 @@ 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.IpAssocAnswer;
-import com.cloud.agent.api.routing.LoadBalancerCfgCommand;
-import com.cloud.agent.api.routing.NetworkElementCommand;
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
+import com.cloud.agent.api.routing.NetworkElementCommand;
import com.cloud.agent.api.routing.SavePasswordCommand;
import com.cloud.agent.api.routing.SetPortForwardingRulesAnswer;
import com.cloud.agent.api.routing.SetPortForwardingRulesCommand;
@@ -98,8 +97,6 @@ public class VirtualRoutingResource implements Manager {
try {
if (cmd instanceof SetPortForwardingRulesCommand ) {
return execute((SetPortForwardingRulesCommand)cmd);
- }else if (cmd instanceof LoadBalancerCfgCommand) {
- return execute((LoadBalancerCfgCommand)cmd);
} else if (cmd instanceof LoadBalancerConfigCommand) {
return execute((LoadBalancerConfigCommand)cmd);
} else if (cmd instanceof IPAssocCommand) {
@@ -239,39 +236,6 @@ public class VirtualRoutingResource implements Manager {
return new Answer(cmd);
}
- protected Answer execute(final LoadBalancerCfgCommand cmd) {
-
- File tmpCfgFile = null;
- try {
- String cfgFilePath = "";
- String routerIP = null;
-
- if (cmd.getRouterIp() != null) {
- tmpCfgFile = File.createTempFile(cmd.getRouterIp().replace('.', '_'), "cfg");
- final PrintWriter out
- = new PrintWriter(new BufferedWriter(new FileWriter(tmpCfgFile)));
- for (int i=0; i < cmd.getConfig().length; i++) {
- out.println(cmd.getConfig()[i]);
- }
- out.close();
- cfgFilePath = tmpCfgFile.getAbsolutePath();
- routerIP = cmd.getRouterIp();
- }
-
- final String result = setLoadBalancerConfig(cfgFilePath,
- cmd.getAddFwRules(), cmd.getRemoveFwRules(),
- routerIP);
-
- return new Answer(cmd, result == null, result);
- } catch (final IOException e) {
- return new Answer(cmd, false, e.getMessage());
- } finally {
- if (tmpCfgFile != null) {
- tmpCfgFile.delete();
- }
- }
- }
-
protected Answer execute(final IPAssocCommand cmd) {
IpAddressTO[] ips = cmd.getIpAddresses();
String[] results = new String[cmd.getIpAddresses().length];
diff --git a/core/src/com/cloud/agent/transport/Request.java b/core/src/com/cloud/agent/transport/Request.java
index c8a3e22ad73..298eeed1107 100755
--- a/core/src/com/cloud/agent/transport/Request.java
+++ b/core/src/com/cloud/agent/transport/Request.java
@@ -19,14 +19,14 @@ package com.cloud.agent.transport;
import java.lang.reflect.Type;
import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.apache.log4j.Logger;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
-import com.cloud.agent.api.PingRoutingWithNwGroupsCommand;
-import com.cloud.agent.api.SecStorageFirewallCfgCommand;
import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig;
import com.cloud.exception.UnsupportedVersionException;
import com.cloud.storage.VolumeVO;
@@ -35,6 +35,14 @@ import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
import com.google.gson.reflect.TypeToken;
/**
@@ -64,8 +72,9 @@ public class Request {
public static Version get(final byte ver) throws UnsupportedVersionException {
for (final Version version : Version.values()) {
- if (ver == version.ordinal())
+ if (ver == version.ordinal()) {
return version;
+ }
}
throw new UnsupportedVersionException("Can't lookup version: " + ver, UnsupportedVersionException.UnknownVersion);
}
@@ -86,8 +95,8 @@ public class Request {
s_gBuilder.registerTypeAdapter(Answer[].class, new ArrayTypeAdaptor());
final Type listType = new TypeToken>() {}.getType();
s_gBuilder.registerTypeAdapter(listType, new VolListTypeAdaptor());
- s_gBuilder.registerTypeAdapter(new TypeToken>() {}.getType(), new SecStorageFirewallCfgCommand.PortConfigListTypeAdaptor());
- s_gBuilder.registerTypeAdapter(new TypeToken>() {}.getType(), new PingRoutingWithNwGroupsCommand.NwGroupsCommandTypeAdaptor());
+ s_gBuilder.registerTypeAdapter(new TypeToken>() {}.getType(), new PortConfigListTypeAdaptor());
+ s_gBuilder.registerTypeAdapter(new TypeToken>() {}.getType(), new NwGroupsCommandTypeAdaptor());
s_logger.info("Builder inited.");
}
@@ -368,4 +377,103 @@ public class Request {
public static boolean isControl(final byte[] bytes) {
return (bytes[3] & FLAG_CONTROL) > 0;
}
+
+ public static class NwGroupsCommandTypeAdaptor implements JsonDeserializer>, JsonSerializer> {
+ static final GsonBuilder s_gBuilder;
+ static {
+ s_gBuilder = Request.initBuilder();
+ }
+
+ public NwGroupsCommandTypeAdaptor() {
+ }
+
+ @Override
+ public JsonElement serialize(Pair src,
+ java.lang.reflect.Type typeOfSrc, JsonSerializationContext context) {
+ JsonArray array = new JsonArray();
+ Gson json = s_gBuilder.create();
+ if(src.first() != null) {
+ array.add(json.toJsonTree(src.first()));
+ } else {
+ array.add(new JsonNull());
+ }
+
+ if (src.second() != null) {
+ array.add(json.toJsonTree(src.second()));
+ } else {
+ array.add(new JsonNull());
+ }
+
+ return array;
+ }
+
+ @Override
+ public Pair deserialize(JsonElement json,
+ java.lang.reflect.Type type, JsonDeserializationContext context)
+ throws JsonParseException {
+ Pair pairs = new Pair(null, null);
+ JsonArray array = json.getAsJsonArray();
+ if (array.size() != 2) {
+ return pairs;
+ }
+ JsonElement element = array.get(0);
+ if (!element.isJsonNull()) {
+ pairs.first(element.getAsLong());
+ }
+
+ element = array.get(1);
+ if (!element.isJsonNull()) {
+ pairs.second(element.getAsLong());
+ }
+
+ return pairs;
+ }
+
+ }
+
+ public static class PortConfigListTypeAdaptor implements JsonDeserializer>, JsonSerializer> {
+ static final GsonBuilder s_gBuilder;
+ static {
+ s_gBuilder = Request.initBuilder();
+ }
+
+ static final Type listType = new TypeToken>() {}.getType();
+
+ public PortConfigListTypeAdaptor() {
+ }
+
+ @Override
+ public JsonElement serialize(List src, Type typeOfSrc, JsonSerializationContext context) {
+ if (src.size() == 0) {
+ s_logger.info("Returning JsonNull");
+ return new JsonNull();
+ }
+ Gson json = s_gBuilder.create();
+ s_logger.debug("Returning gson tree");
+ JsonArray array = new JsonArray();
+ for (PortConfig pc : src) {
+ array.add(json.toJsonTree(pc));
+ }
+
+ return array;
+ }
+
+ @Override
+ public List deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+ throws JsonParseException {
+ if (json.isJsonNull()) {
+ return new ArrayList();
+ }
+ Gson jsonp = s_gBuilder.create();
+ List pcs = new ArrayList();
+ JsonArray array = json.getAsJsonArray();
+ Iterator it = array.iterator();
+ while (it.hasNext()) {
+ JsonElement element = it.next();
+ pcs.add(jsonp.fromJson(element, PortConfig.class));
+ }
+ return pcs;
+ }
+
+ }
}
diff --git a/core/src/com/cloud/host/HostVO.java b/core/src/com/cloud/host/HostVO.java
index 53f0c6c5b7b..af1bea360a1 100644
--- a/core/src/com/cloud/host/HostVO.java
+++ b/core/src/com/cloud/host/HostVO.java
@@ -38,6 +38,7 @@ import javax.persistence.Transient;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;
@Entity
@@ -48,7 +49,7 @@ public class HostVO implements Host {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
- private Long id;
+ private long id;
@Column(name="disconnected")
@Temporal(value=TemporalType.TIMESTAMP)
@@ -144,7 +145,8 @@ public class HostVO implements Host {
return storageNetmaskDeux;
}
- public Long getClusterId() {
+ @Override
+ public Long getClusterId() {
return clusterId;
}
@@ -331,7 +333,7 @@ public class HostVO implements Host {
protected HostVO() {
}
- public HostVO(Long id,
+ public HostVO(long id,
String name,
Type type,
String privateIpAddress,
@@ -364,7 +366,7 @@ public class HostVO implements Host {
this.fsType = fsType;
}
- public HostVO(Long id,
+ public HostVO(long id,
String name,
Type type,
String privateIpAddress,
@@ -486,6 +488,7 @@ public class HostVO implements Host {
this.managementServerId = managementServerId;
}
+ @Override
public long getLastPinged() {
return lastPinged;
}
@@ -495,10 +498,12 @@ public class HostVO implements Host {
return parent;
}
+ @Override
public long getTotalSize() {
return totalSize;
}
+ @Override
public String getCapabilities() {
return caps;
}
@@ -508,10 +513,12 @@ public class HostVO implements Host {
return created;
}
+ @Override
public Date getRemoved() {
return removed;
}
+ @Override
public String getVersion() {
return version;
}
@@ -520,7 +527,8 @@ public class HostVO implements Host {
this.type = type;
}
- public Long getId() {
+ @Override
+ public long getId() {
return id;
}
@@ -544,10 +552,12 @@ public class HostVO implements Host {
return podId;
}
+ @Override
public Long getManagementServerId() {
return managementServerId;
}
+ @Override
public Date getDisconnectedOn() {
return disconnectedOn;
}
@@ -566,6 +576,7 @@ public class HostVO implements Host {
this.guid = guid;
}
+ @Override
public Integer getCpus() {
return cpus;
}
@@ -600,7 +611,7 @@ public class HostVO implements Host {
@Override
public int hashCode() {
- return id != null ? id.hashCode() : -1;
+ return NumbersUtil.hash(id);
}
@Override
@@ -614,7 +625,7 @@ public class HostVO implements Host {
@Override
public String toString() {
- return new StringBuilder(type.toString()).append("-").append(Long.toString(id)).append("-").append(name).toString();
+ return new StringBuilder(type.toString()).append("-").append(id).append("-").append(name).toString();
}
public void setHypervisorType(HypervisorType hypervisorType) {
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index bff6a33059a..e418f53974f 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -92,6 +92,7 @@ import com.cloud.agent.api.MigrateCommand;
import com.cloud.agent.api.ModifySshKeysCommand;
import com.cloud.agent.api.ModifyStoragePoolAnswer;
import com.cloud.agent.api.ModifyStoragePoolCommand;
+import com.cloud.agent.api.NetworkRulesSystemVmCommand;
import com.cloud.agent.api.PingCommand;
import com.cloud.agent.api.PingRoutingCommand;
import com.cloud.agent.api.PingRoutingWithNwGroupsCommand;
@@ -126,7 +127,6 @@ 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.IpAssocAnswer;
-import com.cloud.agent.api.routing.LoadBalancerCfgCommand;
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
import com.cloud.agent.api.routing.NetworkElementCommand;
import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand;
@@ -143,8 +143,6 @@ import com.cloud.agent.api.storage.CreatePrivateTemplateAnswer;
import com.cloud.agent.api.storage.DestroyCommand;
import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer;
import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
-import com.cloud.agent.api.storage.ShareAnswer;
-import com.cloud.agent.api.storage.ShareCommand;
import com.cloud.agent.api.to.IpAddressTO;
import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.PortForwardingRuleTO;
@@ -155,6 +153,7 @@ import com.cloud.dc.Vlan;
import com.cloud.exception.InternalErrorException;
import com.cloud.host.Host.Type;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.hypervisor.xen.resource.XenServerConnectionPool.XenServerConnection;
import com.cloud.network.HAProxyConfigurator;
import com.cloud.network.LoadBalancerConfigurator;
import com.cloud.network.Networks;
@@ -163,14 +162,16 @@ import com.cloud.network.Networks.IsolationType;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.ovs.OvsCreateGreTunnelAnswer;
import com.cloud.network.ovs.OvsCreateGreTunnelCommand;
+import com.cloud.network.ovs.OvsCreateTunnelAnswer;
+import com.cloud.network.ovs.OvsCreateTunnelCommand;
import com.cloud.network.ovs.OvsDeleteFlowCommand;
+import com.cloud.network.ovs.OvsDestroyTunnelCommand;
import com.cloud.network.ovs.OvsSetTagAndFlowAnswer;
import com.cloud.network.ovs.OvsSetTagAndFlowCommand;
import com.cloud.resource.ServerResource;
import com.cloud.storage.Storage;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Storage.StoragePoolType;
-import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.Volume;
import com.cloud.storage.Volume.VolumeType;
import com.cloud.storage.VolumeVO;
@@ -199,6 +200,7 @@ import com.xensource.xenapi.PIF;
import com.xensource.xenapi.Pool;
import com.xensource.xenapi.SR;
import com.xensource.xenapi.Session;
+import com.xensource.xenapi.Task;
import com.xensource.xenapi.Types;
import com.xensource.xenapi.Types.BadServerResponse;
import com.xensource.xenapi.Types.IpConfigurationMode;
@@ -284,12 +286,7 @@ public abstract class CitrixResourceBase implements ServerResource {
@Override
public void disconnected() {
- }
-
- protected VDI cloudVDIcopy(Connection conn, VDI vdi, SR sr) throws BadServerResponse, XenAPIException, XmlRpcException{
- return vdi.copy(conn, sr);
- }
-
+ }
protected Pair getVmByNameLabel(Connection conn, Host host, String nameLabel, boolean getRecord) throws XmlRpcException, XenAPIException {
Set vms = host.getResidentVMs(conn);
@@ -321,20 +318,19 @@ public abstract class CitrixResourceBase implements ServerResource {
return true;
}
-
+
protected boolean pingxenserver() {
- Connection conn = _connPool.slaveConnect(_host.ip, _username, _password);
- if ( conn == null ) {
- return false;
- } else {
- try {
- Session.localLogout(conn);
- } catch (Exception e) {
-
- }
- conn.dispose();
+ XenServerConnection conn = (XenServerConnection) getConnection();
+ try {
+ Host host = Host.getByUuid(conn, _host.uuid);
+ host.enable(conn);
+ return true;
+ } catch (Exception e) {
+ String msg = "Catch Exception " + e.getClass().getName() + " : Enable host(" + _host.uuid + ") in pool(" + conn.getPoolUuid() + ") failed due to "
+ + e.toString();
+ s_logger.warn(msg);
}
- return true;
+ return false;
}
protected String logX(XenAPIObject obj, String msg) {
@@ -349,8 +345,6 @@ public abstract class CitrixResourceBase implements ServerResource {
return execute((CreateCommand) cmd);
} else if (cmd instanceof SetPortForwardingRulesCommand) {
return execute((SetPortForwardingRulesCommand) cmd);
- } else if (cmd instanceof LoadBalancerCfgCommand) {
- return execute((LoadBalancerCfgCommand) cmd);
} else if (cmd instanceof LoadBalancerConfigCommand) {
return execute((LoadBalancerConfigCommand) cmd);
} else if (cmd instanceof IPAssocCommand) {
@@ -387,8 +381,6 @@ public abstract class CitrixResourceBase implements ServerResource {
return execute((MigrateCommand) cmd);
} else if (cmd instanceof DestroyCommand) {
return execute((DestroyCommand) cmd);
- } else if (cmd instanceof ShareCommand) {
- return execute((ShareCommand) cmd);
} else if (cmd instanceof ModifyStoragePoolCommand) {
return execute((ModifyStoragePoolCommand) cmd);
} else if (cmd instanceof DeleteStoragePoolCommand) {
@@ -449,6 +441,12 @@ public abstract class CitrixResourceBase implements ServerResource {
return execute((OvsDeleteFlowCommand)cmd);
} else if (cmd instanceof CleanupNetworkRulesCmd){
return execute((CleanupNetworkRulesCmd)cmd);
+ } else if (cmd instanceof NetworkRulesSystemVmCommand) {
+ return execute((NetworkRulesSystemVmCommand)cmd);
+ } else if (cmd instanceof OvsCreateTunnelCommand) {
+ return execute((OvsCreateTunnelCommand)cmd);
+ } else if (cmd instanceof OvsDestroyTunnelCommand) {
+ return execute((OvsDestroyTunnelCommand)cmd);
} else {
return Answer.createUnsupportedCommandAnswer(cmd);
}
@@ -517,10 +515,12 @@ public abstract class CitrixResourceBase implements ServerResource {
vifr.network = nw;
dom0vif = VIF.create(conn, vifr);
dom0vif.plug(conn);
+ dom0vif.unplug(conn);
} else {
s_logger.debug("already have a vif on dom0 for " + networkDesc);
if (!dom0vif.getCurrentlyAttached(conn)) {
dom0vif.plug(conn);
+ dom0vif.unplug(conn);
}
}
}
@@ -553,6 +553,29 @@ public abstract class CitrixResourceBase implements ServerResource {
return null;
}
+ private synchronized Network createTunnelNetwork(Connection conn, long account) {
+ try {
+ String nwName = "OVSTunnel" + account;
+ Network nw = null;
+ Network.Record rec = new Network.Record();
+ Set networks = Network.getByNameLabel(conn, nwName);
+
+ if (networks.size() == 0) {
+ rec.nameDescription = "tunnel network for account " + account;
+ rec.nameLabel = nwName;
+ nw = Network.create(conn, rec);
+ } else {
+ nw = networks.iterator().next();
+ }
+
+ enableXenServerNetwork(conn, nw, "OVSTunnel", "tunnel network for account " + account);
+ return nw;
+ } catch (Exception e) {
+ s_logger.warn("create tunnel network failed", e);
+ return null;
+ }
+ }
+
protected Network getNetwork(Connection conn, NicTO nic) throws XenAPIException, XmlRpcException {
Pair network = getNativeNetworkForTraffic(conn, nic.getType());
if (nic.getBroadcastUri() != null && nic.getBroadcastUri().toString().contains("untagged")) {
@@ -565,7 +588,13 @@ public abstract class CitrixResourceBase implements ServerResource {
} else if (nic.getBroadcastType() == BroadcastDomainType.Native || nic.getBroadcastType() == BroadcastDomainType.LinkLocal) {
return network.first();
} else if (nic.getBroadcastType() == BroadcastDomainType.Vswitch) {
- return setupvSwitchNetwork(conn);
+ URI broadcastUri = nic.getBroadcastUri();
+ if (broadcastUri.getHost().equalsIgnoreCase("vlan")) {
+ return setupvSwitchNetwork(conn);
+ } else {
+ long account = Long.parseLong(broadcastUri.getHost());
+ return createTunnelNetwork(conn, account);
+ }
}
throw new CloudRuntimeException("Unable to support this type of network broadcast domain: " + nic.getBroadcastUri());
@@ -745,7 +774,9 @@ public abstract class CitrixResourceBase implements ServerResource {
if (vmSpec.getBootloader() == BootloaderType.CD) {
vm.setPVBootloader(conn, "eliloader");
Map otherConfig = vm.getOtherConfig(conn);
- otherConfig.put( "install-repository", "cdrom");
+ if ( ! vm.getOtherConfig(conn).containsKey("install-repository") ) {
+ otherConfig.put( "install-repository", "cdrom");
+ }
vm.setOtherConfig(conn, otherConfig);
} else if (vmSpec.getBootloader() == BootloaderType.PyGrub ){
vm.setPVBootloader(conn, "pygrub");
@@ -930,16 +961,6 @@ public abstract class CitrixResourceBase implements ServerResource {
}
}
}
- if (vmSpec.getType() == VirtualMachine.Type.DomainRouter) {
- // Create network usage rules for domR
- NicTO[] nics = vmSpec.getNics();
- for (NicTO nic : nics) {
- if(nic.getType() == TrafficType.Control){
- networkUsage(conn, nic.getIp(), "create", null);
- break;
- }
- }
- }
state = State.Running;
return new StartAnswer(cmd);
@@ -1094,63 +1115,6 @@ public abstract class CitrixResourceBase implements ServerResource {
return new SetPortForwardingRulesAnswer(cmd, results);
}
- protected Answer execute(final LoadBalancerCfgCommand cmd) {
- Connection conn = getConnection();
- String routerIp = cmd.getRouterIp();
-
- if (routerIp == null) {
- return new Answer(cmd);
- }
-
- String tmpCfgFilePath = "/tmp/" + cmd.getRouterIp().replace('.', '_') + ".cfg";
- String tmpCfgFileContents = "";
- for (int i = 0; i < cmd.getConfig().length; i++) {
- tmpCfgFileContents += cmd.getConfig()[i];
- tmpCfgFileContents += "\n";
- }
-
- String result = callHostPlugin(conn, "vmops", "createFile", "filepath", tmpCfgFilePath, "filecontents", tmpCfgFileContents);
-
- if (result == null || result.isEmpty()) {
- return new Answer(cmd, false, "LoadBalancerCfgCommand failed to create HA proxy cfg file.");
- }
-
- String[] addRules = cmd.getAddFwRules();
- String[] removeRules = cmd.getRemoveFwRules();
-
- String args = "";
- args += "-i " + routerIp;
- args += " -f " + tmpCfgFilePath;
-
- StringBuilder sb = new StringBuilder();
- if (addRules.length > 0) {
- for (int i = 0; i < addRules.length; i++) {
- sb.append(addRules[i]).append(',');
- }
-
- args += " -a " + sb.toString();
- }
-
- sb = new StringBuilder();
- if (removeRules.length > 0) {
- for (int i = 0; i < removeRules.length; i++) {
- sb.append(removeRules[i]).append(',');
- }
-
- args += " -d " + sb.toString();
- }
-
- result = callHostPlugin(conn, "vmops", "setLoadBalancerRule", "args", args);
-
- if (result == null || result.isEmpty()) {
- return new Answer(cmd, false, "LoadBalancerCfgCommand failed");
- }
-
- callHostPlugin(conn, "vmops", "deleteFile", "filepath", tmpCfgFilePath);
-
- return new Answer(cmd);
- }
-
protected Answer execute(final LoadBalancerConfigCommand cmd) {
Connection conn = getConnection();
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
@@ -1316,7 +1280,7 @@ public abstract class CitrixResourceBase implements ServerResource {
}
protected void assignPublicIpAddress(Connection conn, final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, final boolean firstIP,
- final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress, String guestIp) throws InternalErrorException {
+ final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress, String guestIp, Integer networkRate) throws InternalErrorException {
try {
VM router = getVM(conn, vmName);
@@ -1355,7 +1319,7 @@ public abstract class CitrixResourceBase implements ServerResource {
nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(vlanId));
}
nic.setDeviceId(Integer.parseInt(vifDeviceNum));
- nic.setNetworkRateMbps(200);
+ nic.setNetworkRateMbps(networkRate);
correctVif = createVif(conn, vmName, router, nic);
correctVif.plug(conn);
@@ -1394,11 +1358,6 @@ public abstract class CitrixResourceBase implements ServerResource {
args += " -g ";
args += vlanGateway;
- if(guestIp!=null){
- args += " -G ";
- args += guestIp;
- }
-
String result = callHostPlugin(conn, "vmops", "ipassoc", "args", args);
if (result == null || result.isEmpty()) {
throw new InternalErrorException("Xen plugin \"ipassoc\" failed.");
@@ -1448,7 +1407,7 @@ public abstract class CitrixResourceBase implements ServerResource {
for (IpAddressTO ip : ips) {
assignPublicIpAddress(conn, routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getVlanId(),
- ip.getVlanGateway(), ip.getVlanNetmask(), ip.getVifMacAddress(), ip.getGuestIp());
+ ip.getVlanGateway(), ip.getVlanNetmask(), ip.getVifMacAddress(), ip.getGuestIp(), ip.getNetworkRate());
results[i++] = ip.getPublicIp() + " - success";
}
} catch (InternalErrorException e) {
@@ -2670,25 +2629,49 @@ public abstract class CitrixResourceBase implements ServerResource {
vm.setMemoryDynamicMax(conn, memsize);
vm.setMemoryStaticMax(conn, memsize);
}
-
- void shutdownVM(Connection conn, VM vm, String vmName) throws XmlRpcException {
- try {
- vm.cleanShutdown(conn);
- } catch (Types.XenAPIException e) {
- s_logger.debug("Unable to cleanShutdown VM(" + vmName + ") on host(" + _host.uuid +") due to " + e.toString() + ", try hard shutdown");
+
+ private void waitForTask(Connection c, Task task, long pollInterval, long timeout) throws XenAPIException, XmlRpcException {
+ long beginTime = System.currentTimeMillis();
+ while (task.getStatus(c) == Types.TaskStatusType.PENDING) {
try {
- vm.hardShutdown(conn);
- } catch (Exception e1) {
- String msg = "Unable to hardShutdown VM(" + vmName + ") on host(" + _host.uuid +") due to " + e.toString();
- s_logger.warn(msg, e1);
- throw new CloudRuntimeException(msg);
+ Thread.sleep(pollInterval);
+ } catch (InterruptedException e) {
+ }
+ if( System.currentTimeMillis() - beginTime > timeout){
+ String msg = "Async " + timeout/100 + " seconds timeout for task " + task.toString();
+ s_logger.warn(msg);
+ task.cancel(c);
+ throw new Types.BadAsyncResult(msg);
}
}
}
+ private void checkForSuccess(Connection c, Task task) throws XenAPIException, XmlRpcException {
+ if (task.getStatus(c) == Types.TaskStatusType.SUCCESS) {
+ return;
+ } else {
+ String msg = "Task failed! Task record:\n" + task.getRecord(c);
+ s_logger.warn(msg);
+ task.cancel(c);
+ throw new Types.BadAsyncResult(msg);
+ }
+ }
+
void rebootVM(Connection conn, VM vm, String vmName) throws XmlRpcException {
+ Task task = null;
try {
- vm.cleanReboot(conn);
+ task = vm.cleanRebootAsync(conn);
+ try {
+ //poll every 1 seconds , timeout after 10 minutes
+ waitForTask(conn, task, 1000, 10 * 60 * 1000);
+ checkForSuccess(conn, task);
+ } catch (Types.HandleInvalid e) {
+ if (vm.getPowerState(conn) == Types.VmPowerState.RUNNING) {
+ task = null;
+ return;
+ }
+ throw new CloudRuntimeException("Reboot VM catch HandleInvalid and VM is not in RUNNING state");
+ }
} catch (XenAPIException e) {
s_logger.debug("Unable to Clean Reboot VM(" + vmName + ") on host(" + _host.uuid +") due to " + e.toString() + ", try hard reboot");
try {
@@ -2698,26 +2681,196 @@ public abstract class CitrixResourceBase implements ServerResource {
s_logger.warn(msg, e1);
throw new CloudRuntimeException(msg);
}
+ }finally {
+ if( task != null) {
+ try {
+ task.destroy(conn);
+ } catch (Exception e1) {
+ s_logger.debug("unable to destroy task(" + task.toString() + ") on host(" + _host.uuid +") due to " + e1.toString());
+ }
+ }
+ }
+ }
+
+ void shutdownVM(Connection conn, VM vm, String vmName) throws XmlRpcException {
+ Task task = null;
+ try {
+ task = vm.cleanShutdownAsync(conn);
+ try {
+ //poll every 1 seconds , timeout after 10 minutes
+ waitForTask(conn, task, 1000, 10 * 60 * 1000);
+ checkForSuccess(conn, task);
+ } catch (Types.HandleInvalid e) {
+ if (vm.getPowerState(conn) == Types.VmPowerState.HALTED) {
+ task = null;
+ return;
+ }
+ throw new CloudRuntimeException("Shutdown VM catch HandleInvalid and VM is not in HALTED state");
+ }
+ } catch (XenAPIException e) {
+ s_logger.debug("Unable to cleanShutdown VM(" + vmName + ") on host(" + _host.uuid +") due to " + e.toString());
+ try {
+ vm.hardShutdown(conn);
+ return;
+ } catch (Exception e1) {
+ String msg = "Unable to hardShutdown VM(" + vmName + ") on host(" + _host.uuid +") due to " + e.toString();
+ s_logger.warn(msg, e1);
+ throw new CloudRuntimeException(msg);
+ }
+ }finally {
+ if( task != null) {
+ try {
+ task.destroy(conn);
+ } catch (Exception e1) {
+ s_logger.debug("unable to destroy task(" + task.toString() + ") on host(" + _host.uuid +") due to " + e1.toString());
+ }
+ }
}
}
void startVM(Connection conn, Host host, VM vm, String vmName) throws XmlRpcException {
+ Task task = null;
try {
- vm.startOn(conn, host, false, true);
- } catch (Exception e) {
+ task = vm.startOnAsync(conn, host, false, true);
+ try {
+ //poll every 1 seconds , timeout after 10 minutes
+ waitForTask(conn, task, 1000, 10 * 60 * 1000);
+ checkForSuccess(conn, task);
+ } catch (Types.HandleInvalid e) {
+ if (vm.getPowerState(conn) == Types.VmPowerState.RUNNING) {
+ task = null;
+ return;
+ }
+ throw new CloudRuntimeException("Shutdown VM catch HandleInvalid and VM is not in RUNNING state");
+ }
+ } catch (XenAPIException e) {
String msg = "Unable to start VM(" + vmName + ") on host(" + _host.uuid +") due to " + e.toString();
s_logger.warn(msg, e);
throw new CloudRuntimeException(msg);
+ }finally {
+ if( task != null) {
+ try {
+ task.destroy(conn);
+ } catch (Exception e1) {
+ s_logger.debug("unable to destroy task(" + task.toString() + ") on host(" + _host.uuid +") due to " + e1.toString());
+ }
+ }
}
}
-
+
+ protected VDI cloudVDIcopy(Connection conn, VDI vdi, SR sr) throws XenAPIException, XmlRpcException {
+ Task task = null;
+ try {
+ task = vdi.copyAsync(conn, sr);
+ // poll every 5 seconds , timeout after 2 hours
+ waitForTask(conn, task, 5 * 1000, 2 * 60 * 60 * 1000);
+ checkForSuccess(conn, task);
+ VDI dvdi = Types.toVDI(task, conn);
+ return dvdi;
+ } finally {
+ if (task != null) {
+ try {
+ task.destroy(conn);
+ } catch (Exception e1) {
+ s_logger.warn("unable to destroy task(" + task.toString() + ") on host(" + _host.uuid + ") due to "
+ + e1.toString());
+ }
+ }
+ }
+ }
+
+ protected String backupSnapshot(Connection conn, String primaryStorageSRUuid, Long dcId, Long accountId,
+ Long volumeId, String secondaryStorageMountPath, String snapshotUuid, String prevBackupUuid, Boolean isISCSI) {
+ String backupSnapshotUuid = null;
+
+ if (prevBackupUuid == null) {
+ prevBackupUuid = "";
+ }
+
+ // Each argument is put in a separate line for readability.
+ // Using more lines does not harm the environment.
+ String results = callHostPluginAsync(conn, "vmopsSnapshot", "backupSnapshot", 60 * 60 * 1000,
+ "primaryStorageSRUuid", primaryStorageSRUuid, "dcId", dcId.toString(), "accountId", accountId
+ .toString(), "volumeId", volumeId.toString(), "secondaryStorageMountPath",
+ secondaryStorageMountPath, "snapshotUuid", snapshotUuid, "prevBackupUuid", prevBackupUuid, "isISCSI",
+ isISCSI.toString());
+
+ if (results == null || results.isEmpty()) {
+ // errString is already logged.
+ return null;
+ }
+
+ String[] tmp = results.split("#");
+ String status = tmp[0];
+ backupSnapshotUuid = tmp[1];
+
+ // status == "1" if and only if backupSnapshotUuid != null
+ // So we don't rely on status value but return backupSnapshotUuid as an
+ // indicator of success.
+ String failureString = "Could not copy backupUuid: " + backupSnapshotUuid + " of volumeId: " + volumeId
+ + " from primary storage " + primaryStorageSRUuid + " to secondary storage "
+ + secondaryStorageMountPath;
+ if (status != null && status.equalsIgnoreCase("1") && backupSnapshotUuid != null) {
+ s_logger.debug("Successfully copied backupUuid: " + backupSnapshotUuid + " of volumeId: " + volumeId
+ + " to secondary storage");
+ } else {
+ s_logger.debug(failureString + ". Failed with status: " + status);
+ return null;
+ }
+ return backupSnapshotUuid;
+ }
+
+ protected String callHostPluginAsync(Connection conn, String plugin, String cmd, int timeout, String... params) {
+ Map args = new HashMap();
+ Task task = null;
+ try {
+ for (int i = 0; i < params.length; i += 2) {
+ args.put(params[i], params[i + 1]);
+ }
+ if (s_logger.isTraceEnabled()) {
+ s_logger.trace("callHostPlugin executing for command " + cmd + " with " + getArgsString(args));
+ }
+ Host host = Host.getByUuid(conn, _host.uuid);
+ task = host.callPluginAsync(conn, plugin, cmd, args);
+ // poll every 60 seconds
+ waitForTask(conn, task, 20 * 1000, timeout);
+ checkForSuccess(conn, task);
+ String result = task.getResult(conn);
+ if (s_logger.isTraceEnabled()) {
+ s_logger.trace("callHostPlugin Result: " + result);
+ }
+ return result.replace("", "").replace("", "").replace("\n", "");
+ } catch (Types.HandleInvalid e) {
+ s_logger.warn("callHostPlugin failed for cmd: " + cmd + " with args " + getArgsString(args)
+ + " due to HandleInvalid clazz:" + e.clazz + ", handle:" + e.handle);
+ } catch (XenAPIException e) {
+ s_logger.warn("callHostPlugin failed for cmd: " + cmd + " with args " + getArgsString(args) + " due to "
+ + e.toString(), e);
+ } catch (XmlRpcException e) {
+ s_logger.warn("callHostPlugin failed for cmd: " + cmd + " with args " + getArgsString(args) + " due to "
+ + e.getMessage(), e);
+ } finally {
+ if (task != null) {
+ try {
+ task.destroy(conn);
+ } catch (Exception e1) {
+ s_logger.warn("unable to destroy task(" + task.toString() + ") on host(" + _host.uuid + ") due to "
+ + e1.toString());
+ }
+ }
+ }
+ return null;
+ }
+
protected StopAnswer execute(final StopCommand cmd) {
Connection conn = getConnection();
String vmName = cmd.getVmName();
try {
Set vms = VM.getByNameLabel(conn, vmName);
// stop vm which is running on this host or is in halted state
- for (VM vm : vms) {
+ Iterator iter = vms.iterator();
+ while ( iter.hasNext() ) {
+ VM vm = iter.next();
VM.Record vmr = vm.getRecord(conn);
if (vmr.powerState != VmPowerState.RUNNING) {
continue;
@@ -2728,7 +2881,7 @@ public abstract class CitrixResourceBase implements ServerResource {
if (vmr.residentOn.getUuid(conn).equals(_host.uuid)) {
continue;
}
- vms.remove(vm);
+ iter.remove();
}
if (vms.size() == 0) {
@@ -3846,6 +3999,52 @@ public abstract class CitrixResourceBase implements ServerResource {
return Boolean.valueOf(callHostPlugin(conn, "vmops", "can_bridge_firewall", "host_uuid", _host.uuid));
}
+ private Answer execute(OvsDestroyTunnelCommand cmd) {
+ Connection conn = getConnection();
+ try {
+ Network nw = createTunnelNetwork(conn, cmd.getAccount());
+ if (nw == null) {
+ return new Answer(cmd, false, "No network found");
+ }
+
+ String bridge = nw.getBridge(conn);
+ String result = callHostPlugin(conn, "ovstunnel", "destroy_tunnel", "bridge", bridge, "in_port", cmd.getInPortName());
+ if (result.equalsIgnoreCase("SUCCESS")) {
+ return new Answer(cmd, true, result);
+ } else {
+ return new Answer(cmd, false, result);
+ }
+ } catch (Exception e) {
+ s_logger.warn("caught execption when destroy ovs tunnel", e);
+ return new Answer(cmd, false, e.getMessage());
+ }
+ }
+
+ private OvsCreateTunnelAnswer execute(OvsCreateTunnelCommand cmd) {
+ Connection conn = getConnection();
+ String bridge = "unknown";
+ try {
+ Network nw = createTunnelNetwork(conn, cmd.getAccount());
+ if (nw == null) {
+ return new OvsCreateTunnelAnswer(cmd, false, "Cannot create network", bridge);
+ }
+
+ bridge = nw.getBridge(conn);
+ String result = callHostPlugin(conn, "ovstunnel", "create_tunnel", "bridge", bridge, "remote_ip", cmd.getRemoteIp(), "key", cmd.getKey(), "from", cmd.getFrom().toString(), "to", cmd
+ .getTo().toString());
+
+ String[] res = result.split(":");
+ if (res.length == 2 && res[0].equalsIgnoreCase("SUCCESS")) {
+ return new OvsCreateTunnelAnswer(cmd, true, result, res[1], bridge);
+ } else {
+ return new OvsCreateTunnelAnswer(cmd, false, result, bridge);
+ }
+ } catch (Exception e) {
+ s_logger.warn("caught execption when creating ovs tunnel", e);
+ return new OvsCreateTunnelAnswer(cmd, false, e.getMessage(), bridge);
+ }
+ }
+
private Answer execute(OvsDeleteFlowCommand cmd) {
_isOvs = true;
@@ -3983,15 +4182,14 @@ public abstract class CitrixResourceBase implements ServerResource {
protected Answer execute(DeleteStoragePoolCommand cmd) {
Connection conn = getConnection();
- StoragePoolVO pool = cmd.getPool();
- StorageFilerTO poolTO = new StorageFilerTO(pool);
+ StorageFilerTO poolTO = cmd.getPool();
try {
SR sr = getStorageRepository(conn, poolTO);
removeSR(conn, sr);
Answer answer = new Answer(cmd, true, "success");
return answer;
} catch (Exception e) {
- String msg = "DeleteStoragePoolCommand XenAPIException:" + e.getMessage() + " host:" + _host.uuid + " pool: " + pool.getName() + pool.getHostAddress() + pool.getPath();
+ String msg = "DeleteStoragePoolCommand XenAPIException:" + e.getMessage() + " host:" + _host.uuid + " pool: " + poolTO.getHost() + poolTO.getPath();
s_logger.warn(msg, e);
return new Answer(cmd, false, msg);
}
@@ -4553,30 +4751,10 @@ public abstract class CitrixResourceBase implements ServerResource {
return new Answer(cmd, true, "Success");
}
- public ShareAnswer execute(final ShareCommand cmd) {
- Connection conn = getConnection();
- if (!cmd.isShare()) {
- SR sr = getISOSRbyVmName(conn, cmd.getVmName());
- try {
- if (sr != null) {
- Set vms = VM.getByNameLabel(conn, cmd.getVmName());
- if (vms.size() == 0) {
- removeSR(conn, sr);
- }
- }
- } catch (Exception e) {
- String msg = "SR.getNameLabel failed due to " + e.getMessage() + e.toString();
- s_logger.warn(msg);
- }
- }
- return new ShareAnswer(cmd, new HashMap());
- }
-
public CopyVolumeAnswer execute(final CopyVolumeCommand cmd) {
Connection conn = getConnection();
String volumeUUID = cmd.getVolumePath();
- StoragePoolVO pool = cmd.getPool();
- StorageFilerTO poolTO = new StorageFilerTO(pool);
+ StorageFilerTO poolTO = cmd.getPool();
String secondaryStorageURL = cmd.getSecondaryStorageURL();
URI uri = null;
@@ -5099,10 +5277,12 @@ public abstract class CitrixResourceBase implements ServerResource {
String secondaryStoragePoolURL = cmd.getSecondaryStoragePoolURL();
String snapshotUuid = cmd.getSnapshotUuid(); // not null: Precondition.
String prevBackupUuid = cmd.getPrevBackupUuid();
+ String prevSnapshotUuid = cmd.getPrevSnapshotUuid();
// By default assume failure
String details = null;
boolean success = false;
String snapshotBackupUuid = null;
+ boolean fullbackup = true;
try {
SR primaryStorageSR = getSRByNameLabelandHost(conn, primaryStorageNameLabel);
if (primaryStorageSR == null) {
@@ -5111,22 +5291,30 @@ public abstract class CitrixResourceBase implements ServerResource {
URI uri = new URI(secondaryStoragePoolURL);
String secondaryStorageMountPath = uri.getHost() + ":" + uri.getPath();
-
+ VDI snapshotVdi = getVDIbyUuid(conn, snapshotUuid);
- if (prevBackupUuid == null) {
+ if ( prevBackupUuid != null ) {
+ try {
+ VDI preSnapshotVdi = getVDIbyUuid(conn, prevSnapshotUuid);
+ if ( snapshotVdi.getParent(conn).getParent(conn) == preSnapshotVdi.getParent(conn) ) {
+ fullbackup = false;
+ }
+ } catch (Exception e) {
+ }
+ }
+
+ if (fullbackup) {
// the first snapshot is always a full snapshot
String folder = "snapshots/" + accountId + "/" + volumeId;
if( !createSecondaryStorageFolder(conn, secondaryStorageMountPath, folder)) {
details = " Filed to create folder " + folder + " in secondary storage";
s_logger.warn(details);
- return new BackupSnapshotAnswer(cmd, success, details, snapshotBackupUuid);
+ return new BackupSnapshotAnswer(cmd, false, details, null, false);
}
-
String snapshotMountpoint = secondaryStoragePoolURL + "/" + folder;
SR snapshotSr = null;
try {
snapshotSr = createNfsSRbyURI(conn, new URI(snapshotMountpoint), false);
- VDI snapshotVdi = getVDIbyUuid(conn, snapshotUuid);
VDI backedVdi = cloudVDIcopy(conn, snapshotVdi, snapshotSr);
snapshotBackupUuid = backedVdi.getUuid(conn);
success = true;
@@ -5136,21 +5324,16 @@ public abstract class CitrixResourceBase implements ServerResource {
}
}
} else {
- String primaryStorageSRUuid = primaryStorageSR.getUuid(conn);
- Boolean isISCSI = IsISCSI(primaryStorageSR.getType(conn));
- snapshotBackupUuid = backupSnapshot(conn, primaryStorageSRUuid, dcId, accountId, volumeId, secondaryStorageMountPath,
- snapshotUuid, prevBackupUuid, isISCSI);
- success = (snapshotBackupUuid != null);
+ String primaryStorageSRUuid = primaryStorageSR.getUuid(conn);
+ Boolean isISCSI = IsISCSI(primaryStorageSR.getType(conn));
+ snapshotBackupUuid = backupSnapshot(conn, primaryStorageSRUuid, dcId, accountId, volumeId, secondaryStorageMountPath, snapshotUuid, prevBackupUuid, isISCSI);
+ success = (snapshotBackupUuid != null);
}
-
if (success) {
details = "Successfully backedUp the snapshotUuid: " + snapshotUuid + " to secondary storage.";
-
String volumeUuid = cmd.getVolumePath();
destroySnapshotOnPrimaryStorageExceptThis(conn, volumeUuid, snapshotUuid);
-
}
-
} catch (XenAPIException e) {
details = "BackupSnapshot Failed due to " + e.toString();
s_logger.warn(details, e);
@@ -5159,7 +5342,7 @@ public abstract class CitrixResourceBase implements ServerResource {
s_logger.warn(details, e);
}
- return new BackupSnapshotAnswer(cmd, success, details, snapshotBackupUuid);
+ return new BackupSnapshotAnswer(cmd, success, details, snapshotBackupUuid, fullbackup);
}
protected CreateVolumeFromSnapshotAnswer execute(final CreateVolumeFromSnapshotCommand cmd) {
@@ -5254,7 +5437,7 @@ public abstract class CitrixResourceBase implements ServerResource {
}
}
}
- return new DeleteSnapshotBackupAnswer(cmd, success, details);
+ return new DeleteSnapshotBackupAnswer(cmd, true, details);
}
protected Answer execute(DeleteSnapshotsDirCommand cmd) {
@@ -5505,48 +5688,7 @@ public abstract class CitrixResourceBase implements ServerResource {
}
return success;
- }
-
- // Each argument is put in a separate line for readability.
- // Using more lines does not harm the environment.
- protected String backupSnapshot(Connection conn, String primaryStorageSRUuid, Long dcId, Long accountId, Long volumeId, String secondaryStorageMountPath,
- String snapshotUuid, String prevBackupUuid, Boolean isISCSI) {
- String backupSnapshotUuid = null;
-
- if (prevBackupUuid == null) {
- prevBackupUuid = "";
- }
-
- // Each argument is put in a separate line for readability.
- // Using more lines does not harm the environment.
- String results = callHostPluginWithTimeOut(conn, "vmopsSnapshot", "backupSnapshot", 110*60, "primaryStorageSRUuid", primaryStorageSRUuid, "dcId",
- dcId.toString(), "accountId", accountId.toString(), "volumeId", volumeId.toString(), "secondaryStorageMountPath",
- secondaryStorageMountPath, "snapshotUuid", snapshotUuid, "prevBackupUuid", prevBackupUuid, "isISCSI", isISCSI.toString());
-
- if (results == null || results.isEmpty()) {
- // errString is already logged.
- return null;
- }
-
- String[] tmp = results.split("#");
- String status = tmp[0];
- backupSnapshotUuid = tmp[1];
-
- // status == "1" if and only if backupSnapshotUuid != null
- // So we don't rely on status value but return backupSnapshotUuid as an
- // indicator of success.
- String failureString = "Could not copy backupUuid: " + backupSnapshotUuid + " of volumeId: " + volumeId + " from primary storage " + primaryStorageSRUuid
- + " to secondary storage " + secondaryStorageMountPath;
- if (status != null && status.equalsIgnoreCase("1") && backupSnapshotUuid != null) {
- s_logger.debug("Successfully copied backupUuid: " + backupSnapshotUuid + " of volumeId: " + volumeId + " to secondary storage");
- } else {
- s_logger.debug(failureString + ". Failed with status: " + status);
- return null;
- }
-
- return backupSnapshotUuid;
- }
-
+ }
protected String getVhdParent(Connection conn, String primaryStorageSRUuid, String snapshotUuid, Boolean isISCSI) {
String parentUuid = callHostPlugin(conn, "vmopsSnapshot", "getVhdParent", "primaryStorageSRUuid", primaryStorageSRUuid,
@@ -5745,4 +5887,17 @@ public abstract class CitrixResourceBase implements ServerResource {
protected String getGuestOsType(String stdType, boolean bootFromCD) {
return stdType;
}
+
+ private Answer execute(NetworkRulesSystemVmCommand cmd) {
+ boolean success = true;
+ Connection conn = getConnection();
+ if (cmd.getType() != VirtualMachine.Type.User) {
+ String result = callHostPlugin(conn, "vmops", "default_network_rules_systemvm", "vmName", cmd.getVmName());
+ if (result == null || result.isEmpty() || !Boolean.parseBoolean(result)) {
+ success = false;
+ }
+ }
+
+ return new Answer(cmd, success, "");
+ }
}
diff --git a/core/src/com/cloud/network/NetworkEnums.java b/core/src/com/cloud/network/NetworkEnums.java
deleted file mode 100644
index 100507d30f8..00000000000
--- a/core/src/com/cloud/network/NetworkEnums.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.network;
-
-/**
- * @author chiradeep
- *
- */
-public class NetworkEnums {
- public enum RouterPrivateIpStrategy {
- None,
- DcGlobal, //global to data center
- HostLocal;
-
- public static String DummyPrivateIp = "169.254.1.1";
- }
-}
diff --git a/core/src/com/cloud/storage/VMTemplateHostVO.java b/core/src/com/cloud/storage/VMTemplateHostVO.java
index 77cbe8d8dd7..9b558c63a0e 100755
--- a/core/src/com/cloud/storage/VMTemplateHostVO.java
+++ b/core/src/com/cloud/storage/VMTemplateHostVO.java
@@ -18,19 +18,19 @@
package com.cloud.storage;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
import com.cloud.utils.db.GenericDaoBase;
/**
@@ -95,7 +95,8 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc {
@Column(name="destroyed")
boolean destroyed = false;
- public String getInstallPath() {
+ @Override
+ public String getInstallPath() {
return installPath;
}
@@ -107,47 +108,58 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc {
this.hostId = hostId;
}
- public long getTemplateId() {
+ @Override
+ public long getTemplateId() {
return templateId;
}
- public void setTemplateId(long templateId) {
+ @Override
+ public void setTemplateId(long templateId) {
this.templateId = templateId;
}
- public int getDownloadPercent() {
+ @Override
+ public int getDownloadPercent() {
return downloadPercent;
}
- public void setDownloadPercent(int downloadPercent) {
+ @Override
+ public void setDownloadPercent(int downloadPercent) {
this.downloadPercent = downloadPercent;
}
- public void setDownloadState(Status downloadState) {
+ @Override
+ public void setDownloadState(Status downloadState) {
this.downloadState = downloadState;
}
- public Long getId() {
+ @Override
+ public long getId() {
return id;
}
- public Date getCreated() {
+ @Override
+ public Date getCreated() {
return created;
}
- public Date getLastUpdated() {
+ @Override
+ public Date getLastUpdated() {
return lastUpdated;
}
- public void setLastUpdated(Date date) {
+ @Override
+ public void setLastUpdated(Date date) {
lastUpdated = date;
}
- public void setInstallPath(String installPath) {
+ @Override
+ public void setInstallPath(String installPath) {
this.installPath = installPath;
}
- public Status getDownloadState() {
+ @Override
+ public Status getDownloadState() {
return downloadState;
}
@@ -178,27 +190,33 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc {
}
- public void setLocalDownloadPath(String localPath) {
+ @Override
+ public void setLocalDownloadPath(String localPath) {
this.localDownloadPath = localPath;
}
- public String getLocalDownloadPath() {
+ @Override
+ public String getLocalDownloadPath() {
return localDownloadPath;
}
- public void setErrorString(String errorString) {
+ @Override
+ public void setErrorString(String errorString) {
this.errorString = errorString;
}
- public String getErrorString() {
+ @Override
+ public String getErrorString() {
return errorString;
}
- public void setJobId(String jobId) {
+ @Override
+ public void setJobId(String jobId) {
this.jobId = jobId;
}
- public String getJobId() {
+ @Override
+ public String getJobId() {
return jobId;
}
@@ -274,5 +292,10 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc {
public boolean isCopy() {
return isCopy;
}
+
+ @Override
+ public long getTemplateSize() {
+ return -1;
+ }
}
diff --git a/core/src/com/cloud/storage/VMTemplateStoragePoolVO.java b/core/src/com/cloud/storage/VMTemplateStoragePoolVO.java
index 3044e716286..cd4894624d9 100644
--- a/core/src/com/cloud/storage/VMTemplateStoragePoolVO.java
+++ b/core/src/com/cloud/storage/VMTemplateStoragePoolVO.java
@@ -18,19 +18,19 @@
package com.cloud.storage;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
import com.cloud.utils.db.GenericDaoBase;
/**
@@ -43,7 +43,7 @@ import com.cloud.utils.db.GenericDaoBase;
public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc{
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
- Long id;
+ long id;
@Column(name="pool_id")
private long poolId;
@@ -72,11 +72,13 @@ public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc{
@Column (name="marked_for_gc") boolean markedForGC;
- public String getInstallPath() {
+ @Override
+ public String getInstallPath() {
return installPath;
}
- public long getTemplateSize() {
+ @Override
+ public long getTemplateSize() {
return templateSize;
}
@@ -88,47 +90,58 @@ public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc{
this.poolId = poolId;
}
- public long getTemplateId() {
+ @Override
+ public long getTemplateId() {
return templateId;
}
- public void setTemplateId(long templateId) {
+ @Override
+ public void setTemplateId(long templateId) {
this.templateId = templateId;
}
- public int getDownloadPercent() {
+ @Override
+ public int getDownloadPercent() {
return downloadPercent;
}
- public void setDownloadPercent(int downloadPercent) {
+ @Override
+ public void setDownloadPercent(int downloadPercent) {
this.downloadPercent = downloadPercent;
}
- public void setDownloadState(Status downloadState) {
+ @Override
+ public void setDownloadState(Status downloadState) {
this.downloadState = downloadState;
}
- public Long getId() {
+ @Override
+ public long getId() {
return id;
}
- public Date getCreated() {
+ @Override
+ public Date getCreated() {
return created;
}
- public Date getLastUpdated() {
+ @Override
+ public Date getLastUpdated() {
return lastUpdated;
}
- public void setLastUpdated(Date date) {
+ @Override
+ public void setLastUpdated(Date date) {
lastUpdated = date;
}
- public void setInstallPath(String installPath) {
+ @Override
+ public void setInstallPath(String installPath) {
this.installPath = installPath;
}
- public Status getDownloadState() {
+ @Override
+ public Status getDownloadState() {
return downloadState;
}
@@ -161,27 +174,33 @@ public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc{
}
- public void setLocalDownloadPath(String localPath) {
+ @Override
+ public void setLocalDownloadPath(String localPath) {
this.localDownloadPath = localPath;
}
- public String getLocalDownloadPath() {
+ @Override
+ public String getLocalDownloadPath() {
return localDownloadPath;
}
- public void setErrorString(String errorString) {
+ @Override
+ public void setErrorString(String errorString) {
this.errorString = errorString;
}
- public String getErrorString() {
+ @Override
+ public String getErrorString() {
return errorString;
}
- public void setJobId(String jobId) {
+ @Override
+ public void setJobId(String jobId) {
this.jobId = jobId;
}
- public String getJobId() {
+ @Override
+ public String getJobId() {
return jobId;
}
diff --git a/core/src/com/cloud/storage/VolumeVO.java b/core/src/com/cloud/storage/VolumeVO.java
index ceebc5e036f..19204ff446d 100755
--- a/core/src/com/cloud/storage/VolumeVO.java
+++ b/core/src/com/cloud/storage/VolumeVO.java
@@ -84,9 +84,6 @@ public class VolumeVO implements Volume {
@Column(name="pod_id")
Long podId;
- @Column(name="destroyed")
- boolean destroyed = false;
-
@Column(name="created")
Date created;
@@ -104,10 +101,6 @@ public class VolumeVO implements Volume {
@Column(name="disk_offering_id")
long diskOfferingId;
- @Expose
- @Column(name="mirror_vol")
- Long mirrorVolume;
-
@Column(name="template_id")
Long templateId;
@@ -119,11 +112,6 @@ public class VolumeVO implements Volume {
@Enumerated(EnumType.STRING)
VolumeType volumeType = Volume.VolumeType.UNKNOWN;
- @Expose
- @Column(name="mirror_state")
- @Enumerated(EnumType.STRING)
- MirrorState mirrorState = Volume.MirrorState.NOT_MIRRORED;
-
@Expose
@Column(name="pool_type")
@Enumerated(EnumType.STRING)
@@ -185,8 +173,6 @@ public class VolumeVO implements Volume {
this.size = size;
this.status = AsyncInstanceCreateStatus.Creating;
this.templateId = null;
- this.mirrorState = MirrorState.NOT_MIRRORED;
- this.mirrorVolume = null;
this.storageResourceType = Storage.StorageResourceType.STORAGE_POOL;
this.poolType = null;
}
@@ -199,8 +185,6 @@ public class VolumeVO implements Volume {
this.accountId = accountId;
this.domainId = domainId;
this.size = size;
- this.mirrorVolume = null;
- this.mirrorState = MirrorState.NOT_MIRRORED;
this.diskOfferingId = diskOfferingId;
this.status = AsyncInstanceCreateStatus.Creating;
this.state = State.Allocated;
@@ -319,7 +303,8 @@ public class VolumeVO implements Volume {
return instanceId;
}
- public Long getDeviceId() {
+ @Override
+ public Long getDeviceId() {
return deviceId;
}
@@ -380,18 +365,11 @@ public class VolumeVO implements Volume {
volumeType = type;
}
- public boolean getDestroyed() {
- return destroyed;
- }
-
- public Date getCreated() {
+ @Override
+ public Date getCreated() {
return created;
}
- public void setDestroyed(boolean destroyed) {
- this.destroyed = destroyed;
- }
-
public Date getRemoved() {
return removed;
}
@@ -400,15 +378,8 @@ public class VolumeVO implements Volume {
this.removed = removed;
}
- public MirrorState getMirrorState() {
- return mirrorState;
- }
-
- public void setMirrorState(MirrorState mirrorState) {
- this.mirrorState = mirrorState;
- }
-
- public long getDiskOfferingId() {
+ @Override
+ public long getDiskOfferingId() {
return diskOfferingId;
}
@@ -433,14 +404,6 @@ public class VolumeVO implements Volume {
this.firstSnapshotBackupUuid = firstSnapshotBackupUuid;
}
- public Long getMirrorVolume() {
- return mirrorVolume;
- }
-
- public void setMirrorVolume(Long mirrorVolume) {
- this.mirrorVolume = mirrorVolume;
- }
-
@Override
public Storage.StorageResourceType getStorageResourceType() {
return storageResourceType;
@@ -459,6 +422,7 @@ public class VolumeVO implements Volume {
this.poolId = poolId;
}
+ @Override
public AsyncInstanceCreateStatus getStatus() {
return status;
}
diff --git a/core/src/com/cloud/storage/resource/StoragePoolResource.java b/core/src/com/cloud/storage/resource/StoragePoolResource.java
index 7178607b113..9979b787217 100644
--- a/core/src/com/cloud/storage/resource/StoragePoolResource.java
+++ b/core/src/com/cloud/storage/resource/StoragePoolResource.java
@@ -23,10 +23,8 @@ import com.cloud.agent.api.storage.CopyVolumeCommand;
import com.cloud.agent.api.storage.CreateAnswer;
import com.cloud.agent.api.storage.CreateCommand;
import com.cloud.agent.api.storage.DestroyCommand;
-import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer;
-import com.cloud.agent.api.storage.ShareAnswer;
-import com.cloud.agent.api.storage.ShareCommand;
+import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
public interface StoragePoolResource {
// FIXME: Should have a PrimaryStorageDownloadAnswer
@@ -35,8 +33,6 @@ public interface StoragePoolResource {
// FIXME: Should have an DestroyAnswer
Answer execute(DestroyCommand cmd);
- ShareAnswer execute(ShareCommand cmd);
-
CopyVolumeAnswer execute(CopyVolumeCommand cmd);
CreateAnswer execute(CreateCommand cmd);
diff --git a/core/src/com/cloud/vm/ConsoleProxyVO.java b/core/src/com/cloud/vm/ConsoleProxyVO.java
index e863cb2d233..148ab090590 100644
--- a/core/src/com/cloud/vm/ConsoleProxyVO.java
+++ b/core/src/com/cloud/vm/ConsoleProxyVO.java
@@ -41,24 +41,6 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
@DiscriminatorValue(value="ConsoleProxy")
public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
- @Column(name="gateway", nullable=false)
- private String gateway;
-
- @Column(name="dns1")
- private String dns1;
-
- @Column(name="dns2")
- private String dns2;
-
- @Column(name="guest_mac_address")
- private String guestMacAddress;
-
- @Column(name="guest_ip_address")
- private String guestIpAddress;
-
- @Column(name="guest_netmask")
- private String guestNetmask;
-
@Column(name="public_ip_address", nullable=false)
private String publicIpAddress;
@@ -68,15 +50,6 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
@Column(name="public_netmask", nullable=false)
private String publicNetmask;
- @Column(name="vlan_db_id")
- private Long vlanDbId;
-
- @Column(name="vlan_id")
- private String vlanId;
-
- @Column(name="domain", nullable=false)
- private String domain;
-
@Column(name="ram_size", updatable=false, nullable=false)
private int ramSize;
@@ -108,22 +81,6 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
super();
}
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
public void setPublicIpAddress(String publicIpAddress) {
this.publicIpAddress = publicIpAddress;
}
@@ -136,18 +93,6 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
this.publicMacAddress = publicMacAddress;
}
- public void setGuestIpAddress(String guestIpAddress) {
- this.guestIpAddress = guestIpAddress;
- }
-
- public void setGuestNetmask(String guestNetmask) {
- this.guestNetmask = guestNetmask;
- }
-
- public void setGuestMacAddress(String guestMacAddress) {
- this.guestMacAddress = guestMacAddress;
- }
-
public void setRamSize(int ramSize) {
this.ramSize = ramSize;
}
@@ -164,21 +109,6 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
this.sessionDetails = details;
}
- @Override
- public String getGateway() {
- return this.gateway;
- }
-
- @Override
- public String getDns1() {
- return this.dns1;
- }
-
- @Override
- public String getDns2() {
- return this.dns2;
- }
-
@Override
public String getPublicIpAddress() {
return this.publicIpAddress;
@@ -193,37 +123,7 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
public String getPublicMacAddress() {
return this.publicMacAddress;
}
-
-
- public String getGuestIpAddress() {
- return this.guestIpAddress;
- }
-
-
- public String getGuestNetmask() {
- return this.guestNetmask;
- }
-
-
- public String getGuestMacAddress() {
- return this.guestMacAddress;
- }
- @Override
- public Long getVlanDbId() {
- return vlanDbId;
- }
-
- @Override
- public String getVlanId() {
- return vlanId;
- }
-
- @Override
- public String getDomain() {
- return this.domain;
- }
-
@Override
public int getRamSize() {
return this.ramSize;
diff --git a/core/src/com/cloud/vm/DomainRouterVO.java b/core/src/com/cloud/vm/DomainRouterVO.java
index 9137cb860ec..241410e11b4 100755
--- a/core/src/com/cloud/vm/DomainRouterVO.java
+++ b/core/src/com/cloud/vm/DomainRouterVO.java
@@ -28,7 +28,6 @@ import javax.persistence.Table;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.router.VirtualRouter;
-import com.cloud.utils.net.NetUtils;
/**
* VirtualMachineRouterVO implements all the fields stored for a domain router.
@@ -41,9 +40,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
@Column(name="ram_size", nullable=false)
private int ramSize;
- @Column(name="gateway")
- private String gateway;
-
@Column(name="public_ip_address")
private String publicIpAddress;
@@ -53,12 +49,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
@Column(name="public_netmask")
private String publicNetmask;
- @Column(name="vlan_db_id")
- private Long vlanDbId;
-
- @Column(name="vlan_id")
- private String vlanId;
-
@Column(name="guest_mac_address")
private String guestMacAddress;
@@ -68,24 +58,9 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
@Column(name="guest_netmask")
private String guestNetmask;
- @Column(name="dns1")
- private String dns1;
-
- @Column(name="dns2")
- private String dns2;
-
@Column(name="domain", nullable=false)
private String domain;
- @Column(name="vnet")
- private String vnet;
-
- @Column(name="dc_vlan")
- private String zoneVlan;
-
- @Column(name="guest_dc_mac_address")
- private String guestZoneMacAddress;
-
@Column(name="network_id")
long networkId;
@@ -109,10 +84,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
this.domain = networkDomain;
}
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
public void setPublicIpAddress(String publicIpAddress) {
this.publicIpAddress = publicIpAddress;
}
@@ -142,27 +113,10 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
this.guestIpAddress = routerIpAddress;
}
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
public void setDomain(String domain) {
this.domain = domain;
}
- public void setVnet(String vnet) {
- this.vnet = vnet;
- }
-
- @Override
- public String getVnet() {
- return vnet;
- }
-
@Override
public long getDataCenterId() {
return dataCenterId;
@@ -187,16 +141,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
super();
}
- @Override
- public String getDns1() {
- return dns1;
- }
-
- @Override
- public String getDns2() {
- return dns2;
- }
-
@Override
public String getDomain() {
return domain;
@@ -212,34 +156,16 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
this.ramSize = ramSize;
}
- @Override
- public String getGateway() {
- return gateway;
- }
-
@Override
public String getPublicIpAddress() {
return publicIpAddress;
}
- @Override
- public String getVlanId() {
- return vlanId;
- }
-
@Override
public String getGuestMacAddress() {
return guestMacAddress;
}
- public void setVlanDbId(Long vlanDbId) {
- this.vlanDbId = vlanDbId;
- }
-
- public Long getVlanDbId() {
- return vlanDbId;
- }
-
@Override
public Role getRole() {
return role;
@@ -249,33 +175,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
this.role = role;
}
- @Override
- public String[] getDhcpRange() {
- if (guestIpAddress != null && guestNetmask != null) {
- long cidrSize = NetUtils.getCidrSize(guestNetmask);
- return NetUtils.getIpRangeFromCidr(guestIpAddress, cidrSize);
- }
- return new String[2];
- }
-
- public void setZoneVlan(String zoneVlan) {
- this.zoneVlan = zoneVlan;
- }
-
- @Override
- public String getZoneVlan() {
- return zoneVlan;
- }
-
- public void setGuestZoneMacAddress(String guestZoneMacAddress) {
- this.guestZoneMacAddress = guestZoneMacAddress;
- }
-
- @Override
- public String getGuestZoneMacAddress() {
- return guestZoneMacAddress;
- }
-
public void setServiceOfferingId(long serviceOfferingId) {
this.serviceOfferingId = serviceOfferingId;
}
diff --git a/core/src/com/cloud/vm/SecondaryStorageVmVO.java b/core/src/com/cloud/vm/SecondaryStorageVmVO.java
index c4d2e6ecad5..fc66537a7b7 100644
--- a/core/src/com/cloud/vm/SecondaryStorageVmVO.java
+++ b/core/src/com/cloud/vm/SecondaryStorageVmVO.java
@@ -39,15 +39,6 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
@DiscriminatorValue(value="SecondaryStorageVm")
public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStorageVm {
- @Column(name="gateway", nullable=false)
- private String gateway;
-
- @Column(name="dns1")
- private String dns1;
-
- @Column(name="dns2")
- private String dns2;
-
@Column(name="public_ip_address", nullable=false)
private String publicIpAddress;
@@ -57,24 +48,6 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora
@Column(name="public_netmask", nullable=false)
private String publicNetmask;
- @Column(name="guest_mac_address")
- private String guestMacAddress;
-
- @Column(name="guest_ip_address")
- private String guestIpAddress;
-
- @Column(name="guest_netmask")
- private String guestNetmask;
-
- @Column(name="vlan_db_id")
- private Long vlanDbId;
-
- @Column(name="vlan_id")
- private String vlanId;
-
- @Column(name="domain", nullable=false)
- private String domain;
-
@Column(name="guid", nullable=false)
private String guid;
@@ -100,22 +73,6 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora
super();
}
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
public void setPublicIpAddress(String publicIpAddress) {
this.publicIpAddress = publicIpAddress;
}
@@ -128,18 +85,6 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora
this.publicMacAddress = publicMacAddress;
}
- public void setGuestIpAddress(String guestIpAddress) {
- this.guestIpAddress = guestIpAddress;
- }
-
- public void setGuestNetmask(String guestNetmask) {
- this.guestNetmask = guestNetmask;
- }
-
- public void setGuestMacAddress(String guestMacAddress) {
- this.guestMacAddress = guestMacAddress;
- }
-
public void setRamSize(int ramSize) {
this.ramSize = ramSize;
}
@@ -148,21 +93,6 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora
this.lastUpdateTime = time;
}
- @Override
- public String getGateway() {
- return this.gateway;
- }
-
- @Override
- public String getDns1() {
- return this.dns1;
- }
-
- @Override
- public String getDns2() {
- return this.dns2;
- }
-
@Override
public String getPublicIpAddress() {
return this.publicIpAddress;
@@ -178,36 +108,6 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora
return this.publicMacAddress;
}
-
- public String getGuestIpAddress() {
- return this.guestIpAddress;
- }
-
-
- public String getGuestNetmask() {
- return this.guestNetmask;
- }
-
-
- public String getGuestMacAddress() {
- return this.guestMacAddress;
- }
-
- @Override
- public Long getVlanDbId() {
- return vlanDbId;
- }
-
- @Override
- public String getVlanId() {
- return vlanId;
- }
-
- @Override
- public String getDomain() {
- return this.domain;
- }
-
@Override
public int getRamSize() {
return this.ramSize;
diff --git a/core/src/com/cloud/vm/SystemVm.java b/core/src/com/cloud/vm/SystemVm.java
index 7e1fd3387c2..21d5027246e 100644
--- a/core/src/com/cloud/vm/SystemVm.java
+++ b/core/src/com/cloud/vm/SystemVm.java
@@ -20,16 +20,9 @@ package com.cloud.vm;
import java.util.Date;
public interface SystemVm extends VirtualMachine {
- public String getGateway();
- public String getDns1();
- public String getDns2();
- public String getDomain();
public String getPublicIpAddress();
public String getPublicNetmask();
public String getPublicMacAddress();
- public Long getVlanDbId();
- public String getVlanId();
- public String getPrivateNetmask();
public int getRamSize();
public Date getLastUpdateTime();
}
diff --git a/core/src/com/cloud/vm/UserVmVO.java b/core/src/com/cloud/vm/UserVmVO.java
index eff39465915..2fa2be2947c 100755
--- a/core/src/com/cloud/vm/UserVmVO.java
+++ b/core/src/com/cloud/vm/UserVmVO.java
@@ -36,33 +36,9 @@ import com.cloud.uservm.UserVm;
@PrimaryKeyJoinColumn(name="id")
public class UserVmVO extends VMInstanceVO implements UserVm {
- @Column(name="domain_router_id", updatable=true, nullable=true)
- Long domainRouterId;
-
- @Column(name="vnet", length=10, updatable=true, nullable=true)
- String vnet;
-
- @Column(name="guest_ip_address")
- String guestIpAddress;
-
- @Column(name="guest_mac_address")
- String guestMacAddress;
-
- @Column(name="guest_netmask")
- String guestNetmask;
-
@Column(name="iso_id", nullable=true, length=17)
private Long isoId = null;
- @Column(name="external_ip_address")
- String externalIpAddress;
-
- @Column(name="external_mac_address")
- String externalMacAddress;
-
- @Column(name="external_vlan_db_id")
- private Long externalVlanDbId;
-
@Column(name="user_data", updatable=true, nullable=true, length=2048)
private String userData;
@@ -83,54 +59,11 @@ public class UserVmVO extends VMInstanceVO implements UserVm {
this.password = password;
}
- @Override
- public String getGuestIpAddress() {
- return guestIpAddress;
- }
-
- public void setGuestIpAddress(String guestIpAddress) {
- this.guestIpAddress = guestIpAddress;
- setPrivateIpAddress(guestIpAddress);
- }
-
- @Override
- public String getGuestMacAddress() {
- return guestMacAddress;
- }
-
- public void setGuestMacAddress(String guestMacAddress) {
- this.guestMacAddress = guestMacAddress;
- setPrivateMacAddress(guestMacAddress);
-
- }
-
- public String getGuestNetmask() {
- return guestNetmask;
- }
-
- public void setGuestNetmask(String guestNetmask) {
- this.guestNetmask = guestNetmask;
- setPrivateNetmask(guestNetmask);
- }
-
@Override
public Long getIsoId() {
return isoId;
}
- @Override
- public Long getDomainRouterId() {
- return domainRouterId;
- }
-
- public void setDomainRouterId(long domainRouterId) {
- this.domainRouterId = domainRouterId;
- }
-
- public void setVnet(String vnet) {
- this.vnet = vnet;
- }
-
@Override
public long getServiceOfferingId() {
return serviceOfferingId;
@@ -140,11 +73,6 @@ public class UserVmVO extends VMInstanceVO implements UserVm {
this.serviceOfferingId = serviceOfferingId;
}
- @Override
- public String getVnet() {
- return vnet;
- }
-
public UserVmVO(long id,
String instanceName,
String displayName,
@@ -167,34 +95,10 @@ public class UserVmVO extends VMInstanceVO implements UserVm {
super();
}
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
public void setIsoId(Long id) {
this.isoId = id;
}
- public void setExternalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- }
-
- public String getExternalMacAddress() {
- return externalMacAddress;
- }
-
- public void setExternalMacAddress(String externalMacAddress) {
- this.externalMacAddress = externalMacAddress;
- }
-
- public void setExternalVlanDbId(Long vlanDbId) {
- this.externalVlanDbId = vlanDbId;
- }
-
- public Long getExternalVlanDbId() {
- return externalVlanDbId;
- }
-
@Override
public void setUserData(String userData) {
this.userData = userData;
diff --git a/core/src/com/cloud/vm/VMInstanceVO.java b/core/src/com/cloud/vm/VMInstanceVO.java
index da61416df3c..23cd9ef9707 100644
--- a/core/src/com/cloud/vm/VMInstanceVO.java
+++ b/core/src/com/cloud/vm/VMInstanceVO.java
@@ -99,9 +99,6 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/deps/.project b/deps/.project
index 2d10b0c4b06..901f15e089b 100644
--- a/deps/.project
+++ b/deps/.project
@@ -1,11 +1,17 @@
-
-
- deps
-
-
-
-
-
-
-
-
+
+
+ deps
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 1c4fbd6cde1..03cb7837dee 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -85,6 +85,7 @@ patch() {
if [ "$shouldpatch" == "true" ]
then
log_it "Rebooting system since we patched init scripts"
+ sync
sleep 2
reboot
fi
@@ -157,8 +158,11 @@ setup_common() {
init_interfaces $1 $2 $3
setup_interface "0" $ETH0_IP $ETH0_MASK $GW
setup_interface "1" $ETH1_IP $ETH1_MASK $GW
- setup_interface "2" $ETH2_IP $ETH2_MASK $GW
-
+ if [ -n "$ETH2_IP" ]
+ then
+ setup_interface "2" $ETH2_IP $ETH2_MASK $GW
+ fi
+
echo $NAME > /etc/hostname
echo 'AVAHI_DAEMON_DETECT_LOCAL=0' > /etc/default/avahi-daemon
hostname $NAME
@@ -224,7 +228,13 @@ setup_apache2() {
setup_router() {
log_action_begin_msg "Setting up virtual router system vm"
- setup_common eth0 eth1 eth2
+ if [ -n "$ETH2_IP" ]
+ then
+ setup_common eth0 eth1 eth2
+ else
+ setup_common eth0 eth1
+ fi
+
setup_dnsmasq
setup_apache2 $ETH0_IP
diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel b/scripts/vm/hypervisor/xenserver/ovstunnel
new file mode 100755
index 00000000000..22da51390c5
--- /dev/null
+++ b/scripts/vm/hypervisor/xenserver/ovstunnel
@@ -0,0 +1,262 @@
+#!/usr/bin/python
+#
+# A plugin for executing script needed by vmops cloud
+
+import os, sys, time
+import XenAPIPlugin
+sys.path.append("/opt/xensource/sm/")
+import util
+from util import CommandException
+import hostvmstats
+import socket
+import stat
+import base64
+import tempfile
+from os.path import exists as _exists
+from time import localtime as _localtime, asctime as _asctime
+
+vSwitchDBPidFile = "/var/run/openvswitch/ovsdb-server.pid"
+vSwitchDBDaemonName = "ovsdb-server"
+vSwitchPidFile = "/var/run/openvswitch/ovs-vswitchd.pid"
+vsctlPath = "/usr/bin/ovs-vsctl"
+ofctlPath = "/usr/bin/ovs-ofctl"
+vSwitchDaemonName = "ovs-vswitchd"
+
+logFile = "/var/log/ovstunnel.log"
+fLog = None
+
+def echo(fn):
+ def wrapped(*v, **k):
+ name = fn.__name__
+ util.SMlog("#### VMOPS enter %s ####" % name )
+ res = fn(*v, **k)
+ util.SMlog("#### VMOPS exit %s ####" % name )
+ return res
+ return wrapped
+
+def open_log ():
+ global fLog
+
+ try:
+ if fLog == None:
+ fLog = open (logFile, "a")
+ except IOError, e:
+ #print e
+ pass
+
+def pr (str):
+ global fLog
+
+ if fLog != None:
+ str = "[%s]:" % _asctime (_localtime()) + str + "\n"
+ fLog.write (str)
+
+def close_log ():
+ global fLog
+
+ if fLog != None:
+ fLog.close ()
+
+def is_process_run (pidFile, name):
+ try:
+ fpid = open (pidFile, "r")
+ pid = fpid.readline ()
+ fpid.close ()
+ except IOError, e:
+ return -1
+
+ pid = pid[:-1]
+ ps = os.popen ("ps -ae")
+ for l in ps:
+ if pid in l and name in l:
+ ps.close ()
+ return 0
+
+ ps.close ()
+ return -2
+
+def is_tool_exist (name):
+ if _exists (name):
+ return 0
+ return -1
+
+
+def check_switch ():
+ global result
+
+ ret = is_process_run (vSwitchDBPidFile, vSwitchDBDaemonName);
+ if ret < 0:
+ if ret == -1: return "NO_DB_PID_FILE"
+ if ret == -2: return "DB_NOT_RUN"
+
+ ret = is_process_run (vSwitchPidFile, vSwitchDaemonName)
+ if ret < 0:
+ if ret == -1: return "NO_SWITCH_PID_FILE"
+ if ret == -2: return "SWITCH_NOT_RUN"
+
+ if is_tool_exist (vsctlPath) < 0:
+ return "NO_VSCTL"
+
+ if is_tool_exist (ofctlPath) < 0:
+ return "NO_OFCTL"
+
+ return "SUCCESS"
+
+def do_cmd (cmds, lines=False):
+ cmd = ""
+ for i in cmds:
+ cmd += " "
+ cmd += i
+
+ pr("do command '%s'" % cmd)
+ f = os.popen (cmd)
+ if lines == True:
+ res = f.readlines ()
+ else:
+ res = f.readline ()
+ res = res[:-1]
+ f.close ()
+
+ if lines == False:
+ pr("command output '%s'" % res)
+ return res
+
+######################## GRE creation utils ##########################
+# UUID's format is 8-4-4-4-12
+def is_uuid (uuid):
+ list = uuid.split ("-")
+
+ if len (list) != 5:
+ return -1
+
+ if len (list[0]) != 8 or len (list[1]) != 4 \
+ or len (list[2]) != 4 or len (list[3]) != 4 \
+ or len (list[4]) != 12:
+ return -1
+
+ return 0
+
+def set_flood_flow(bridge, inport):
+ flow = "in_port=%s idle_timeout=0 hard_timeout=0 priority=10000 actions=flood" % inport
+ add_flow(bridge, flow)
+
+@echo
+def create_tunnel (session, args):
+ bridge = args.pop("bridge")
+ remoteIP = args.pop("remote_ip")
+ greKey = args.pop("key")
+ srcHost = args.pop("from")
+ dstHost = args.pop("to")
+
+ res = check_switch()
+ if res != "SUCCESS":
+ return res
+
+ name = "%s-%s-%s-%s" % (bridge, srcHost, dstHost, greKey)
+
+ wait = [vsctlPath, "--timeout=30 wait-until bridge %s -- get bridge %s name" % \
+ (bridge, bridge)]
+ res = do_cmd(wait)
+ if bridge not in res:
+ pr("WARNIING:Can't find bridge %s for creating tunnel!" % bridge)
+ result = "COMMAND_FAILED_NO_BRIDGE"
+ return result
+
+ createInterface = [vsctlPath, "create interface", "name=%s" % name, \
+ 'type=gre options:remote_ip=%s options:key=%s' % (remoteIP, greKey)]
+ ifaceUUID = do_cmd (createInterface)
+ if is_uuid (ifaceUUID) < 0:
+ pr("create interface failed, %s is not UUID" % ifaceUUID)
+ result = "COMMAND_FAILED_CREATE_INTERFACE_FAILED"
+ return result
+
+ createPort = [vsctlPath, "create port", "name=%s" % name, \
+ "interfaces=[%s]" % ifaceUUID]
+ portUUID = do_cmd (createPort)
+ if is_uuid (portUUID) < 0:
+ pr("create port failed, %s is not UUID" % portUUID)
+ result = "COMMAND_FAILED_CREATE_PORT_FAILED"
+ return result
+
+ addBridge = [vsctlPath, "add bridge %s" % bridge, "ports %s" % portUUID]
+ do_cmd (addBridge)
+
+ wait = [vsctlPath, "--timeout=30 wait-until port %s -- get port %s name" % \
+ (name, name)]
+ res = do_cmd(wait)
+ if name in res:
+ port = get_field_of_interface(name, "ofport");
+ if port == "[]":
+ return "COMMAND_FAILED_PORT_IS_[]"
+
+ noFlood = [ofctlPath, "mod-port %s %s noflood" % (bridge, \
+ port)]
+ do_cmd(noFlood)
+
+ set_flood_flow(bridge, port)
+ pr("create tunnel successful(bridge=%s, remote_ip=%s, key=%s, from=%s, to=%s" % \
+ (bridge, remoteIP, greKey, srcHost, dstHost))
+ result = "SUCCESS:%s" % name
+ else:
+ pr("create gre tunnel failed")
+ result = "COMMAND_FAILED_CREATE_TUNNEL_FAILED"
+
+ return result
+######################## End GRE creation utils ##########################
+
+def del_all_flows(bridge):
+ delFlow = [ofctlPath, "del-flows %s" % bridge]
+ do_cmd(delFlow)
+
+ normalFlow = "priority=0 idle_timeout=0 hard_timeout=0 actions=normal"
+ add_flow(bridge, normalFlow)
+
+def del_flows(bridge, ofport):
+ delFlow = [ofctlPath, 'del-flows %s "in_port=%s"' % (bridge, ofport)]
+ do_cmd(delFlow)
+
+def del_port(bridge, port):
+ delPort = [vsctlPath, "del-port %s %s" % (bridge, port)]
+ do_cmd(delPort)
+
+@echo
+def destroy_tunnel(session, args):
+ bridge = args.pop("bridge")
+ inPort = args.pop("in_port")
+
+ # delete all gre ports on bridge
+ if inPort == "[]":
+ listPorts = [vsctlPath, "list-ports %s" % bridge]
+ res = do_cmd(listPorts, True)
+ for p in res:
+ if bridge in p:
+ del_port(bridge, p)
+ del_all_flows(bridge)
+ else:
+ ofport = get_field_of_interface(inPort, "ofport")
+ del_flows(bridge, ofport)
+ del_port(bridge, inPort)
+
+ return "SUCCESS"
+
+def get_field_of_interface(nameOruuid, field):
+ listIface = [vsctlPath, "list interface", nameOruuid]
+ res = do_cmd(listIface, True)
+
+ for i in res:
+ if field in i:
+ (x, r) = i.split(":")
+ return r.lstrip().rstrip()
+ return None
+
+
+def add_flow(bridge, flow):
+ param = bridge + ' "%s"' % flow
+ addflow = ["ovs-ofctl add-flow", param]
+ do_cmd (addflow)
+
+if __name__ == "__main__":
+ open_log()
+ XenAPIPlugin.dispatch({"create_tunnel":create_tunnel, "destroy_tunnel":destroy_tunnel})
+ close_log()
+
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
index 8042e30d103..9bc7f0a9d69 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
@@ -13,6 +13,7 @@ NFSSR.py=/opt/xensource/sm
nfs.py=/opt/xensource/sm
vmops=..,0755,/etc/xapi.d/plugins
ovsgre=..,0755,/etc/xapi.d/plugins
+ovstunnel=..,0755,/etc/xapi.d/plugins
vmopsSnapshot=..,0755,/etc/xapi.d/plugins
hostvmstats.py=..,0755,/opt/xensource/sm
systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py
index abd7da8c441..e8597a2c7e0 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -434,7 +434,6 @@ def add_network_rules(vm_name, vm_id, vm_ip, signature, seqno, vmMac, rules):
try:
vmName = vm_name
domId = getvmId(vmName)
- vm_name = '-'.join(vm_name.split('-')[:-1])
vmchain = vm_name
changes = check_rule_log_for_vm(vmName, vm_id, vm_ip, domId, signature, seqno)
@@ -447,14 +446,17 @@ def add_network_rules(vm_name, vm_id, vm_ip, signature, seqno, vmMac, rules):
logging.debug("Change detected in vmId or vmIp or domId, resetting default rules")
default_network_rules(vmName, vm_ip, vm_id, vmMac)
+ if rules == "" or rules == None:
+ return 'true'
+
lines = rules.split(';')
print lines
logging.debug(" programming network rules for IP: " + vm_ip + " vmname=" + vm_name)
#iptables('-F', vmchain)
- print lines
for line in lines:
+
tokens = line.split(':')
if len(tokens) != 4:
continue
@@ -473,16 +475,16 @@ def add_network_rules(vm_name, vm_id, vm_ip, signature, seqno, vmMac, rules):
if ips:
if protocol == 'all':
for ip in ips:
- iptables = "iptables -I " + vmchain + " -m state --state NEW -m iprange --src-range " + ip + " -j ACCEPT"
+ iptables = "iptables -I " + vmchain + " -m state --state NEW -s " + ip + " -j ACCEPT"
elif protocol != 'icmp':
for ip in ips:
- iptables = "iptables -I " + vmchain + " -p " + protocol + " -m " + protocol + " --dport " + range + " -m state --state NEW -m iprange --src-range " + ip + " -j ACCEPT"
+ iptables = "iptables -I " + vmchain + " -p " + protocol + " -m " + protocol + " --dport " + range + " -m state --state NEW -s " + ip + " -j ACCEPT"
else:
range = start + "/" + end
if start == "-1":
range = "any"
for ip in ips:
- iptables = "iptables -I " + vmchain + " -p icmp --icmp-type " + range + " -m iprange --src-range " + ip + " -j ACCEPT"
+ iptables = "iptables -I " + vmchain + " -p icmp --icmp-type " + range + " -s " + ip + " -j ACCEPT"
execute(iptables)
if allow_any and protocol != 'all':
@@ -497,7 +499,6 @@ def add_network_rules(vm_name, vm_id, vm_ip, signature, seqno, vmMac, rules):
iptables = "iptables -A " + vmchain + " -j DROP"
execute(iptables)
-
if write_rule_log_for_vm(vmName, vm_id, vm_ip, domId, signature, seqno) == False:
return 'false'
@@ -548,3 +549,5 @@ if __name__ == '__main__':
get_rule_logs_for_vms()
elif cmd == "add_network_rules":
add_network_rules(option.vmName, option.vmID, option.vmIP, option.sig, option.seq, option.vmMAC, option.rules)
+ elif cmd == "cleanup_rules":
+ cleanup_rules()
diff --git a/server/.classpath b/server/.classpath
index b18c9660ffe..52b60598f7d 100644
--- a/server/.classpath
+++ b/server/.classpath
@@ -1,25 +1,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index d6ef574a7e6..437e4c4bf76 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1445,12 +1445,14 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory,
String hostDesc = "name: " + host.getName() + " (id:"
+ host.getId() + "), availability zone: "
+ dcVO.getName() + ", pod: " + podVO.getName();
- _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST,
- host.getDataCenterId(), host.getPodId(),
- "Host disconnected, " + hostDesc,
- "If the agent for host [" + hostDesc
- + "] is not restarted within " + _alertWait
- + " seconds, HA will begin on the VMs");
+ if((host.getType() != Host.Type.SecondaryStorage) && (host.getType() != Host.Type.ConsoleProxy)){
+ _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST,
+ host.getDataCenterId(), host.getPodId(),
+ "Host disconnected, " + hostDesc,
+ "If the agent for host [" + hostDesc
+ + "] is not restarted within " + _alertWait
+ + " seconds, HA will begin on the VMs");
+ }
event = Event.AgentDisconnected;
}
} else {
diff --git a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
index a45e8891551..354e077a5e3 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
@@ -77,8 +77,8 @@ public class UserConcentratedAllocator implements PodAllocator {
@Inject VMInstanceDao _vmInstanceDao;
Random _rand = new Random(System.currentTimeMillis());
- private int _hoursToSkipStoppedVMs = 24;
- private int _hoursToSkipDestroyedVMs = 0;
+ private int _secondsToSkipStoppedVMs = 86400;
+ private int _secondsToSkipDestroyedVMs = 0;
private int _secStorageVmRamSize = 1024;
private int _proxyRamSize = 256;
@@ -206,14 +206,14 @@ public class UserConcentratedAllocator implements PodAllocator {
if(vm.getState() == State.Stopped || vm.getState() == State.Destroyed) {
// for Stopped/Destroyed VMs, we will skip counting it if it hasn't been used for a while
- int _hoursToSkipVMs = _hoursToSkipStoppedVMs;
+ int secondsToSkipVMs = _secondsToSkipStoppedVMs;
if (vm.getState() == State.Destroyed) {
- _hoursToSkipVMs = _hoursToSkipDestroyedVMs;
+ secondsToSkipVMs = _secondsToSkipDestroyedVMs;
}
long millisecondsSinceLastUpdate = DateUtil.currentGMTTime().getTime() - vm.getUpdateTime().getTime();
- if(millisecondsSinceLastUpdate > _hoursToSkipVMs*3600000L) {
+ if(millisecondsSinceLastUpdate > secondsToSkipVMs*1000L) {
if(s_logger.isDebugEnabled()) {
s_logger.debug("Skip counting " + vm.getState().toString() + " vm " + vm.getInstanceName() + " in capacity allocation as it has been " + vm.getState().toString().toLowerCase() + " for " + millisecondsSinceLastUpdate/60000 + " minutes");
}
@@ -320,10 +320,11 @@ public class UserConcentratedAllocator implements PodAllocator {
_name = name;
Map configs = _configDao.getConfiguration("management-server", params);
- String stoppedValue = configs.get("capacity.skipcounting.hours");
- String destroyedValue = configs.get("capacity.skipcounting.destroyed.hours");
- _hoursToSkipStoppedVMs = NumbersUtil.parseInt(stoppedValue, 24);
- _hoursToSkipDestroyedVMs = NumbersUtil.parseInt(destroyedValue, 0);
+ String stoppedValue = configs.get("vm.resource.release.interval");
+ // String destroyedValue = configs.get("capacity.skipcounting.destroyed.hours");
+ String destroyedValue = null;
+ _secondsToSkipStoppedVMs = NumbersUtil.parseInt(stoppedValue, 86400);
+ _secondsToSkipDestroyedVMs = NumbersUtil.parseInt(destroyedValue, 0);
// TODO this is not good, there should be one place to get these values
_secStorageVmRamSize = NumbersUtil.parseInt(configs.get("secstorage.vm.ram.size"), 256);
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index b397cbd5adf..4e86b306e3f 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -7,6 +7,7 @@ import java.util.Map;
import com.cloud.agent.AgentManager;
import com.cloud.async.AsyncJobManager;
import com.cloud.async.AsyncJobVO;
+import com.cloud.configuration.ConfigurationService;
import com.cloud.configuration.ResourceCount.ResourceType;
import com.cloud.dc.AccountVlanMapVO;
import com.cloud.dc.ClusterVO;
@@ -79,6 +80,7 @@ import com.cloud.user.AccountManager;
import com.cloud.user.AccountVO;
import com.cloud.user.User;
import com.cloud.user.UserStatisticsVO;
+import com.cloud.user.UserVO;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.UserDao;
import com.cloud.user.dao.UserStatisticsDao;
@@ -137,6 +139,7 @@ public class ApiDBUtils {
private static DataCenterDao _zoneDao;
private static NetworkOfferingDao _networkOfferingDao;
private static NetworkDao _networkDao;
+ private static ConfigurationService _configMgr;
static {
_ms = (ManagementServer)ComponentLocator.getComponent(ManagementServer.Name);
@@ -150,6 +153,7 @@ public class ApiDBUtils {
_storageMgr = locator.getManager(StorageManager.class);
_userVmMgr = locator.getManager(UserVmManager.class);
_networkMgr = locator.getManager(NetworkManager.class);
+ _configMgr = locator.getManager(ConfigurationService.class);
_accountDao = locator.getDao(AccountDao.class);
_accountVlanMapDao = locator.getDao(AccountVlanMapDao.class);
@@ -187,7 +191,7 @@ public class ApiDBUtils {
/////////////////////////////////////////////////////////////
// ManagementServer methods //
/////////////////////////////////////////////////////////////
-
+
public static VMInstanceVO findVMInstanceById(long vmId) {
return _ms.findVMInstanceById(vmId);
}
@@ -427,6 +431,10 @@ public class ApiDBUtils {
public static VolumeVO findVolumeById(Long volumeId) {
return _volumeDao.findByIdIncludingRemoved(volumeId);
}
+
+ public static List listUsersByAccount(long accountId) {
+ return _userDao.listByAccount(accountId);
+ }
public static DataCenterVO findZoneById(Long zoneId) {
return _zoneDao.findById(zoneId);
@@ -521,4 +529,12 @@ public class ApiDBUtils {
}
}
+ public static Integer getNetworkRate(long networkOfferingId) {
+ return _configMgr.getNetworkRate(networkOfferingId);
+ }
+
+ public static Account getVlanAccount(long vlanId) {
+ return _configMgr.getVlanAccount(vlanId);
+ }
+
}
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index bafe991e27a..34ad2d93639 100644
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -64,19 +64,13 @@ public class ApiDispatcher {
public void dispatchCreateCmd(BaseAsyncCreateCmd cmd, Map params) {
- boolean created = false;
String errorMsg = "";
- long startId = 0;
-
- if(cmd.getCreateEventType() != null){
- startId = cmd.saveStartedEvent(cmd.getCreateEventType(), cmd.getCreateEventDescription(), 0L);
- }
-
setupParameters(cmd, params);
try {
+ UserContext ctx = UserContext.current();
+ ctx.setAccountId(cmd.getEntityOwnerId());
cmd.create();
- created = true;
} catch (Throwable t) {
if (t instanceof InvalidParameterValueException || t instanceof IllegalArgumentException) {
s_logger.info(t.getMessage());
@@ -121,27 +115,21 @@ public class ApiDispatcher {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, BaseCmd.USER_ERROR_MESSAGE);
}
}
- } finally {
- if(cmd.getCreateEventType() != null){
- if (created){
- cmd.saveCompletedEvent(EventVO.LEVEL_INFO, cmd.getCreateEventType(), cmd.getCreateEventDescription()+" successfull. Id: "+cmd.getEntityId(), startId);
- } else {
- cmd.saveCompletedEvent(EventVO.LEVEL_ERROR, cmd.getCreateEventType(), cmd.getCreateEventDescription()+" failed. "+errorMsg, startId);
- }
- }
}
}
public void dispatch(BaseCmd cmd, Map params) {
- boolean success = false;
String errorMsg = "";
setupParameters(cmd, params);
try {
if(cmd instanceof BaseAsyncCmd){
- ((BaseAsyncCmd)cmd).saveStartedEvent();
+ UserContext ctx = UserContext.current();
+ BaseAsyncCmd asyncCmd = (BaseAsyncCmd)cmd;
+ ctx.setAccountId(asyncCmd.getEntityOwnerId());
+ String startEventId = params.get("ctxStartEventId");
+ ctx.setStartEventId(Long.valueOf(startEventId));
}
cmd.execute();
- success = true;
} catch (Throwable t) {
if (t instanceof InvalidParameterValueException || t instanceof IllegalArgumentException) {
s_logger.info(t.getMessage());
@@ -186,15 +174,6 @@ public class ApiDispatcher {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, BaseCmd.USER_ERROR_MESSAGE);
}
}
- } finally {
- if(cmd instanceof BaseAsyncCmd){
- BaseAsyncCmd asyncCmd = (BaseAsyncCmd)cmd;
- if(success){
- asyncCmd.saveCompletedEvent(EventVO.LEVEL_INFO, asyncCmd.getEventDescription()+" completed successfully");
- } else {
- asyncCmd.saveCompletedEvent(EventVO.LEVEL_ERROR, asyncCmd.getEventDescription()+" failed. "+errorMsg);
- }
- }
}
}
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index e3db40ed3a4..68c0e281fa4 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -142,6 +142,7 @@ import com.cloud.user.User;
import com.cloud.user.UserAccount;
import com.cloud.user.UserContext;
import com.cloud.user.UserStatisticsVO;
+import com.cloud.user.UserVO;
import com.cloud.uservm.UserVm;
import com.cloud.utils.Pair;
import com.cloud.utils.net.NetUtils;
@@ -309,6 +310,30 @@ public class ApiResponseHelper implements ResponseGenerator {
accountResponse.setVmRunning(vmRunning);
accountResponse.setObjectName("account");
+ //adding all the users for an account as part of the response obj
+ List usersForAccount = ApiDBUtils.listUsersByAccount(account.getAccountId());
+ List userResponseList = new ArrayList();
+ for(UserVO user : usersForAccount) {
+ UserResponse userResponse = new UserResponse();
+ userResponse.setAccountName(account.getAccountName());
+ userResponse.setAccountType(account.getType());
+ userResponse.setApiKey(user.getApiKey());
+ userResponse.setCreated(user.getCreated());
+ userResponse.setDomainId(account.getDomainId());
+ userResponse.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName());
+ userResponse.setEmail(user.getEmail());
+ userResponse.setFirstname(user.getFirstname());
+ userResponse.setId(user.getId());
+ userResponse.setSecretKey(user.getSecretKey());
+ userResponse.setLastname(user.getLastname());
+ userResponse.setState(user.getState().toString());
+ userResponse.setTimezone(user.getTimezone());
+ userResponse.setUsername(user.getUsername());
+
+ userResponseList.add(userResponse);
+ }
+
+ accountResponse.setUsers(userResponseList);
return accountResponse;
}
@@ -568,20 +593,12 @@ public class ApiResponseHelper implements ResponseGenerator {
vlanResponse.setStartIp(range[0]);
vlanResponse.setEndIp(range[1]);
- Long networkId = vlan.getNetworkId();
- if (networkId != null) {
- vlanResponse.setNetworkId(vlan.getNetworkId());
- Network network = ApiDBUtils.findNetworkById(networkId);
- if (network != null) {
- Long accountId = network.getAccountId();
- //Set account information
- if (accountId != null) {
- Account account = ApiDBUtils.findAccountById(accountId);
- vlanResponse.setAccountName(account.getAccountName());
- vlanResponse.setDomainId(account.getDomainId());
- vlanResponse.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName());
- }
- }
+ vlanResponse.setNetworkId(vlan.getNetworkId());
+ Account owner = ApiDBUtils.getVlanAccount(vlan.getId());
+ if (owner != null) {
+ vlanResponse.setAccountName(owner.getAccountName());
+ vlanResponse.setDomainId(owner.getDomainId());
+ vlanResponse.setDomainName(ApiDBUtils.findDomainById(owner.getDomainId()).getName());
}
vlanResponse.setObjectName("vlan");
@@ -743,7 +760,12 @@ public class ApiResponseHelper implements ResponseGenerator {
VMInstanceVO vm = ApiDBUtils.findVMInstanceById(instanceId);
volResponse.setVirtualMachineId(vm.getId());
volResponse.setVirtualMachineName(vm.getName());
- volResponse.setVirtualMachineDisplayName(vm.getName());
+ if(vm.getType().equals(VirtualMachine.Type.User)) {
+ UserVm userVm = ApiDBUtils.findUserVmById(vm.getId());
+ volResponse.setVirtualMachineDisplayName(userVm.getDisplayName());
+ }else {
+ volResponse.setVirtualMachineDisplayName(vm.getName());
+ }
volResponse.setVirtualMachineState(vm.getState().toString());
}
@@ -802,7 +824,7 @@ public class ApiResponseHelper implements ResponseGenerator {
}
volResponse.setHypervisor(ApiDBUtils.getVolumeHyperType(volume.getId()).toString());
volResponse.setAttached(volume.getAttached());
- volResponse.setDestroyed(volume.getDestroyed());
+ volResponse.setDestroyed(volume.getState() == Volume.State.Destroy);
VMTemplateVO template = ApiDBUtils.findTemplateById(volume.getTemplateId());
boolean isExtractable = template != null&& template.isExtractable()&& !(template.getTemplateType()== TemplateType.SYSTEM);
volResponse.setExtractable(isExtractable);
@@ -1166,7 +1188,6 @@ public class ApiResponseHelper implements ResponseGenerator {
vmResponse.setSystemVmType(vm.getType().toString().toLowerCase());
vmResponse.setZoneId(vm.getDataCenterId());
- vmResponse.setNetworkDomain(vm.getDomain());
vmResponse.setName(vm.getName());
vmResponse.setPodId(vm.getPodId());
vmResponse.setTemplateId(vm.getTemplateId());
@@ -1848,7 +1869,7 @@ public class ApiResponseHelper implements ResponseGenerator {
ListResponse response = new ListResponse();
List isoResponses = new ArrayList();
- for (Pair isoZonePair : isoZonePairSet) {
+ for (Pair isoZonePair : isoZonePairSet) {
VMTemplateVO iso = ApiDBUtils.findTemplateById(isoZonePair.first());
if ( (isBootable == null || !isBootable) && iso.getTemplateType() == TemplateType.PERHOST ) {
TemplateResponse isoResponse = new TemplateResponse();
@@ -1862,8 +1883,14 @@ public class ApiResponseHelper implements ResponseGenerator {
isoResponse.setFeatured(iso.isFeatured());
isoResponse.setCrossZones(iso.isCrossZones());
isoResponse.setPublic(iso.isPublicTemplate());
+ isoResponse.setCreated(iso.getCreated());
isoResponse.setPasswordEnabled(false);
- isoResponse.setDomainId(iso.getDomainId());
+ Account owner = ApiDBUtils.findAccountById(iso.getAccountId());
+ if (owner != null) {
+ isoResponse.setAccount(owner.getAccountName());
+ isoResponse.setDomainId(owner.getDomainId());
+ isoResponse.setDomainName(ApiDBUtils.findDomainById(owner.getDomainId()).getName());
+ }
isoResponse.setObjectName("iso");
isoResponses.add(isoResponse);
response.setResponses(isoResponses);
@@ -2187,6 +2214,7 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setIsDefault(offering.isDefault());
response.setSpecifyVlan(offering.getSpecifyVlan());
response.setAvailability(offering.getAvailability().toString());
+ response.setNetworkRate(ApiDBUtils.getNetworkRate(offering.getId()));
response.setObjectName("networkoffering");
return response;
}
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 1251dd75bf2..924a8b0b019 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -370,6 +370,7 @@ public class ApiServer implements HttpRequestHandler {
Long objectId = null;
if (cmdObj instanceof BaseAsyncCreateCmd) {
BaseAsyncCreateCmd createCmd = (BaseAsyncCreateCmd)cmdObj;
+ ctx.setAccountId(createCmd.getEntityOwnerId());
_dispatcher.dispatchCreateCmd(createCmd, params);
objectId = createCmd.getEntityId();
params.put("id", objectId.toString());
@@ -386,13 +387,21 @@ public class ApiServer implements HttpRequestHandler {
params.put("ctxAccountId", String.valueOf(account.getId()));
}
+ long startEventId = ctx.getStartEventId();
+ asyncCmd.setStartEventId(startEventId);
+
// save the scheduled event
Long eventId = EventUtils.saveScheduledEvent((userId == null) ? User.UID_SYSTEM : userId, asyncCmd.getEntityOwnerId(),
- asyncCmd.getEventType(), asyncCmd.getEventDescription());
-
- if (eventId != null) {
- params.put("starteventid", eventId.toString());
+ asyncCmd.getEventType(), asyncCmd.getEventDescription(), startEventId);
+ if(startEventId == 0){
+ //There was no create event before, set current event id as start eventId
+ startEventId = eventId;
}
+
+ params.put("ctxStartEventId", String.valueOf(startEventId));
+
+ ctx.setAccountId(asyncCmd.getEntityOwnerId());
+
AsyncJobVO job = new AsyncJobVO();
job.setInstanceId((objectId == null) ? asyncCmd.getInstanceId() : objectId);
@@ -654,16 +663,6 @@ public class ApiServer implements HttpRequestHandler {
Account account = _ms.findAccountById(userAcct.getAccountId());
- String hypervisorType = _ms.getConfigurationValue("hypervisor.type");
- if (hypervisorType == null) {
- hypervisorType = "kvm";
- }
-
- String directAttachSecurityGroupsEnabled = _ms.getConfigurationValue("direct.attach.security.groups.enabled");
- if(directAttachSecurityGroupsEnabled == null) {
- directAttachSecurityGroupsEnabled = "false";
- }
-
// set the userId and account object for everyone
session.setAttribute("userid", userAcct.getId());
session.setAttribute("username", userAcct.getUsername());
@@ -673,8 +672,6 @@ public class ApiServer implements HttpRequestHandler {
session.setAttribute("account", account.getAccountName());
session.setAttribute("domainid", account.getDomainId());
session.setAttribute("type", Short.valueOf(account.getType()).toString());
- session.setAttribute("hypervisortype", hypervisorType);
- session.setAttribute("directattachsecuritygroupsenabled", directAttachSecurityGroupsEnabled);
if (timezone != null) {
session.setAttribute("timezone", timezone);
diff --git a/server/src/com/cloud/api/doc/Command.java b/server/src/com/cloud/api/doc/Command.java
index 6aa8ef92e07..9416919ac06 100644
--- a/server/src/com/cloud/api/doc/Command.java
+++ b/server/src/com/cloud/api/doc/Command.java
@@ -68,16 +68,18 @@ public class Command {
public Argument getReqArgByName(String name){
for (Argument a : this.getRequest()) {
- if (a.getName().equals(name))
- return a;
+ if (a.getName().equals(name)) {
+ return a;
+ }
}
return null;
}
public Argument getResArgByName(String name){
for (Argument a : this.getResponse()) {
- if (a.getName().equals(name))
- return a;
+ if (a.getName().equals(name)) {
+ return a;
+ }
}
return null;
}
diff --git a/server/src/com/cloud/async/executor/AssignToLoadBalancerExecutor.java b/server/src/com/cloud/async/executor/AssignToLoadBalancerExecutor.java
deleted file mode 100644
index d0cbc682cc6..00000000000
--- a/server/src/com/cloud/async/executor/AssignToLoadBalancerExecutor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.lang.reflect.Type;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-
-public class AssignToLoadBalancerExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(AssignToLoadBalancerExecutor.class.getName());
-
- @Override
- public boolean execute() {
- /*
- if (getSyncSource() == null) {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- Type mapType = new TypeToken>() {}.getType();
-
- Map params = gson.fromJson(job.getCmdInfo(), mapType);
- for (Object paramObj : params.values()) {
- s_logger.error("%%% %%% deserialized param: " + paramObj);
- }
- LoadBalancerParam param = gson.fromJson(job.getCmdInfo(), LoadBalancerParam.class);
- asyncMgr.syncAsyncJobExecution(job.getId(), "Router", param.getDomainRouterId());
-
- // always true if it does not have sync-source
- return true;
- } else {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
-
- LoadBalancerParam param = gson.fromJson(job.getCmdInfo(), LoadBalancerParam.class);
-// return asyncMgr.getExecutorContext().getNetworkMgr().executeAssignToLoadBalancer(this, param);
- return true;
- }
- */
- return true;
- }
-}
diff --git a/server/src/com/cloud/async/executor/AttachISOExecutor.java b/server/src/com/cloud/async/executor/AttachISOExecutor.java
deleted file mode 100644
index 1b10a024d8d..00000000000
--- a/server/src/com/cloud/async/executor/AttachISOExecutor.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.serializer.GsonHelper;
-import com.google.gson.Gson;
-
-public class AttachISOExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(AttachISOExecutor.class.getName());
-
- public boolean execute() {
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- Gson gson = GsonHelper.getBuilder().create();
-
- /*
- if(getSyncSource() == null) {
- AttachISOParam param = gson.fromJson(job.getCmdInfo(), AttachISOParam.class);
- asyncMgr.syncAsyncJobExecution(job.getId(), "AttachISO", param.getVmId());
-
- // always true if it does not have sync-source
- return true;
- } else {
- AttachISOParam param = gson.fromJson(job.getCmdInfo(), AttachISOParam.class);
-
- long vmId = param.getVmId();
- long userId = param.getUserId();
- long isoId = param.getIsoId();
- boolean attach = param.isAttach();
-
- // Build the success/failure messages
- String successMsg;
- String failureMsg;
-
- if (attach) {
- successMsg = "Successfully inserted CD.";
- failureMsg = "Failed to insert CD. Please make sure an existing CD is not currently in use.";
- } else {
- successMsg = "Successfully ejected CD.";
- failureMsg = "Failed to eject CD. Please make sure an existing CD is not currently in use.";
- }
-
- try {
- boolean result = asyncMgr.getExecutorContext().getManagementServer().attachISOToVM(vmId, userId, isoId, attach, param.getEventId());
- if (result)
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, successMsg);
- else
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, failureMsg);
- } catch(Exception e) {
- s_logger.warn("Unable to attach ISO: " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- }
-
- return true;
- }
- */
- return true;
- }
-
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/AttachISOParam.java b/server/src/com/cloud/async/executor/AttachISOParam.java
deleted file mode 100644
index 4db4f8b58c8..00000000000
--- a/server/src/com/cloud/async/executor/AttachISOParam.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class AttachISOParam {
- private long vmId;
- private long userId;
- private long isoId;
- private boolean attach;
- private long eventId;
-
- public AttachISOParam() {
- }
-
- public AttachISOParam(long vmId, long userId, long isoId, boolean attach) {
- this.vmId = vmId;
- this.userId = userId;
- this.isoId = isoId;
- this.attach = attach;
- }
-
- public long getVmId() {
- return vmId;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public long getIsoId() {
- return isoId;
- }
-
- public boolean isAttach() {
- return attach;
- }
-
- public void setEventId(long eventId) {
- this.eventId = eventId;
- }
-
- public long getEventId() {
- return eventId;
- }
-}
diff --git a/server/src/com/cloud/async/executor/AttachVolumeOperationResultObject.java b/server/src/com/cloud/async/executor/AttachVolumeOperationResultObject.java
deleted file mode 100644
index 86ccebe8e03..00000000000
--- a/server/src/com/cloud/async/executor/AttachVolumeOperationResultObject.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import com.cloud.serializer.Param;
-
-public class AttachVolumeOperationResultObject {
- @Param(name="virtualmachineid")
- private Long virtualMachineId;
-
- @Param(name="vmname")
- private String vmName;
-
- @Param(name="vmdisplayname")
- private String vmDisplayName;
-
- @Param(name="vmstate")
- private String vmState;
-
- @Param(name="id")
- private Long volumeId;
-
- @Param(name="name")
- private String volumeName;
-
- @Param(name="storagetype")
- String storageType;
-
- public AttachVolumeOperationResultObject() {
- }
-
- public Long getVirtualMachineId() {
- return virtualMachineId;
- }
-
- public void setVirtualMachineId(Long virtualMachineId) {
- this.virtualMachineId = virtualMachineId;
- }
-
- public String getVmName() {
- return vmName;
- }
-
- public void setVmName(String vmName) {
- this.vmName = vmName;
- }
-
- public String getVmDisplayName() {
- return vmDisplayName;
- }
-
- public void setVmDisplayName(String vmDisplayName) {
- this.vmDisplayName = vmDisplayName;
- }
-
- public String getVmState() {
- return vmState;
- }
-
- public void setVmState(String vmState) {
- this.vmState = vmState;
- }
-
- public Long getVolumeId() {
- return volumeId;
- }
-
- public void setVolumeId(Long volumeId) {
- this.volumeId = volumeId;
- }
-
- public String getVolumeName() {
- return volumeName;
- }
-
- public void setVolumeName(String volumeName) {
- this.volumeName = volumeName;
- }
-
- public String getStorageType() {
- return storageType;
- }
-
- public void setStorageType(String storageType) {
- this.storageType = storageType;
- }
-}
diff --git a/server/src/com/cloud/async/executor/AuthorizeSecurityGroupIngressExecutor.java b/server/src/com/cloud/async/executor/AuthorizeSecurityGroupIngressExecutor.java
deleted file mode 100644
index 3f1477a6474..00000000000
--- a/server/src/com/cloud/async/executor/AuthorizeSecurityGroupIngressExecutor.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.cloud.async.executor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.network.security.IngressRuleVO;
-import com.cloud.network.security.SecurityGroupRulesVO;
-import com.cloud.network.security.SecurityGroupVO;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.user.AccountVO;
-import com.google.gson.Gson;
-
-public class AuthorizeSecurityGroupIngressExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(AuthorizeSecurityGroupIngressExecutor.class.getName());
-
- @Override
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- SecurityGroupIngressParam param = gson.fromJson(job.getCmdInfo(), SecurityGroupIngressParam.class);
- AccountVO account = param.getAccount();
-
- /*
- if (getSyncSource() == null) {
- SecurityGroupVO networkGroup = managementServer.findNetworkGroupByName(param.getAccount().getId(), param.getGroupName());
- if(networkGroup == null) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED,
- BaseCmd.PARAM_ERROR, "Unable to find network group " + param.getGroupName() + " for account " + account.getAccountName() + " (id: " + account.getId() + ")");
- } else {
- asyncMgr.syncAsyncJobExecution(job.getId(), "SecurityGroup", networkGroup.getId());
- }
- return true;
- } else {
- try {
- List addedRules = managementServer.authorizeNetworkGroupIngress(account, param.getGroupName(), param.getProtocol(), param.getStartPort(), param.getEndPort(), param.getCidrList(), param.getAuthorizedGroups());
- if ((addedRules != null) && !addedRules.isEmpty()) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, composeResultObject(managementServer, account.getId(), param.getGroupName(), addedRules));
- } else {
- if (addedRules == null) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "Failed to authorize network group ingress for group: " + param.getGroupName() + " for account: " + account.getAccountName() + " (id: " + account.getId() + ")");
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.PARAM_ERROR,
- "Failed to authorize network group ingress for group: " + param.getGroupName() + ", ingress rules already exist.");
- }
- }
- } catch(Exception e) {
- s_logger.warn("Failed to authorize network group ingress from group: " + param.getGroupName() + " for account: " + account.getAccountName() + " (id: " + account.getId() + ")", e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "Failed to authorize network group ingress from group: " + param.getGroupName() + " for account: " + account.getAccountName() + " (id: " + account.getId() + ")");
- }
- }
- */
-
- return true;
- }
-
- private SecurityGroupResultObject composeResultObject(ManagementServer ms, Long accountId, String groupName, List addedRules) {
- SecurityGroupVO networkGroup = ms.findNetworkGroupByName(accountId, groupName);
- List groupRules = new ArrayList();
- for (IngressRuleVO ingressRule : addedRules) {
- SecurityGroupRulesVO groupRule = new SecurityGroupRulesVO(networkGroup.getId(), networkGroup.getName(), networkGroup.getDescription(), networkGroup.getDomainId(),
- networkGroup.getAccountId(), networkGroup.getAccountName(), ingressRule.getId(), ingressRule.getStartPort(), ingressRule.getEndPort(),
- ingressRule.getProtocol(), ingressRule.getAllowedNetworkId(), ingressRule.getAllowedSecurityGroup(), ingressRule.getAllowedSecGrpAcct(),
- ingressRule.getAllowedSourceIpCidr());
- groupRules.add(groupRule);
- }
- List results = SecurityGroupResultObject.transposeNetworkGroups(groupRules);
- if ((results != null) && !results.isEmpty()) {
- return results.get(0);
- }
- return null;
- }
-}
diff --git a/server/src/com/cloud/async/executor/ConsoleProxyExecutorHelper.java b/server/src/com/cloud/async/executor/ConsoleProxyExecutorHelper.java
deleted file mode 100644
index b56540e0a08..00000000000
--- a/server/src/com/cloud/async/executor/ConsoleProxyExecutorHelper.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import com.cloud.server.ManagementServer;
-import com.cloud.vm.ConsoleProxyVO;
-
-public class ConsoleProxyExecutorHelper {
-
- public static ConsoleProxyOperationResultObject composeResultObject(ManagementServer managementServer, ConsoleProxyVO proxy) {
- ConsoleProxyOperationResultObject result = new ConsoleProxyOperationResultObject();
- result.setId(proxy.getId());
- result.setName(proxy.getName());
- result.setZoneId(proxy.getDataCenterId());
- result.setZoneName(managementServer.findDataCenterById(proxy.getDataCenterId()).getName());
- result.setDns1(proxy.getDns1());
- result.setDns2(proxy.getDns2());
- result.setNetworkDomain(proxy.getDomain());
- result.setGateway(proxy.getGateway());
- result.setPodId(proxy.getPodId());
- result.setHostId(proxy.getHostId());
- if(proxy.getHostId() != null)
- result.setHostName(managementServer.getHostBy(proxy.getHostId()).getName());
-
- result.setPrivateIp(proxy.getPrivateIpAddress());
- result.setPrivateMac(proxy.getPrivateMacAddress());
- result.setPrivateNetmask(proxy.getPrivateNetmask());
- result.setPublicIp(proxy.getPublicIpAddress());
- result.setPublicMac(proxy.getPublicMacAddress());
- result.setPublicNetmask(proxy.getPublicNetmask());
- result.setTemplateId(proxy.getTemplateId());
- result.setCreated(proxy.getCreated());
- result.setActionSessions(proxy.getActiveSession());
- result.setState(proxy.getState().toString());
-
- return result;
- }
-}
diff --git a/server/src/com/cloud/async/executor/ConsoleProxyOperationResultObject.java b/server/src/com/cloud/async/executor/ConsoleProxyOperationResultObject.java
deleted file mode 100644
index 111e1a623ef..00000000000
--- a/server/src/com/cloud/async/executor/ConsoleProxyOperationResultObject.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-
-public class ConsoleProxyOperationResultObject {
-
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="zoneid")
- private long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="dns1")
- private String dns1;
-
- @Param(name="dns2")
- private String dns2;
-
- @Param(name="networkdomain")
- private String networkDomain;
-
- @Param(name="gateway")
- private String gateway;
-
- @Param(name="podid")
- private long podId;
-
- @Param(name="hostid")
- private Long hostId;
-
- @Param(name="hostname")
- private String hostName;
-
- @Param(name="privateip")
- private String privateIp;
-
- @Param(name="privatemacaddress")
- private String privateMac;
-
- @Param(name="privatenetmask")
- private String privateNetmask;
-
- @Param(name="publicip")
- private String publicIp;
-
- @Param(name="publicmacaddress")
- private String publicMac;
-
- @Param(name="publicnetmask")
- private String publicNetmask;
-
- @Param(name="templateid")
- private long templateId;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="activeviewersessions")
- private int actionSessions;
-
- @Param(name="state")
- private String state;
-
- public ConsoleProxyOperationResultObject() {
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public String getDns1() {
- return dns1;
- }
-
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public String getDns2() {
- return dns2;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
- public String getNetworkDomain() {
- return networkDomain;
- }
-
- public void setNetworkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- }
-
- public String getGateway() {
- return gateway;
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public long getPodId() {
- return podId;
- }
-
- public void setPodId(long podId) {
- this.podId = podId;
- }
-
- public Long getHostId() {
- return hostId;
- }
-
- public void setHostId(Long hostId) {
- this.hostId = hostId;
- }
-
- public String getHostName() {
- return hostName;
- }
-
- public void setHostName(String hostName) {
- this.hostName = hostName;
- }
-
- public String getPrivateIp() {
- return privateIp;
- }
-
- public void setPrivateIp(String privateIp) {
- this.privateIp = privateIp;
- }
-
- public String getPrivateMac() {
- return privateMac;
- }
-
- public void setPrivateMac(String privateMac) {
- this.privateMac = privateMac;
- }
-
- public String getPrivateNetmask() {
- return privateNetmask;
- }
-
- public void setPrivateNetmask(String privateNetmask) {
- this.privateNetmask = privateNetmask;
- }
-
- public String getPublicIp() {
- return publicIp;
- }
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public String getPublicMac() {
- return publicMac;
- }
-
- public void setPublicMac(String publicMac) {
- this.publicMac = publicMac;
- }
-
- public String getPublicNetmask() {
- return publicNetmask;
- }
-
- public void setPublicNetmask(String publicNetmask) {
- this.publicNetmask = publicNetmask;
- }
-
- public long getTemplateId() {
- return templateId;
- }
-
- public void setTemplateId(long templateId) {
- this.templateId = templateId;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public int getActionSessions() {
- return actionSessions;
- }
-
- public void setActionSessions(int actionSessions) {
- this.actionSessions = actionSessions;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-}
diff --git a/server/src/com/cloud/async/executor/CopyTemplateExecutor.java b/server/src/com/cloud/async/executor/CopyTemplateExecutor.java
deleted file mode 100644
index 2364e5df66b..00000000000
--- a/server/src/com/cloud/async/executor/CopyTemplateExecutor.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.dc.DataCenterVO;
-import com.cloud.domain.Domain;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.storage.VMTemplateHostVO;
-import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.user.Account;
-import com.google.gson.Gson;
-
-public class CopyTemplateExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(CopyTemplateExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
-
- CopyTemplateParam param = gson.fromJson(job.getCmdInfo(), CopyTemplateParam.class);
-
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
-
- try {
- boolean success = managementServer.copyTemplate(param.getUserId(), param.getTemplateId(), param.getSourceZoneId(), param.getDestZoneId());
-
- if (success) {
- VMTemplateVO template = managementServer.findTemplateById(param.getTemplateId());
- DataCenterVO destZone = managementServer.findDataCenterById(param.getDestZoneId());
-// VMTemplateHostVO templateHostRef = managementServer.findTemplateHostRef(param.getTemplateId(), destZone.getId());
- long guestOsId = template.getGuestOSId();
- Account owner = managementServer.findAccountById(template.getAccountId());
-
-// DomainVO domain = managementServer.findDomainIdById(owner.getDomainId());
-// String guestOSName = managementServer.findGuestOSById(guestOsId).getName();
-// asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, composeResultObject(template, templateHostRef, destZone,guestOSName, owner, domain));
-
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, "Failed to copy template.");
- }
-
- } catch (Exception e) {
- s_logger.warn("Unable to copy template: " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- }
-
- return true;
- }
-
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-
- private CopyTemplateResultObject composeResultObject(VMTemplateVO template, VMTemplateHostVO templateHostRef, DataCenterVO destZone, String guestOSName, Account owner, Domain domain) {
- CopyTemplateResultObject resultObject = new CopyTemplateResultObject();
-
-
- // If the user is an admin, add the template download status
- boolean isAdmin = false;
-
- if(owner.getType() == Account.ACCOUNT_TYPE_ADMIN)
- isAdmin = true;
-
- if (isAdmin || owner.getId() == template.getAccountId()) {
- // add download status
- if (templateHostRef.getDownloadState()!=Status.DOWNLOADED) {
- String templateStatus = "Processing";
- if (templateHostRef.getDownloadState() == VMTemplateHostVO.Status.DOWNLOAD_IN_PROGRESS) {
- if (templateHostRef.getDownloadPercent() == 100) {
- templateStatus = "Installing Template";
- } else {
- templateStatus = templateHostRef.getDownloadPercent() + "% Downloaded";
- }
- } else {
- templateStatus = templateHostRef.getErrorString();
- }
- resultObject.setTemplateStatus(templateStatus);
- } else if (templateHostRef.getDownloadState() == VMTemplateHostVO.Status.DOWNLOADED) {
- resultObject.setTemplateStatus("Download Complete");
- } else {
- resultObject.setTemplateStatus("Successfully Installed");
- }
- }
-
- resultObject.setAccountName(owner.getAccountName());
- resultObject.setDomainId(owner.getDomainId());
- resultObject.setDomainName(domain.getName());
- resultObject.setId(template.getId());
- resultObject.setName(template.getName());
- resultObject.setDisplayText(template.getDisplayText());
- resultObject.setPublic(template.isPublicTemplate());
- resultObject.setOsTypeName(guestOSName);
- resultObject.setCreated(templateHostRef.getCreated());
- resultObject.setReady(templateHostRef != null && templateHostRef.getDownloadState() == Status.DOWNLOADED);
- resultObject.setFeatured(template.isFeatured());
- resultObject.setPasswordEnabled(template.getEnablePassword());
- resultObject.setFormat(template.getFormat());
- resultObject.setGuestOsId(template.getGuestOSId());
- resultObject.setZoneId(destZone.getId());
- resultObject.setZoneName(destZone.getName());
- return resultObject;
- }
-}
diff --git a/server/src/com/cloud/async/executor/CopyTemplateParam.java b/server/src/com/cloud/async/executor/CopyTemplateParam.java
deleted file mode 100644
index 09f11542bb6..00000000000
--- a/server/src/com/cloud/async/executor/CopyTemplateParam.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class CopyTemplateParam {
-
- private long userId;
- private long templateId;
- private Long sourceZoneId;
- private Long destZoneId;
- private long eventId;
-
- public CopyTemplateParam() {
- }
-
- public CopyTemplateParam(long userId, long templateId, Long sourceZoneId, Long destZoneId, long eventId) {
- this.userId = userId;
- this.templateId = templateId;
- this.sourceZoneId = sourceZoneId;
- this.destZoneId = destZoneId;
- this.eventId = eventId;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public long getTemplateId() {
- return templateId;
- }
-
- public Long getSourceZoneId() {
- return sourceZoneId;
- }
-
- public Long getDestZoneId() {
- return destZoneId;
- }
-
- public void setEventId(long eventId) {
- this.eventId = eventId;
- }
-
- public long getEventId() {
- return eventId;
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/CopyTemplateResultObject.java b/server/src/com/cloud/async/executor/CopyTemplateResultObject.java
deleted file mode 100644
index 63f7a0b03da..00000000000
--- a/server/src/com/cloud/async/executor/CopyTemplateResultObject.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-import com.cloud.storage.Storage.ImageFormat;
-
-public class CopyTemplateResultObject {
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="displaytext")
- private String displayText;
-
- @Param(name="ispublic", propName="public")
- private boolean isPublic;
-
-// @Param(name="requireshvm")
-// private Boolean requiresHvm;
-//
-// @Param(name="bits")
-// private Integer bits;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="isready", propName="ready")
- private boolean isReady;
-
- @Param(name="isfeatured", propName="featured")
- private boolean isFeatured;
-
- @Param(name="passwordenabled")
- private boolean passwordEnabled;
-
- @Param(name="format")
- private ImageFormat format;
-
- @Param(name="ostypeid")
- private long guestOsId;
-
- @Param(name="zoneid")
- private long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="ostypename")
- private String osTypeName;
-
- @Param(name="account")
- private String accountName;
-
- @Param(name="domain")
- private String domainName;
-
- @Param(name="domainid")
- private long domainId;
-
- @Param(name="templatestatus")
- private String templateStatus;
-
- public String getTemplateStatus() {
- return templateStatus;
- }
-
- public void setTemplateStatus(String templateStatus) {
- this.templateStatus = templateStatus;
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDisplayText() {
- return displayText;
- }
-
- public void setDisplayText(String displayText) {
- this.displayText = displayText;
- }
-
- public boolean isPublic() {
- return isPublic;
- }
-
- public void setPublic(boolean isPublic) {
- this.isPublic = isPublic;
- }
-
-// public boolean isRequiresHvm() {
-// return requiresHvm;
-// }
-//
-// public void setRequiresHvm(boolean requiresHvm) {
-// this.requiresHvm = requiresHvm;
-// }
-//
-// public int getBits() {
-// return bits;
-// }
-//
-// public void setBits(int bits) {
-// this.bits = bits;
-// }
-
- public Date getCreated() {
- return created;
- }
-
- public String getOsTypeName() {
- return this.osTypeName;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public boolean isReady() {
- return isReady;
- }
-
- public void setReady(boolean isReady) {
- this.isReady = isReady;
- }
-
- public boolean isFeatured() {
- return isFeatured;
- }
-
- public void setFeatured(boolean isFeatured) {
- this.isFeatured = isFeatured;
- }
-
- public boolean isPasswordEnabled() {
- return passwordEnabled;
- }
-
- public void setPasswordEnabled(boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- }
-
- public ImageFormat getFormat() {
- return format;
- }
-
- public void setFormat(ImageFormat format) {
- this.format = format;
- }
-
- public long getGuestOsId() {
- return guestOsId;
- }
-
- public void setGuestOsId(long guestOsId) {
- this.guestOsId = guestOsId;
- }
-
- public void setOsTypeName(String osTypeName) {
- this.osTypeName = osTypeName;
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-
- public void setDomainId(long domainId) {
- this.domainId = domainId;
- }
-
- public long getZoneId() {
- return zoneId;
- }
-
- public long getDomainId() {
- return domainId;
- }
-
- public String getAccountName(){
- return accountName;
- }
-
- public String getDomainName(){
- return domainName;
- }
-
- public void setZoneId(long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-}
diff --git a/server/src/com/cloud/async/executor/CreateOrUpdateRuleExecutor.java b/server/src/com/cloud/async/executor/CreateOrUpdateRuleExecutor.java
deleted file mode 100644
index 529600bdfe2..00000000000
--- a/server/src/com/cloud/async/executor/CreateOrUpdateRuleExecutor.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.exception.InternalErrorException;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.NetworkRuleConflictException;
-import com.cloud.exception.PermissionDeniedException;
-import com.cloud.network.NetworkRuleConfigVO;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-
-public class CreateOrUpdateRuleExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(CreateOrUpdateRuleExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- CreateOrUpdateRuleParam param = gson.fromJson(job.getCmdInfo(), CreateOrUpdateRuleParam.class);
-
- /*
- try {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Executing createOrUpdateRule, uid: " + job.getUserId() + ", pfservice id: " + param.getSecurityGroupId()
- + ", addr: " + param.getAddress() + ", port: " + param.getPort() + ", private IP: " + param.getPrivateIpAddress()
- + ", private port: " + param.getPrivatePort() + ", protocol: " + param.getProtocol() + ", algorithm: " + param.getAlgorithm());
-
- NetworkRuleConfigVO rule = managementServer.createOrUpdateRule(job.getUserId(), param.getSecurityGroupId(),
- param.getAddress(), param.getPort(), param.getPrivateIpAddress(), param.getPrivatePort(),
- param.getProtocol(), param.getAlgorithm());
-
- if(rule != null) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("createOrUpdateRule executed successfully, complete async-execution");
-
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- composeResultObject(managementServer, param, rule));
-
- } else {
- s_logger.warn("createOrUpdateRule execution failed: null rule object is returned, complete async-execution");
-
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, "operation failed");
- }
- } catch (InvalidParameterValueException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to creat or update rule: " + e.getMessage());
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.PARAM_ERROR, e.getMessage());
- } catch (PermissionDeniedException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to creat or update rule: " + e.getMessage());
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.PARAM_ERROR, e.getMessage());
- } catch (NetworkRuleConflictException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to creat or update rule: " + e.getMessage());
- if(param.isForwarding())
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.NET_CONFLICT_IPFW_RULE_ERROR, e.getMessage());
- else
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.NET_CONFLICT_LB_RULE_ERROR, e.getMessage());
- } catch (InternalErrorException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to creat or update rule: " + e.getMessage());
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- } catch(Exception e) {
- s_logger.warn("Unable to creat or update rule: " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- }
- */
- return true;
- }
-
- private CreateOrUpdateRuleResultObject composeResultObject(ManagementServer managementServer,
- CreateOrUpdateRuleParam param, NetworkRuleConfigVO rule) {
-
- CreateOrUpdateRuleResultObject resultObject = new CreateOrUpdateRuleResultObject();
- resultObject.setRuleId(rule.getId());
- resultObject.setPublicIp(param.getAddress());
- resultObject.setPublicPort(Integer.valueOf(param.getPort()));
- resultObject.setPrivateIp(param.getPrivateIpAddress());
- resultObject.setPrivatePort(Integer.valueOf(param.getPrivatePort()));
- resultObject.setEnabled(true);
- resultObject.setAlgorithm(param.getAlgorithm());
- resultObject.setProtocol(param.getProtocol());
- resultObject.setPortForwardingServiceId(param.getSecurityGroupId());
- return resultObject;
- }
-}
diff --git a/server/src/com/cloud/async/executor/CreateOrUpdateRuleParam.java b/server/src/com/cloud/async/executor/CreateOrUpdateRuleParam.java
deleted file mode 100644
index 6e420cfdd82..00000000000
--- a/server/src/com/cloud/async/executor/CreateOrUpdateRuleParam.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class CreateOrUpdateRuleParam {
- private boolean isForwarding;
- private long userId;
- private Long accountId;
- private String address;
- private String port;
- private String privateIpAddress;
- private String privatePort;
- private String protocol;
- private String algorithm;
- private Long domainId;
- private Long securityGroupId;
-
- public CreateOrUpdateRuleParam() {
- }
-
- public CreateOrUpdateRuleParam(boolean isForwarding, long userId, Long accountId, String address,
- String port, String privateIpAddress, String privatePort, String protocol, String algorithm, Long domainId, Long securityGroupId) {
- this.isForwarding = isForwarding;
- this.userId = userId;
- this.accountId = accountId;
- this.address = address;
- this.port = port;
- this.privateIpAddress = privateIpAddress;
- this.privatePort = privatePort;
- this.protocol = protocol;
- this.algorithm = algorithm;
- this.domainId = domainId;
- this.securityGroupId = securityGroupId;
- }
-
- public boolean isForwarding() {
- return isForwarding;
- }
-
- public void setForwarding(boolean isForwarding) {
- this.isForwarding = isForwarding;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public void setUserId(long userId) {
- this.userId = userId;
- }
-
- public Long getAccountId() {
- return accountId;
- }
-
- public void setAccountId(Long accountId) {
- this.accountId = accountId;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getPort() {
- return port;
- }
-
- public void setPort(String port) {
- this.port = port;
- }
-
- public String getPrivateIpAddress() {
- return privateIpAddress;
- }
-
- public void setPrivateIpAddress(String privateIpAddress) {
- this.privateIpAddress = privateIpAddress;
- }
-
- public String getPrivatePort() {
- return privatePort;
- }
-
- public void setPrivatePort(String privatePort) {
- this.privatePort = privatePort;
- }
-
- public String getProtocol() {
- return protocol;
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-
- public String getAlgorithm() {
- return algorithm;
- }
-
- public void setAlgorithm(String algorithm) {
- this.algorithm = algorithm;
- }
-
- public Long getDomainId() {
- return domainId;
- }
-
- public void setDomainId(Long domainId) {
- this.domainId = domainId;
- }
-
- public Long getSecurityGroupId() {
- return securityGroupId;
- }
-
- public void setSecurityGroupId(Long securityGroupId) {
- this.securityGroupId = securityGroupId;
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/CreateOrUpdateRuleResultObject.java b/server/src/com/cloud/async/executor/CreateOrUpdateRuleResultObject.java
deleted file mode 100644
index e9516861c31..00000000000
--- a/server/src/com/cloud/async/executor/CreateOrUpdateRuleResultObject.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import com.cloud.serializer.Param;
-
-public class CreateOrUpdateRuleResultObject {
-
- @Param(name="id")
- private long ruleId;
-
- @Param(name="publicip")
- private String publicIp;
-
- @Param(name="publicport")
- private int publicPort;
-
- @Param(name="privateip")
- private String privateIp;
-
- @Param(name="privateport")
- private int privatePort;
-
- @Param(name="isenabled")
- private boolean isEnabled;
-
- @Param(name="protocol")
- private String protocol;
-
- @Param(name="algorithm")
- private String algorithm;
-
- @Param(name="portforwardingserviceid")
- private Long portForwardingServiceId;
-
- public Long getPortForwardingServiceId() {
- return portForwardingServiceId;
- }
-
- public void setPortForwardingServiceId(Long portForwardingServiceId) {
- this.portForwardingServiceId = portForwardingServiceId;
- }
-
- public String getAlgorithm() {
- return algorithm;
- }
-
- public void setAlgorithm(String algorithm) {
- this.algorithm = algorithm;
- }
-
- public long getRuleId() {
- return ruleId;
- }
-
- public void setRuleId(long ruleId) {
- this.ruleId = ruleId;
- }
-
- public String getPublicIp() {
- return publicIp;
- }
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public int getPublicPort() {
- return publicPort;
- }
-
- public void setPublicPort(int publicPort) {
- this.publicPort = publicPort;
- }
-
- public String getPrivateIp() {
- return privateIp;
- }
-
- public void setPrivateIp(String privateIp) {
- this.privateIp = privateIp;
- }
-
- public int getPrivatePort() {
- return privatePort;
- }
-
- public void setPrivatePort(int privatePort) {
- this.privatePort = privatePort;
- }
-
- public boolean isEnabled() {
- return isEnabled;
- }
-
- public void setEnabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- }
-
- public String getProtocol() {
- return protocol;
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-}
diff --git a/server/src/com/cloud/async/executor/CreatePrivateTemplateExecutor.java b/server/src/com/cloud/async/executor/CreatePrivateTemplateExecutor.java
deleted file mode 100644
index 64b8c55b11a..00000000000
--- a/server/src/com/cloud/async/executor/CreatePrivateTemplateExecutor.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobExecutorContext;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.configuration.ResourceCount.ResourceType;
-import com.cloud.dc.DataCenterVO;
-import com.cloud.event.EventTypes;
-import com.cloud.event.EventVO;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.storage.GuestOS;
-import com.cloud.storage.Snapshot;
-import com.cloud.storage.VMTemplateHostVO;
-import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.VolumeVO;
-import com.cloud.user.Account;
-import com.cloud.user.AccountManager;
-import com.cloud.user.AccountVO;
-import com.cloud.vm.UserVmManager;
-import com.google.gson.Gson;
-
-public class CreatePrivateTemplateExecutor extends VolumeOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(CreatePrivateTemplateExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
-
- /*
- if(getSyncSource() == null) {
- CreatePrivateTemplateParam param = gson.fromJson(job.getCmdInfo(), CreatePrivateTemplateParam.class);
- asyncMgr.syncAsyncJobExecution(job.getId(), "Volume", param.getVolumeId());
-
- // always true if it does not have sync-source
- return true;
- } else {
- CreatePrivateTemplateParam param = gson.fromJson(job.getCmdInfo(), CreatePrivateTemplateParam.class);
-
- AsyncJobExecutorContext asyncJobExecutorContext = asyncMgr.getExecutorContext();
- ManagementServer managerServer = asyncJobExecutorContext.getManagementServer();
- AccountManager accountManager = asyncJobExecutorContext.getAccountMgr();
- UserVmManager vmMgr = asyncJobExecutorContext.getVmMgr();
-
- Long snapshotId = param.getSnapshotId();
- Long volumeId = param.getVolumeId();
- managerServer.saveStartedEvent(param.getUserId(), param.getAccountId(), EventTypes.EVENT_TEMPLATE_CREATE, "Creating Template: " +param.getName(), param.getEventId());
- // By default, assume failure
- String details = "Could not create private template from ";
- if (snapshotId != null) {
- details += "snapshot with id: " + snapshotId;
- }
- else {
- details += "volume with id: " + volumeId;
- }
- // Job details
- Long jobId = getJob().getId();
- int jobStatus = AsyncJobResult.STATUS_FAILED;
- int resultCode = BaseCmd.INTERNAL_ERROR;
- Object resultObject = null;
- try {
- // Check that the resource limit for templates won't be exceeded
- VolumeVO volume = managerServer.findAnyVolumeById(volumeId);
-
- if (volume == null) {
- throw new InvalidParameterValueException("Could not find active volume with ID " + volumeId);
- }
-
- AccountVO account = (AccountVO) managerServer.findAccountById(volume.getAccountId());
- if (accountManager.resourceLimitExceeded(account, ResourceType.template)) {
- details += ", reason: The maximum number of templates for the specified account has been exceeded.";
- }
- else {
- VMTemplateVO template = vmMgr.createPrivateTemplateRecord(param.getUserId(),
- param.getVolumeId(),
- param.getName(),
- param.getDescription(),
- param.getGuestOsId(),
- param.getRequiresHvm(),
- param.getBits(),
- param.isPasswordEnabled(),
- param.isPublic(),
- param.isFeatured());
-
- if (template != null) {
-
- if(s_logger.isInfoEnabled())
- s_logger.info("CreatePrivateTemplate created a new instance " + template.getId()
- + ", update async job-" + job.getId() + " progress status");
-
- asyncMgr.updateAsyncJobAttachment(job.getId(), "vm_template", template.getId());
- asyncMgr.updateAsyncJobStatus(job.getId(), BaseCmd.PROGRESS_INSTANCE_CREATED, template.getId());
-
- template = managerServer.createPrivateTemplate(template, param.getUserId(), snapshotId, volumeId, param.getName(), param.getDescription());
-
- if (template != null) {
- VMTemplateHostVO templateHostRef = managerServer.findTemplateHostRef(template.getId(),
- volume.getDataCenterId());
- jobStatus = AsyncJobResult.STATUS_SUCCEEDED;
- resultCode = 0;
- details = null;
- String eventParams = "id=" + template.getId() + "\nname=" + template.getName() + "\nsize="
- + volume.getSize() + "\ndcId=" + volume.getDataCenterId();
- managerServer.saveEvent(param.getUserId(), param.getAccountId(), EventVO.LEVEL_INFO,
- EventTypes.EVENT_TEMPLATE_CREATE, "Successfully created Template "
- + param.getName(), eventParams, param.getEventId());
- resultObject = composeResultObject(template, templateHostRef, volume.getDataCenterId());
- }
-
- }
- }
- } catch (InvalidParameterValueException e) {
- details += ", reason: " + e.getMessage();
- s_logger.error(details, e);
- resultCode = BaseCmd.PARAM_ERROR;
- } catch (Exception e) {
- details += ", reason: " + e.getMessage();
- s_logger.error(details, e);
- }
-
- if (jobStatus == AsyncJobResult.STATUS_FAILED) {
- resultObject = details;
- managerServer.saveEvent(param.getUserId(), param.getAccountId(), EventVO.LEVEL_ERROR, EventTypes.EVENT_TEMPLATE_CREATE, details, "" ,param.getEventId());
- }
- asyncMgr.completeAsyncJob(jobId, jobStatus, resultCode, resultObject);
- return true;
- }
- */
- return true;
- }
-
- private CreatePrivateTemplateResultObject composeResultObject(VMTemplateVO template, VMTemplateHostVO templateHostRef, Long dataCenterId) {
- CreatePrivateTemplateResultObject resultObject = new CreatePrivateTemplateResultObject();
-
- resultObject.setId(template.getId());
- resultObject.setName(template.getName());
- resultObject.setDisplayText(template.getDisplayText());
- resultObject.setPublic(template.isPublicTemplate());
- resultObject.setCreated(templateHostRef.getCreated());
- resultObject.setReady(templateHostRef != null && templateHostRef.getDownloadState() == Status.DOWNLOADED);
- resultObject.setPasswordEnabled(template.getEnablePassword());
- resultObject.setCrossZones(template.isCrossZones());
- ManagementServer managerServer = getAsyncJobMgr().getExecutorContext().getManagementServer();
-// GuestOS os = managerServer.findGuestOSById(template.getGuestOSId());
-// if (os != null) {
-// resultObject.setOsTypeId(os.getId());
-// resultObject.setOsTypeName(os.getDisplayName());
-// } else {
-// resultObject.setOsTypeId(-1L);
-// resultObject.setOsTypeName("");
-// }
-
- Account owner = managerServer.findAccountById(template.getAccountId());
- if (owner != null) {
- resultObject.setAccount(owner.getAccountName());
- resultObject.setDomainId(owner.getDomainId());
-// resultObject.setDomainName(managerServer.findDomainIdById(owner.getDomainId()).getName());
- }
-
-
- DataCenterVO zone = managerServer.findDataCenterById(dataCenterId);
- if (zone != null) {
- resultObject.setZoneId(zone.getId());
- resultObject.setZoneName(zone.getName());
- }
-
- return resultObject;
- }
-}
diff --git a/server/src/com/cloud/async/executor/CreatePrivateTemplateParam.java b/server/src/com/cloud/async/executor/CreatePrivateTemplateParam.java
deleted file mode 100644
index 5032fa90224..00000000000
--- a/server/src/com/cloud/async/executor/CreatePrivateTemplateParam.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class CreatePrivateTemplateParam {
- private long userId;
- private long accountId;
- private Long volumeId;
- private Long snapshotId;
- private long guestOsId;
- private long eventId;
- private String name;
- private String description;
- private Boolean requiresHvm;
- private Integer bits;
- private Boolean passwordEnabled;
- private Boolean isPublic;
- private Boolean isFeatured;
-
- public CreatePrivateTemplateParam() {
- }
-
- public CreatePrivateTemplateParam(long userId, long accountId, Long volumeId, long guestOsId, long eventId, String name, String description, Boolean requiresHvm, Integer bits, Boolean passwordEnabled, Boolean isPublic, Boolean featured, Long snapshotId) {
- this.userId = userId;
- this.accountId = accountId;
- this.name = name;
- this.description = description;
- this.volumeId = volumeId;
- this.guestOsId = guestOsId;
- this.eventId = eventId;
- this.requiresHvm = requiresHvm;
- this.bits = bits;
- this.passwordEnabled = passwordEnabled;
- this.isPublic = isPublic;
- this.isFeatured = featured;
- this.snapshotId = snapshotId;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public void setUserId(long userId) {
- this.userId = userId;
- }
-
- public long getAccountId() {
- return accountId;
- }
-
- public void setAccountId(long accountId) {
- this.accountId = accountId;
- }
-
- public long getVolumeId() {
- return volumeId;
- }
-
- public void setVmId(long volumeId) {
- this.volumeId = volumeId;
- }
-
- public Long getSnapshotId() {
- return snapshotId;
- }
-
- public void setSnapshotId(Long snapshotId) {
- this.snapshotId = snapshotId;
- }
-
- public long getGuestOsId() {
- return guestOsId;
- }
-
- public void setGuestOsId(long guestOsId) {
- this.guestOsId = guestOsId;
- }
-
- public long getEventId() {
- return eventId;
- }
-
- public void setEventId(long eventId) {
- this.eventId = eventId;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Boolean getRequiresHvm() {
- return requiresHvm;
- }
-
- public void setRequiresHvm(Boolean requiresHvm) {
- this.requiresHvm = requiresHvm;
- }
-
- public Integer getBits() {
- return bits;
- }
-
- public void setBits(Integer bits) {
- this.bits = bits;
- }
-
- public Boolean isPasswordEnabled() {
- return passwordEnabled;
- }
-
- public void setPasswordEnabled(Boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- }
-
- public Boolean isPublic() {
- return isPublic;
- }
-
- public boolean isFeatured() {
- return isFeatured;
- }
-
- public void setIsPublic(Boolean isPublic) {
- this.isPublic = isPublic;
- }
-}
diff --git a/server/src/com/cloud/async/executor/CreatePrivateTemplateResultObject.java b/server/src/com/cloud/async/executor/CreatePrivateTemplateResultObject.java
deleted file mode 100644
index 56725f7e65c..00000000000
--- a/server/src/com/cloud/async/executor/CreatePrivateTemplateResultObject.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-
-public class CreatePrivateTemplateResultObject {
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="displaytext")
- private String displayText;
-
- @Param(name="ispublic", propName="public")
- private boolean isPublic;
-
-// @Param(name="requireshvm")
-// private boolean requiresHvm;
-//
-// @Param(name="bits")
-// private int bits;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="isready", propName="ready")
- private boolean isReady;
-
- @Param(name="passwordenabled")
- private boolean passwordEnabled;
-
- @Param(name="crossZones")
- private boolean crossZones;
-
- @Param(name="ostypeid")
- private Long osTypeId;
-
- @Param(name="ostypename")
- private String osTypeName;
-
- @Param(name="accountid")
- private Long accountId;
-
- @Param(name="account")
- private String account;
-
- @Param(name="zoneid")
- private Long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="domain")
- private String domainName;
-
- @Param(name="domainid")
- private long domainId;
-
-
- public Long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public Long getAccountId() {
- return accountId;
- }
-
- public void setAccountId(Long accountId) {
- this.accountId = accountId;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public Long getOsTypeId() {
- return osTypeId;
- }
-
- public void setOsTypeId(Long osTypeId) {
- this.osTypeId = osTypeId;
- }
-
- public String getOsTypeName() {
- return osTypeName;
- }
-
- public void setOsTypeName(String osTypeName) {
- this.osTypeName = osTypeName;
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDisplayText() {
- return displayText;
- }
-
- public void setDisplayText(String displayText) {
- this.displayText = displayText;
- }
-
- public boolean isPublic() {
- return isPublic;
- }
-
- public void setPublic(boolean isPublic) {
- this.isPublic = isPublic;
- }
-
-// public boolean isRequiresHvm() {
-// return requiresHvm;
-// }
-//
-// public void setRequiresHvm(boolean requiresHvm) {
-// this.requiresHvm = requiresHvm;
-// }
-//
-// public int getBits() {
-// return bits;
-// }
-//
-// public void setBits(int bits) {
-// this.bits = bits;
-// }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public boolean isReady() {
- return isReady;
- }
-
- public void setReady(boolean isReady) {
- this.isReady = isReady;
- }
-
- public boolean isPasswordEnabled() {
- return passwordEnabled;
- }
-
- public void setPasswordEnabled(boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- }
-
- public boolean isCrossZones() {
- return crossZones;
- }
-
- public void setCrossZones(boolean crossZones) {
- this.crossZones = crossZones;
- }
-
- public long getDomainId() {
- return domainId;
- }
-
- public String getDomainName(){
- return domainName;
- }
-
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-
- public void setDomainId(long domainId) {
- this.domainId = domainId;
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/CreateSnapshotExecutor.java b/server/src/com/cloud/async/executor/CreateSnapshotExecutor.java
deleted file mode 100755
index 5143b0cbf85..00000000000
--- a/server/src/com/cloud/async/executor/CreateSnapshotExecutor.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.storage.Snapshot;
-import com.cloud.storage.Snapshot.Type;
-import com.cloud.user.Account;
-import com.google.gson.Gson;
-
-public class CreateSnapshotExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(CreateSnapshotExecutor.class.getName());
-
- public boolean execute() {
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- Gson gson = GsonHelper.getBuilder().create();
-
- /*
- if (getSyncSource() == null) {
- SnapshotOperationParam param = gson.fromJson(job.getCmdInfo(), SnapshotOperationParam.class);
- asyncMgr.syncAsyncJobExecution(job.getId(), "Volume", param.getVolumeId());
-
- // always true if it does not have sync-source
- return true;
- } else {
- SnapshotOperationParam param = gson.fromJson(job.getCmdInfo(), SnapshotOperationParam.class);
- SnapshotManager snapshotManager = asyncMgr.getExecutorContext().getSnapshotMgr();
- ManagementServer managementServer = getAsyncJobMgr().getExecutorContext().getManagementServer();
- VolumeDao volumeDao = asyncMgr.getExecutorContext().getVolumeDao();
- long volumeId = param.getVolumeId();
- long policyId = param.getPolicyId();
- long startEventId = param.getEventId();
-
- long snapshotId = 0;
- long userId = param.getUserId();
-
- // By default assume that everything has failed.
- boolean backedUp = false;
- Long jobId = getJob().getId();
- int result = AsyncJobResult.STATUS_FAILED;
- int errorCode = BaseCmd.INTERNAL_ERROR;
- Object resultObject = "Failed to create snapshot.";
- VolumeVO vol = null;
-
- try {
- vol = volumeDao.acquire(volumeId, 10);
- if( vol != null) {
- managementServer.saveStartedEvent(userId, vol.getAccountId(), EventTypes.EVENT_SNAPSHOT_CREATE, "Start creating snapshot for volume:"+volumeId, startEventId);
- SnapshotVO snapshot = snapshotManager.createSnapshot(userId, volumeId, policyId);
-
- if (snapshot != null && snapshot.getStatus() == Snapshot.Status.CreatedOnPrimary) {
- snapshotId = snapshot.getId();
- asyncMgr.updateAsyncJobStatus(jobId, BaseCmd.PROGRESS_INSTANCE_CREATED, snapshotId);
- backedUp = snapshotManager.backupSnapshotToSecondaryStorage(userId, snapshot, startEventId);
- if (backedUp) {
- result = AsyncJobResult.STATUS_SUCCEEDED;
- errorCode = 0; // Success
- resultObject = composeResultObject(snapshot);
- }
- else {
- // More specific error
- resultObject = "Created snapshot: " + snapshotId + " on primary but failed to backup on secondary";
- }
- } else if (snapshot != null && snapshot.getStatus() == Snapshot.Status.EmptySnapshot) {
- resultObject ="There is no change since last snapshot, please use last snapshot";
- s_logger.warn(resultObject);
- }
- } else {
- resultObject = "Another snapshot is being created for " + volumeId + " try another time ";
- s_logger.warn(resultObject);
- }
- } catch(Exception e) {
- resultObject = "Unable to create snapshot: " + e.getMessage();
- s_logger.warn(resultObject, e);
- } finally {
- if( vol != null ){
- volumeDao.release(volumeId);
- }
- }
-
- // In all cases, ensure that we call completeAsyncJob to the asyncMgr.
- asyncMgr.completeAsyncJob(jobId, result, errorCode, resultObject);
-
- // Cleanup jobs to do after the snapshot has been created.
- snapshotManager.postCreateSnapshot(userId, volumeId, snapshotId, policyId, backedUp);
- return true;
- }
- */
- return true;
- }
-
- private CreateSnapshotResultObject composeResultObject(Snapshot snapshot) {
- CreateSnapshotResultObject resultObject = new CreateSnapshotResultObject();
- ManagementServer managementServer = getAsyncJobMgr().getExecutorContext().getManagementServer();
-// VolumeVO volume = managementServer.findVolumeById(snapshot.getVolumeId());
-
- resultObject.setId(snapshot.getId());
- long domainId = -1;
- Account account = getAsyncJobMgr().getExecutorContext().getAccountDao().findById(snapshot.getAccountId());
- if(account != null)
- {
- resultObject.setAccountName(account.getAccountName());
- domainId = account.getDomainId();
-
- if(domainId != -1)
- {
- resultObject.setDomainId(domainId);
-// resultObject.setDomainName(getAsyncJobMgr().getExecutorContext().getManagementServer().findDomainIdById(domainId).getName());
- }
-
- }
- String snapshotTypeStr = Type.values()[snapshot.getSnapshotType()].name();
- resultObject.setSnapshotType(snapshotTypeStr);
- resultObject.setVolumeId(snapshot.getVolumeId());
-// resultObject.setVolumeName(volume.getName());
-// resultObject.setVolumeType(volume.getVolumeType());
- resultObject.setCreated(snapshot.getCreated());
- resultObject.setName(snapshot.getName());
- return resultObject;
- }
-}
diff --git a/server/src/com/cloud/async/executor/CreateSnapshotResultObject.java b/server/src/com/cloud/async/executor/CreateSnapshotResultObject.java
deleted file mode 100644
index 6f07e7c6502..00000000000
--- a/server/src/com/cloud/async/executor/CreateSnapshotResultObject.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-import com.cloud.storage.Volume.VolumeType;
-
-public class CreateSnapshotResultObject {
-
- @Param(name="id")
- private long id;
-
- @Param(name="account")
- private String accountName;
-
- @Param(name="volumeid")
- private long volumeId;
-
- @Param(name="domainid")
- private long domainId;
-
- @Param(name="domainname")
- private String domainName;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="name")
- private String name;
-
- @Param(name="path")
- private String path;
-
- @Param(name="snapshottype")
- private String snapshotType;
-
- @Param(name="volumename")
- private String volumeName;
-
- @Param(name="volumetype")
- private VolumeType volumeType;
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getAccountName() {
- return accountName;
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public long getVolumeId() {
- return volumeId;
- }
-
- public void setVolumeId(long volumeId) {
- this.volumeId = volumeId;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
-
- public void setDomainId(long domainId) {
- this.domainId = domainId;
- }
-
- public long getDomainId() {
- return domainId;
- }
-
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-
- public String getDomainName() {
- return domainName;
- }
-
- public void setSnapshotType(String snapshotType){
- this.snapshotType = snapshotType;
- }
-
- public String getSnapshotType(){
- return this.snapshotType;
- }
-
- public String getVolumeName() {
- return volumeName;
- }
-
- public void setVolumeName(String volumeName) {
- this.volumeName = volumeName;
- }
-
- public VolumeType getVolumeType() {
- return volumeType;
- }
-
- public void setVolumeType(VolumeType volumeType) {
- this.volumeType = volumeType;
- }
-}
diff --git a/server/src/com/cloud/async/executor/CreateVolumeFromSnapshotExecutor.java b/server/src/com/cloud/async/executor/CreateVolumeFromSnapshotExecutor.java
deleted file mode 100644
index 28f893ab7b2..00000000000
--- a/server/src/com/cloud/async/executor/CreateVolumeFromSnapshotExecutor.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncInstanceCreateStatus;
-import com.cloud.async.AsyncJobExecutorContext;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.configuration.ResourceCount.ResourceType;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.storage.Snapshot;
-import com.cloud.storage.StorageManager;
-import com.cloud.storage.VolumeVO;
-import com.cloud.user.Account;
-import com.cloud.user.AccountManager;
-import com.cloud.user.AccountVO;
-import com.google.gson.Gson;
-
-public class CreateVolumeFromSnapshotExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(CreateVolumeFromSnapshotExecutor.class.getName());
-
- public boolean execute() {
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobExecutorContext context = asyncMgr.getExecutorContext();
- ManagementServer managerServer = context.getManagementServer();
- //SnapshotManager snapshotManager = context.getSnapshotMgr();
- StorageManager storageManager = context.getStorageMgr();
- AccountManager accountManager = context.getAccountMgr();
- /*
- if (getSyncSource() == null) {
- SnapshotOperationParam param = gson.fromJson(job.getCmdInfo(), SnapshotOperationParam.class);
- asyncMgr.syncAsyncJobExecution(job.getId(), "Volume", param.getVolumeId());
-
- // always true if it does not have sync-source
- return true;
- } else {
- SnapshotOperationParam param = gson.fromJson(job.getCmdInfo(), SnapshotOperationParam.class);
- VolumeVO volume = null;
-
- // By default assume that everything has failed.
- Long jobId = getJob().getId();
- int result = AsyncJobResult.STATUS_FAILED;
- int errorCode = BaseCmd.INTERNAL_ERROR;
- Object resultObject = "Failed to create volume from snapshot: " + param.getSnapshotId();
-
- try {
- long accountId = param.getAccountId();
- long userId = param.getUserId();
- long snapshotId = param.getSnapshotId();
- String volumeName = param.getName();
- Snapshot snapshot = managerServer.findSnapshotById(snapshotId);
- if (snapshot == null) {
- throw new InvalidParameterValueException("The snapshot was deleted after createVolumeFromSnapshot command was issued.");
- }
- AccountVO account = (AccountVO) managerServer.findAccountById(snapshot.getAccountId());
-
- // Check that the resource limit for volumes won't be exceeded
- if (accountManager.resourceLimitExceeded(account, ResourceType.volume)) {
- ResourceAllocationException rae = new ResourceAllocationException("Maximum number of volumes for account: " + account.getAccountName() + " has been exceeded.");
- rae.setResourceType("volume");
- throw rae;
- }
-
- volume = storageManager.createVolumeFromSnapshot(userId, accountId, snapshotId, volumeName, param.getEventId());
-
- if (volume != null && volume.getStatus() == AsyncInstanceCreateStatus.Created) {
- result = AsyncJobResult.STATUS_SUCCEEDED;
- errorCode = 0; // Success
- resultObject = composeResultObject(volume);
- // Increment the number of volumes
- accountManager.incrementResourceCount(accountId, ResourceType.volume);
- }
- } catch(Exception e) {
- resultObject = (String)resultObject + ", reason: " + e.getMessage();
- s_logger.warn(resultObject, e);
- }
- // In all cases, ensure that we call completeAsyncJob to the asyncMgr.
- asyncMgr.completeAsyncJob(jobId, result, errorCode, resultObject);
- return true;
- }
- */
- return true;
- }
-
- private VolumeOperationResultObject composeResultObject(VolumeVO volume)
- {
- VolumeOperationResultObject resultObject = new VolumeOperationResultObject();
- ManagementServer managementServer = getAsyncJobMgr().getExecutorContext().getManagementServer();
- resultObject.setId(volume.getId());
- resultObject.setName(volume.getName());
- resultObject.setVolumeType(volume.getVolumeType());
- resultObject.setVolumeSize(volume.getSize());
- resultObject.setDiskOfferingId(volume.getDiskOfferingId());
- resultObject.setCreatedDate(volume.getCreated());
- resultObject.setState(volume.getStatus());
- Long accountId = volume.getAccountId();
- Account account = managementServer.findAccountById(accountId);
- resultObject.setAccountName(account.getAccountName());
- resultObject.setDomainId(volume.getDomainId());
-// resultObject.setDomain(managementServer.findDomainIdById(volume.getDomainId()).getName());
- resultObject.setZoneId(volume.getDataCenterId());
-// resultObject.setZoneName(getAsyncJobMgr().getExecutorContext().getManagementServer().getDataCenterBy(volume.getDataCenterId()).getName());
- resultObject.setStorageType("shared"); // NOTE: You can never create a local disk volume but if that changes, we need to change this
- if (volume.getPoolId() != null)
- resultObject.setStorage(managementServer.findPoolById(volume.getPoolId()).getName());
- return resultObject;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DeleteDomainExecutor.java b/server/src/com/cloud/async/executor/DeleteDomainExecutor.java
deleted file mode 100644
index bc09b62d19a..00000000000
--- a/server/src/com/cloud/async/executor/DeleteDomainExecutor.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-
-public class DeleteDomainExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(DeleteDomainExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- DeleteDomainParam param = gson.fromJson(job.getCmdInfo(), DeleteDomainParam.class);
-
- /*
- try {
- String result = managementServer.deleteDomain(param.getDomainId(), param.getOwnerId(), param.getCleanup());
- if (result == null) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, "success");
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, result);
- }
- } catch(Exception e) {
- s_logger.warn("Unable to delete domain : " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- }
- */
- return true;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DeleteDomainParam.java b/server/src/com/cloud/async/executor/DeleteDomainParam.java
deleted file mode 100644
index 740ab6827c1..00000000000
--- a/server/src/com/cloud/async/executor/DeleteDomainParam.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.async.executor;
-
-public class DeleteDomainParam {
- private Long domainId;
- private Long ownerId;
- private Boolean cleanup;
-
- public DeleteDomainParam() {}
-
- public DeleteDomainParam(Long domainId, Long ownerId, Boolean cleanup) {
- this.domainId = domainId;
- this.ownerId = ownerId;
- this.cleanup = cleanup;
- }
-
- public Long getDomainId() {
- return domainId;
- }
-
- public Long getOwnerId() {
- return ownerId;
- }
-
- public Boolean getCleanup() {
- return cleanup;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DeleteLoadBalancerExecutor.java b/server/src/com/cloud/async/executor/DeleteLoadBalancerExecutor.java
deleted file mode 100644
index 34c042e53e9..00000000000
--- a/server/src/com/cloud/async/executor/DeleteLoadBalancerExecutor.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-
-public class DeleteLoadBalancerExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(DeleteLoadBalancerExecutor.class.getName());
-
- @Override
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- LoadBalancerParam param = gson.fromJson(job.getCmdInfo(), LoadBalancerParam.class);
-
- /*
- if (getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job.getId(), "Router", param.getDomainRouterId());
-
- // always true if it does not have sync-source
- return true;
- } else {
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- try {
- boolean result = managementServer.deleteLoadBalancer(param.getUserId(), param.getLoadBalancerId().longValue());
- if (result)
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, Boolean.valueOf(result).toString());
- else
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- Boolean.valueOf(result).toString());
- } catch(Exception e) {
- s_logger.warn("Unable to delete load balancer : " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- return true;
- }
- */
- return true;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DeleteNetworkRuleConfigExecutor.java b/server/src/com/cloud/async/executor/DeleteNetworkRuleConfigExecutor.java
deleted file mode 100644
index b6694438d3e..00000000000
--- a/server/src/com/cloud/async/executor/DeleteNetworkRuleConfigExecutor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-
-public class DeleteNetworkRuleConfigExecutor extends BaseAsyncJobExecutor {
-
- @Override
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- Long param = gson.fromJson(job.getCmdInfo(), Long.class);
-
- /*
- boolean success = managementServer.deleteNetworkRuleConfig(job.getUserId(), param.longValue());
- if (success) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, "success");
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, 0, "failed");
- }
- */
-
- return true;
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/DeleteRuleExecutor.java b/server/src/com/cloud/async/executor/DeleteRuleExecutor.java
deleted file mode 100644
index 027cc586a8f..00000000000
--- a/server/src/com/cloud/async/executor/DeleteRuleExecutor.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.exception.InternalErrorException;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.PermissionDeniedException;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-
-public class DeleteRuleExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(DeleteRuleExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- DeleteRuleParam param = gson.fromJson(job.getCmdInfo(), DeleteRuleParam.class);
- /*
- try {
- managementServer.deleteRule(param.getRuleId(), param.getUserId(), param.getAccountId());
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- "success");
- } catch (InvalidParameterValueException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to delete rule: " + e.getMessage());
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.PARAM_ERROR, e.getMessage());
- } catch (PermissionDeniedException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to delete rule: " + e.getMessage());
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.PARAM_ERROR, e.getMessage());
- } catch (InternalErrorException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to delete rule: " + e.getMessage());
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- } catch(Exception e) {
- s_logger.warn("Unable to delete rule: " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- }
- */
- return true;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DeleteRuleParam.java b/server/src/com/cloud/async/executor/DeleteRuleParam.java
deleted file mode 100644
index 680df511a6f..00000000000
--- a/server/src/com/cloud/async/executor/DeleteRuleParam.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class DeleteRuleParam {
- private long ruleId;
- private long userId;
- private long accountId;
-
- public DeleteRuleParam() {
- }
-
- public DeleteRuleParam(long id, long userId, long accountId) {
- this.ruleId = id;
- this.userId = userId;
- this.accountId = accountId;
- }
-
- public long getRuleId() {
- return ruleId;
- }
-
- public void setRuleId(long ruleId) {
- this.ruleId = ruleId;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public void setUserId(long userId) {
- this.userId = userId;
- }
-
- public long getAccountId() {
- return accountId;
- }
-
- public void setAccountId(long accountId) {
- this.accountId = accountId;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DeleteSnapshotExecutor.java b/server/src/com/cloud/async/executor/DeleteSnapshotExecutor.java
deleted file mode 100644
index 4ca3c013b96..00000000000
--- a/server/src/com/cloud/async/executor/DeleteSnapshotExecutor.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.storage.Snapshot;
-import com.cloud.storage.snapshot.SnapshotManager;
-import com.google.gson.Gson;
-
-public class DeleteSnapshotExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(DeleteSnapshotExecutor.class.getName());
-
- public boolean execute() {
-
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- SnapshotManager snapshotManager = asyncMgr.getExecutorContext().getSnapshotMgr();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
-
- /*
- if(getSyncSource() == null) {
- SnapshotOperationParam param = gson.fromJson(job.getCmdInfo(), SnapshotOperationParam.class);
- Snapshot snapshot = managementServer.findSnapshotById(param.getSnapshotId());
- if(snapshot != null) {
- asyncMgr.syncAsyncJobExecution(job.getId(), "Volume", snapshot.getVolumeId());
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, "snapshot no long exists");
- }
-
- // always true if it does not have sync-source
- return true;
- } else {
- SnapshotOperationParam param = gson.fromJson(job.getCmdInfo(), SnapshotOperationParam.class);
- Long jobId = getJob().getId();
- int result = AsyncJobResult.STATUS_FAILED;
- int errorCode = BaseCmd.INTERNAL_ERROR;
- Object resultObject = "Failed to delete snapshot.";
-
- try {
- if(snapshotManager.deleteSnapshot(param.getUserId(), param.getSnapshotId(), param.getPolicyId())) {
- result = AsyncJobResult.STATUS_SUCCEEDED;
- errorCode = 0;
- resultObject = "success"; // Might want to put something more substantial later.
- }
- } catch(Exception e) {
- resultObject = "Unable to destroy snapshot: " + e.getMessage();
- s_logger.warn(resultObject, e);
- }
- // In all cases, ensure that we call completeAsyncJob to the asyncMgr.
- asyncMgr.completeAsyncJob(jobId, result, errorCode, resultObject);
- return true;
- }
- */
- return true;
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/DeleteUserExecutor.java b/server/src/com/cloud/async/executor/DeleteUserExecutor.java
deleted file mode 100644
index 0628e8afb45..00000000000
--- a/server/src/com/cloud/async/executor/DeleteUserExecutor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.event.EventTypes;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-import com.cloud.user.User;
-import com.google.gson.Gson;
-
-public class DeleteUserExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(DeleteUserExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- Long param = gson.fromJson(job.getCmdInfo(), Long.class);
- /*
- try {
- if(managementServer.deleteUser(param.longValue())) {
- DeleteUserParam param = gson.fromJson(job.getCmdInfo(), DeleteUserParam.class);
-
- try {
- User user = managementServer.getUser(param.getUserId(), true);
- String description = "Starting deleting User " + user.getUsername() + " (id: " + param.getUserId()
- + ") for accountId = " + user.getAccountId();
- managementServer.saveStartedEvent(1L, 1L, EventTypes.EVENT_USER_DELETE, description, param.getEventId());
-
- if(managementServer.deleteUser(param.getUserId())) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- "success");
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "operation failed");
- }
- } catch(Exception e) {
- s_logger.warn("Unable to delete User " + param.getUserId() + ": " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- */
- return true;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DeleteUserParam.java b/server/src/com/cloud/async/executor/DeleteUserParam.java
deleted file mode 100644
index 97974992c1f..00000000000
--- a/server/src/com/cloud/async/executor/DeleteUserParam.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.cloud.async.executor;
-
-public class DeleteUserParam {
-
- private Long userId;
- private Long eventId;
-
- public DeleteUserParam() {}
-
- public DeleteUserParam(Long userId, Long eventId) {
- this.userId = userId;
- this.eventId = eventId;
-
- }
-
- public Long getUserId() {
- return userId;
- }
-
- public Long getEventId() {
- return eventId;
- }
-
-
-}
diff --git a/server/src/com/cloud/async/executor/DeployVMExecutor.java b/server/src/com/cloud/async/executor/DeployVMExecutor.java
deleted file mode 100644
index a962e9bf29a..00000000000
--- a/server/src/com/cloud/async/executor/DeployVMExecutor.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.event.EventTypes;
-import com.cloud.event.EventUtils;
-import com.cloud.event.EventVO;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientStorageCapacityException;
-import com.cloud.exception.InternalErrorException;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.PermissionDeniedException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.service.ServiceOfferingVO;
-import com.cloud.storage.StoragePoolVO;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.VolumeVO;
-import com.cloud.user.Account;
-import com.cloud.user.User;
-import com.cloud.uservm.UserVm;
-import com.cloud.utils.Pair;
-import com.cloud.utils.exception.ExecutionException;
-import com.cloud.vm.InstanceGroupVO;
-import com.google.gson.Gson;
-
-public class DeployVMExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(DeployVMExecutor.class.getName());
-
- @Override
- public boolean execute() {
- // currently deploy VM operation will not be sync-ed with any queue, execute it directly
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
-
- DeployVMParam param = gson.fromJson(job.getCmdInfo(), DeployVMParam.class);
- /*
- try {
- UserVm vm = asyncMgr.getExecutorContext().getManagementServer().deployVirtualMachine(
- param.getUserId(), param.getAccountId(), param.getDataCenterId(),
- param.getServiceOfferingId(),
- param.getTemplateId(), param.getDiskOfferingId(), param.getDomain(),
- param.getPassword(), param.getDisplayName(), param.getGroup(), param.getUserData(), param.getNetworkGroup(), param.getEventId(), param.getSize());
-
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_SUCCEEDED, 0, composeResultObject(param.getUserId(), vm, param));
-
- } catch (ResourceAllocationException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to deploy VM: " + e.getMessage());
- saveEvent(param, EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_CREATE, "Unable to deploy VM: VM_INSUFFICIENT_CAPACITY");
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.VM_INSUFFICIENT_CAPACITY, e.getMessage());
- } catch (ExecutionException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to deploy VM: " + e.getMessage());
- saveEvent(param, EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_CREATE, "Unable to deploy VM: VM_HOST_LICENSE_EXPIRED");
- asyncMgr.completeAsyncJob(getJob().getId(),AsyncJobResult.STATUS_FAILED, BaseCmd.VM_HOST_LICENSE_EXPIRED, e.getMessage());
- } catch (InvalidParameterValueException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to deploy VM: " + e.getMessage());
- saveEvent(param, EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_CREATE, "Unable to deploy VM: VM_INVALID_PARAM_ERROR");
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.VM_INVALID_PARAM_ERROR, e.getMessage());
- } catch (InternalErrorException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to deploy VM: " + e.getMessage());
- saveEvent(param, EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_CREATE, "Unable to deploy VM: INTERNAL_ERROR");
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- } catch (InsufficientStorageCapacityException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to deploy VM: " + e.getMessage());
- saveEvent(param, EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_CREATE, "Unable to deploy VM: VM_INSUFFICIENT_CAPACITY");
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.VM_INSUFFICIENT_CAPACITY, e.getMessage());
- } catch (PermissionDeniedException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to deploy VM: " + e.getMessage());
- saveEvent(param, EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_CREATE, "Unable to deploy VM: ACCOUNT_ERROR");
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.ACCOUNT_ERROR, e.getMessage());
- } catch (ConcurrentOperationException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to deploy VM: " + e.getMessage());
- saveEvent(param, EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_CREATE, "Unable to deploy VM: INTERNAL_ERROR");
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- } catch(Exception e) {
- s_logger.warn("Unable to deploy VM : " + e.getMessage(), e);
- saveEvent(param, EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_CREATE, "Unable to deploy VM: INTERNAL_ERROR");
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- }
- */
- return true;
- }
-
- @Override
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- @Override
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- @Override
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-
- private long saveEvent(DeployVMParam param, String level, String type, String description){
- return EventUtils.saveEvent(param.getUserId(), param.getAccountId(), level, type, description, null, param.getEventId());
- }
-
- private DeployVMResultObject composeResultObject(long userId, UserVm vm, DeployVMParam param) {
- DeployVMResultObject resultObject = new DeployVMResultObject();
-
- if(vm == null)
- return resultObject;
-
- resultObject.setId(vm.getId());
- resultObject.setName(vm.getName());
- resultObject.setCreated(vm.getCreated());
- resultObject.setZoneId(vm.getDataCenterId());
- resultObject.setZoneName(getAsyncJobMgr().getExecutorContext().getManagementServer().findDataCenterById(vm.getDataCenterId()).getName());
- resultObject.setIpAddress(vm.getPrivateIpAddress());
- resultObject.setServiceOfferingId(vm.getServiceOfferingId());
- resultObject.setHaEnabled(vm.isHaEnabled());
- if (vm.getDisplayName() == null || vm.getDisplayName().length() == 0) {
- resultObject.setDisplayName(vm.getName());
- }
- else {
- resultObject.setDisplayName(vm.getDisplayName());
- }
-
- if(vm.getState() != null)
- resultObject.setState(vm.getState().toString());
-
- ManagementServer managementServer = getAsyncJobMgr().getExecutorContext().getManagementServer();
-
- InstanceGroupVO group = managementServer.getGroupForVm(vm.getId());
- if (group != null) {
- resultObject.setGroupId(group.getId());
- resultObject.setGroup(group.getName());
- }
-
- VMTemplateVO template = managementServer.findTemplateById(vm.getTemplateId());
-
- Account acct = managementServer.findAccountById(Long.valueOf(vm.getAccountId()));
- if (acct != null) {
- resultObject.setAccount(acct.getAccountName());
- resultObject.setDomainId(acct.getDomainId());
-// resultObject.setDomain(managementServer.findDomainIdById(acct.getDomainId()).getName());
- }
-
- User userExecutingCmd = managementServer.getUser(userId);
- //this is for the case where the admin deploys a vm for a normal user
- Account acctForUserExecutingCmd = managementServer.findAccountById(Long.valueOf(userExecutingCmd.getAccountId()));
- if ((BaseCmd.isAdmin(acctForUserExecutingCmd.getType()) && (vm.getHostId() != null)) || (BaseCmd.isAdmin(acct.getType()) && (vm.getHostId() != null)))
- {
- resultObject.setHostname(managementServer.getHostBy(vm.getHostId()).getName());
- resultObject.setHostid(vm.getHostId());
- }
-
- String templateName = "none";
- boolean templatePasswordEnabled = false;
- String templateDisplayText = null;
-
- if (template != null) {
- templateName = template.getName();
- templatePasswordEnabled = template.getEnablePassword();
- templateDisplayText = template.getDisplayText();
- if (templateDisplayText == null) {
- templateDisplayText = templateName;
- }
- }
-
- if (templatePasswordEnabled) {
- resultObject.setPassword(param.getPassword());
- }
-
- // ISO Info
- Long isoId = vm.getIsoId();
- if (isoId != null) {
- VMTemplateVO iso = getAsyncJobMgr().getExecutorContext().getManagementServer().findTemplateById(isoId.longValue());
- if (iso != null) {
- resultObject.setIsoId(isoId.longValue());
- resultObject.setIsoName(iso.getName());
- resultObject.setTemplateId(isoId.longValue());
- resultObject.setTemplateName(iso.getName());
-
- templateDisplayText = iso.getDisplayText();
- if(templateDisplayText == null)
- templateDisplayText = iso.getName();
- resultObject.setIsoDisplayText(templateDisplayText);
- resultObject.setTemplateDisplayText(templateDisplayText);
- }
- }
- else
- {
- resultObject.setTemplateId(vm.getTemplateId());
- resultObject.setTemplateName(templateName);
- resultObject.setTemplateDisplayText(templateDisplayText);
- resultObject.setPasswordEnabled(templatePasswordEnabled);
- }
-
- ServiceOfferingVO offering = managementServer.findServiceOfferingById(vm.getServiceOfferingId());
- resultObject.setServiceOfferingId(vm.getServiceOfferingId());
- resultObject.setServiceOfferingName(offering.getName());
-
- resultObject.setCpuNumber(String.valueOf(offering.getCpu()));
- resultObject.setCpuSpeed(String.valueOf(offering.getSpeed()));
- resultObject.setMemory(String.valueOf(offering.getRamSize()));
-
- //root device related
-// VolumeVO rootVolume = managementServer.findRootVolume(vm.getId());
-// if(rootVolume!=null)
-// {
-// resultObject.setRootDeviceId(rootVolume.getDeviceId());
-// StoragePoolVO storagePool = managementServer.findPoolById(rootVolume.getPoolId());
-// resultObject.setRootDeviceType(storagePool.getPoolType().toString());
-// }
-
-// resultObject.setNetworkGroupList(managementServer.getNetworkGroupsNamesForVm(vm.getId()));
- return resultObject;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DeployVMParam.java b/server/src/com/cloud/async/executor/DeployVMParam.java
deleted file mode 100644
index 4727b51142c..00000000000
--- a/server/src/com/cloud/async/executor/DeployVMParam.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class DeployVMParam extends VMOperationParam {
-
- private long dataCenterId;
- private long serviceOfferingId;
- private long templateId;
- private Long diskOfferingId;
- private String domain;
- private String password;
- private String displayName;
- private String group;
- private String userData;
- private long domainId;
- private String [] networkGroups;
- private long size;
-
- public DeployVMParam() {
- }
-
- public DeployVMParam(long userId, long accountId, long dataCenterId,
- long serviceOfferingId, long templateId,
- Long diskOfferingId, String domain, String password,
- String displayName, String group, String userData, String [] networkGroups) {
-
- setUserId(userId);
- setAccountId(accountId);
- this.dataCenterId = dataCenterId;
- this.serviceOfferingId = serviceOfferingId;
- this.templateId = templateId;
- this.diskOfferingId = diskOfferingId;
- this.domain = domain;
- this.password = password;
- this.displayName = displayName;
- this.group = group;
- this.userData = userData;
- this.setNetworkGroups(networkGroups);
- }
-
- public DeployVMParam(long userId, long accountId, long dataCenterId,
- long serviceOfferingId, long templateId,
- Long diskOfferingId, String domain, String password,
- String displayName, String group, String userData,
- String [] networkGroups, long eventId, long size) {
-
- setUserId(userId);
- setAccountId(accountId);
- this.dataCenterId = dataCenterId;
- this.serviceOfferingId = serviceOfferingId;
- this.templateId = templateId;
- this.diskOfferingId = diskOfferingId;
- this.domain = domain;
- this.password = password;
- this.displayName = displayName;
- this.group = group;
- this.userData = userData;
- this.setNetworkGroups(networkGroups);
- this.eventId = eventId;
- this.size = size;
- }
-
- public long getSize(){
- return size;
- }
-
- public long getDataCenterId() {
- return dataCenterId;
- }
-
- public void setDataCenterId(long dataCenterId) {
- this.dataCenterId = dataCenterId;
- }
-
- public long getServiceOfferingId() {
- return serviceOfferingId;
- }
-
- public void setServiceOfferingId(long serviceOfferingId) {
- this.serviceOfferingId = serviceOfferingId;
- }
-
- public Long getDiskOfferingId() {
- return diskOfferingId;
- }
-
- public void setDiskOfferingId(Long diskOfferingId) {
- this.diskOfferingId = diskOfferingId;
- }
-
- public long getTemplateId() {
- return templateId;
- }
-
- public void setTemplateId(long templateId) {
- this.templateId = templateId;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
-
- public String getGroup() {
- return group;
- }
-
- public void setGroup(String group) {
- this.group = group;
- }
- public long getDomainId() {
- return domainId;
- }
- public void setDomainId(long domainId) {
- this.domainId = domainId;
- }
-
- public void setUserData(String userData) {
- this.userData = userData;
- }
-
- public String getUserData() {
- return userData;
- }
-
- public void setNetworkGroups(String [] networkGroups) {
- this.networkGroups = networkGroups;
- }
-
- public String [] getNetworkGroup() {
- return networkGroups;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DeployVMResultObject.java b/server/src/com/cloud/async/executor/DeployVMResultObject.java
deleted file mode 100644
index be0982ecc9e..00000000000
--- a/server/src/com/cloud/async/executor/DeployVMResultObject.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-
-public class DeployVMResultObject {
-
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="zoneid")
-
- private Long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="ipaddress")
- private String ipAddress;
-
- @Param(name="serviceofferingid")
- private Long serviceOfferingId;
-
- @Param(name="haenable")
- private boolean haEnabled;
-
- @Param(name="state")
- private String state;
-
- @Param(name="templateid")
- private Long templateId;
-
- @Param(name="isoid")
- private Long isoId;
-
- @Param(name="password")
- private String password;
-
- @Param(name="templatename")
- private String templateName;
-
- @Param(name="isoname")
- private String isoName;
-
- @Param(name="templatedisplaytext")
- private String templateDisplayText;
-
- @Param(name="isodisplaytext")
- private String isoDisplayText;
-
- @Param(name="passwordenabled")
- private boolean passwordEnabled;
-
- @Param(name="serviceofferingname")
- private String serviceOfferingName;
-
- @Param(name="diskofferingid")
- private Long diskOfferingId;
-
- @Param(name="diskofferingname")
- private String diskOfferingName;
-
- @Param(name="cpunumber")
- private String cpuNumber;
-
- @Param(name="cpuspeed")
- private String cpuSpeed;
-
- @Param(name="memory")
- private String memory;
-
- @Param(name="storage")
- private String storage;
-
- @Param(name="displayname")
- private String displayName;
-
- @Param(name="group")
- private String group;
-
- @Param(name="groupid")
- private Long groupId;
-
- @Param(name="domainid")
- private Long domainId;
-
- @Param(name="domain")
- private String domain;
-
- @Param(name="account")
- private String account;
-
- @Param(name="hostname")
- private String hostname;
-
- @Param(name="hostid")
- private Long hostid;
-
- @Param(name="securitygrouplist")
- private String securityGroupList;
-
- @Param(name="rootdeviceid")
- private Long rootDeviceId;
-
- @Param(name="rootdevicetype")
- private String rootDeviceType;
-
- public Long getRootDeviceId(){
- return this.rootDeviceId;
- }
-
- public void setRootDeviceId(Long rootDeviceId){
- this.rootDeviceId = rootDeviceId;
- }
-
- public String getRootDeviceType(){
- return this.rootDeviceType;
- }
-
- public void setRootDeviceType(String deviceType){
- this.rootDeviceType = deviceType;
- }
-
- public String getSecurityGroupList(){
- return this.securityGroupList;
- }
-
- public void setSecurityGroupList(String nGroups){
- this.securityGroupList = nGroups;
- }
-
- public String getIsoDisplayText() {
- return isoDisplayText;
- }
-
- public void setIsoDisplayText(String text) {
- this.isoDisplayText = text;
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public Long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public String getIpAddress() {
- return ipAddress;
- }
-
- public void setIpAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- }
-
- public Long getServiceOfferingId() {
- return serviceOfferingId;
- }
-
- public void setServiceOfferingId(Long serviceOfferingId) {
- this.serviceOfferingId = serviceOfferingId;
- }
-
- public boolean isHaEnabled() {
- return haEnabled;
- }
-
- public void setHaEnabled(boolean haEnabled) {
- this.haEnabled = haEnabled;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public Long getTemplateId() {
- return templateId;
- }
-
- public void setTemplateId(Long templateId) {
- this.templateId = templateId;
- }
-
- public Long getIsoId() {
- return isoId;
- }
-
- public void setIsoId(Long isoId) {
- this.isoId = isoId;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getTemplateName() {
- return templateName;
- }
-
- public void setTemplateName(String templateName) {
- this.templateName = templateName;
- }
-
- public String getIsoName() {
- return isoName;
- }
-
- public void setIsoName(String isoName) {
- this.isoName = isoName;
- }
-
- public String getTemplateDisplayText() {
- return templateDisplayText;
- }
-
- public void setTemplateDisplayText(String templateDisplayText) {
- this.templateDisplayText = templateDisplayText;
- }
-
- public boolean isPasswordEnabled() {
- return passwordEnabled;
- }
-
- public void setPasswordEnabled(boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- }
-
- public String getServiceOfferingName() {
- return serviceOfferingName;
- }
-
- public void setServiceOfferingName(String serviceOfferingName) {
- this.serviceOfferingName = serviceOfferingName;
- }
-
- public Long getDiskOfferingId() {
- return diskOfferingId;
- }
-
- public void setDiskOfferingId(Long diskOfferingId) {
- this.diskOfferingId = diskOfferingId;
- }
-
- public String getDiskOfferingName() {
- return diskOfferingName;
- }
-
- public void setDiskOfferingName(String diskOfferingName) {
- this.diskOfferingName = diskOfferingName;
- }
-
- public String getCpuNumber() {
- return cpuNumber;
- }
-
- public void setCpuNumber(String cpuNumber) {
- this.cpuNumber = cpuNumber;
- }
-
- public String getCpuSpeed() {
- return cpuSpeed;
- }
-
- public void setCpuSpeed(String cpuSpeed) {
- this.cpuSpeed = cpuSpeed;
- }
-
- public String getMemory() {
- return memory;
- }
-
- public void setMemory(String memory) {
- this.memory = memory;
- }
-
- public String getStorage() {
- return storage;
- }
-
- public void setStorage(String stroage) {
- this.storage = stroage;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
-
- public String getGroup() {
- return group;
- }
-
- public void setGroup(String group) {
- this.group = group;
- }
-
- public Long getGroupId() {
- return groupId;
- }
-
- public void setGroupId(Long groupId) {
- this.groupId = groupId;
- }
-
- public Long getDomainId() {
- return domainId;
- }
-
- public void setDomainId(Long domainId) {
- this.domainId = domainId;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public String getHostname() {
- return hostname;
- }
-
- public void setHostname(String hostname) {
- this.hostname = hostname;
- }
-
- public Long getHostid() {
- return hostid;
- }
-
- public void setHostid(Long hostid) {
- this.hostid = hostid;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/DestroyConsoleProxyExecutor.java b/server/src/com/cloud/async/executor/DestroyConsoleProxyExecutor.java
deleted file mode 100644
index 95d09928fdb..00000000000
--- a/server/src/com/cloud/async/executor/DestroyConsoleProxyExecutor.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-
-public class DestroyConsoleProxyExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(DestroyConsoleProxyExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
- /*
- if(getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job.getId(), "ConsoleProxy", param.getVmId());
- return true;
- } else {
- try {
- boolean result = managementServer.destroyConsoleProxy(param.getVmId(), param.getEventId());
- if(result)
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- "success");
- else
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "operation failed");
- } catch(Exception e) {
- s_logger.warn("Unable to destroy console proxy " + param.getVmId() + ":" + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- return true;
- }
- */
- return true;
- }
-
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-}
diff --git a/server/src/com/cloud/async/executor/DisableAccountExecutor.java b/server/src/com/cloud/async/executor/DisableAccountExecutor.java
deleted file mode 100644
index bb72cebd05f..00000000000
--- a/server/src/com/cloud/async/executor/DisableAccountExecutor.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.async.SyncQueueItemVO;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.user.AccountVO;
-import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Transaction;
-import com.cloud.vm.DomainRouterVO;
-import com.google.gson.Gson;
-
-public class DisableAccountExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(DisableAccountExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- Long param = gson.fromJson(job.getCmdInfo(), Long.class);
-
-// SyncQueueItemVO syncItem = getSyncSource();
-// if(syncItem == null) {
-// initialSchedule(managementServer, param.longValue());
-// } else {
-// if(allRouterOperationCeased(job)) {
-// if(s_logger.isInfoEnabled())
-// s_logger.info("All previous router operations have ceased, we can now disable account " + param);
-//
-// if(managementServer.disableAccount(param.longValue())) {
-// asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
-// "success");
-// } else {
-// asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
-// "failed");
-// }
-// } else {
-// if(s_logger.isInfoEnabled())
-// s_logger.info("Previous operation on router " + syncItem.getContentId()
-// + " has ceased, still more to go to disable account " + param);
-// }
-// }
- return true;
- }
-
- public void initialSchedule(ManagementServer managementServer, long accountId) {
- AsyncJobManager asyncMgr = getAsyncJobMgr();
-
- AccountVO account = asyncMgr.getExecutorContext().getAccountDao().acquireInLockTable(accountId);
-
- if(account == null) {
- s_logger.warn("Unable to acquire account." + accountId + " to execute disable account command");
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "unabled to acquire account." + accountId + " lock");
- return;
- }
-
-// try {
-// List routers = asyncMgr.getExecutorContext().getRouterDao().listBy(accountId);
-// if(routers.size() > 0) {
-// scheduleOperationAfterAllRouterOperations(managementServer, accountId, routers);
-// } else {
-// if(s_logger.isInfoEnabled())
-// s_logger.info("Account " + accountId + " does not have running router, disable the account directly");
-//
-// if(managementServer.disableAccount(accountId)) {
-// asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
-// "success");
-// } else {
-// asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
-// "failed");
-// }
-// }
-// } catch (Exception e) {
-// s_logger.warn("Unable to disable account: " + e.getMessage(), e);
-// asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
-// e.getMessage());
-// } finally {
-// asyncMgr.getExecutorContext().getAccountDao().releaseFromLockTable(accountId);
-// }
- }
-
- @DB
- protected void scheduleOperationAfterAllRouterOperations(ManagementServer managementServer, long accountId,
- List routers) {
-
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
-
- Transaction txn = Transaction.currentTxn();
- try {
- txn.start();
-
- asyncMgr.updateAsyncJobStatus(job.getId(), routers.size(), "");
- for(DomainRouterVO router : routers) {
- if(s_logger.isInfoEnabled())
- s_logger.info("Serialize DisableAccount operation on account " + accountId
- + " with previous activities on router " + router.getId());
- asyncMgr.syncAsyncJobExecution(job, "Router", router.getId());
- }
-
- txn.commit();
- } catch (Exception e) {
- txn.rollback();
- s_logger.warn("Unexpected exception " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- }
-
- @DB
- protected boolean allRouterOperationCeased(AsyncJobVO job) {
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- Transaction txn = Transaction.currentTxn();
-
- try {
- txn.start();
-
- AsyncJobVO jobUpdate = asyncMgr.getExecutorContext().getJobDao().lockRow(job.getId(), true);
- int progress = jobUpdate.getProcessStatus();
- jobUpdate.setProcessStatus(progress -1);
- asyncMgr.getExecutorContext().getJobDao().update(job.getId(), jobUpdate);
-
- txn.commit();
-
- return progress == 1;
- } catch(Exception e) {
- s_logger.warn("Unexpected exception " + e.getMessage(), e);
-
- txn.rollback();
- }
- return false;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DisableUserExecutor.java b/server/src/com/cloud/async/executor/DisableUserExecutor.java
deleted file mode 100644
index 7d7a7b7ba7e..00000000000
--- a/server/src/com/cloud/async/executor/DisableUserExecutor.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.user.Account;
-import com.cloud.user.UserVO;
-import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Transaction;
-import com.cloud.vm.DomainRouterVO;
-import com.google.gson.Gson;
-
-public class DisableUserExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(DisableUserExecutor.class.getName());
-
- @Override
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- Long param = gson.fromJson(job.getCmdInfo(), Long.class);
- /*
- SyncQueueItemVO syncItem = getSyncSource();
- if(syncItem == null) {
- initialSchedule(managementServer, param.longValue());
- } else {
- if(allRouterOperationCeased(job)) {
- if(s_logger.isInfoEnabled())
- s_logger.info("All previous router operations have ceased, we can now disable account of the user " + param);
-
- UserVO user = asyncMgr.getExecutorContext().getUserDao().findById(param.longValue());
- if(user != null) {
- if(managementServer.disableAccount(user.getAccountId())) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- "success");
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "failed");
- }
- } else {
- if(s_logger.isInfoEnabled())
- s_logger.info("User " + param + " no longer exists, assuming it is already disbled");
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- "success");
- }
- } else {
- if(s_logger.isInfoEnabled())
- s_logger.info("Previous operation on router " + syncItem.getContentId()
- + " has ceased, still more to go to disable account for user " + param);
- }
- }
- */
- return true;
- }
-
- public void initialSchedule(ManagementServer managementServer, long userId) {
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- UserVO user = asyncMgr.getExecutorContext().getUserDao().findById(userId);
- if(user == null) {
- if(s_logger.isInfoEnabled()) {
- s_logger.info("User " + userId + " does not exist");
- }
-
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "User " + userId + " does not exist");
- return;
- }
- /*
- if(managementServer.disableUser(userId)) {
- if(needToDisableAccount(user)) {
- if(s_logger.isInfoEnabled())
- s_logger.info("This is the only user " + userId + " left for the account " + user.getAccountId() + ", we will disable account as well");
-
- List routers = asyncMgr.getExecutorContext().getRouterDao().listBy(user.getAccountId());
- if(routers.size() > 0) {
- scheduleOperationAfterAllRouterOperations(managementServer, user.getAccountId(), routers);
- } else {
- if(s_logger.isInfoEnabled())
- s_logger.info("Account " + user.getAccountId() + " does not have DomR to serialize with, disable it directly");
-
- // no router being created under the account, disable the account directly
- if(managementServer.disableAccount(user.getAccountId())) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- "success");
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "failed");
- }
- }
- }
- } else {
- if(s_logger.isInfoEnabled())
- s_logger.info("Unable to disable user " + userId);
-
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "Unable to disable user " + userId);
- }
- */
- }
-
- private boolean needToDisableAccount(UserVO user) {
- AsyncJobManager asyncMgr = getAsyncJobMgr();
-
- List allUsersByAccount = asyncMgr.getExecutorContext().getUserDao().listByAccount(user.getAccountId());
- for (UserVO oneUser : allUsersByAccount) {
- if (oneUser.getState().equals(Account.State.enabled)) {
- return false;
- }
- }
- return true;
- }
-
- @DB
- protected void scheduleOperationAfterAllRouterOperations(ManagementServer managementServer, long accountId,
- List routers) {
-
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
-
- Transaction txn = Transaction.currentTxn();
- try {
- txn.start();
-
- asyncMgr.updateAsyncJobStatus(job.getId(), routers.size(), "");
- for(DomainRouterVO router : routers) {
- if(s_logger.isInfoEnabled()) {
- s_logger.info("Serialize DisableUser operation with previous activities on router " + router.getId());
- }
- asyncMgr.syncAsyncJobExecution(job, "Router", router.getId());
- }
-
- txn.commit();
- } catch (Exception e) {
- txn.rollback();
- s_logger.warn("Unexpected exception " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- }
-
- @DB
- protected boolean allRouterOperationCeased(AsyncJobVO job) {
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- Transaction txn = Transaction.currentTxn();
-
- try {
- txn.start();
-
- AsyncJobVO jobUpdate = asyncMgr.getExecutorContext().getJobDao().lockRow(job.getId(), true);
- int progress = jobUpdate.getProcessStatus();
- jobUpdate.setProcessStatus(progress -1);
- asyncMgr.getExecutorContext().getJobDao().update(job.getId(), jobUpdate);
-
- txn.commit();
-
- return progress == 1;
- } catch(Exception e) {
- s_logger.warn("Unexpected exception " + e.getMessage(), e);
-
- txn.rollback();
- }
- return false;
- }
-}
diff --git a/server/src/com/cloud/async/executor/DisassociateIpAddressParam.java b/server/src/com/cloud/async/executor/DisassociateIpAddressParam.java
deleted file mode 100644
index cd8519aa16b..00000000000
--- a/server/src/com/cloud/async/executor/DisassociateIpAddressParam.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class DisassociateIpAddressParam {
-
- private long userId;
- private long accountId;
- private String ipAddress;
-
- public DisassociateIpAddressParam() {
- }
-
- public DisassociateIpAddressParam(long userId, long accountId, String ipAddress) {
- this.userId = userId;
- this.accountId = accountId;
- this.ipAddress = ipAddress;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public void setUserId(long userId) {
- this.userId = userId;
- }
-
- public long getAccountId() {
- return accountId;
- }
-
- public void setAccountId(long accountId) {
- this.accountId = accountId;
- }
-
- public String getIpAddress() {
- return ipAddress;
- }
-
- public void setIpAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- }
-}
diff --git a/server/src/com/cloud/async/executor/ExtractJobResultObject.java b/server/src/com/cloud/async/executor/ExtractJobResultObject.java
old mode 100755
new mode 100644
index aa68e8ad475..27fc0efee07
--- a/server/src/com/cloud/async/executor/ExtractJobResultObject.java
+++ b/server/src/com/cloud/async/executor/ExtractJobResultObject.java
@@ -1,167 +1,167 @@
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.async.AsyncInstanceCreateStatus;
-import com.cloud.serializer.Param;
-import com.cloud.storage.Volume.VolumeType;
-import com.cloud.storage.upload.UploadState;
-
-public class ExtractJobResultObject {
-
- public ExtractJobResultObject(Long accountId, String typeName, String currState, int uploadPercent, Long uploadId){
- this.accountId = accountId;
- this.name = typeName;
- this.state = currState;
- this.id = uploadId;
- this.uploadPercent = uploadPercent;
- }
-
- public ExtractJobResultObject(Long accountId, String typeName, String currState, Long uploadId, String url){
- this.accountId = accountId;
- this.name = typeName;
- this.state = currState;
- this.id = uploadId;
- this.url = url;
- }
-
- public ExtractJobResultObject(){
- }
-
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="uploadPercentage")
- private int uploadPercent;
-
- @Param(name="uploadStatus")
- private String uploadStatus;
-
- @Param(name="accountid")
- long accountId;
-
- @Param(name="result_string")
- String result_string;
-
- @Param(name="created")
- private Date createdDate;
-
- @Param(name="state")
- private String state;
-
- @Param(name="storagetype")
- String storageType;
-
- @Param(name="storage")
- private String storage;
-
- @Param(name="zoneid")
- private Long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="url")
- private String url;
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public int getUploadPercent() {
- return uploadPercent;
- }
-
- public void setUploadPercent(int i) {
- this.uploadPercent = i;
- }
-
- public String getUploadStatus() {
- return uploadStatus;
- }
-
- public void setUploadStatus(String uploadStatus) {
- this.uploadStatus = uploadStatus;
- }
-
- public String getResult_string() {
- return result_string;
- }
-
- public void setResult_string(String resultString) {
- result_string = resultString;
- }
-
-
- public Long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public String getStorage() {
- return storage;
- }
-
- public void setStorage(String storage) {
- this.storage = storage;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public long getId() {
- return id;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public void setCreatedDate(Date createdDate) {
- this.createdDate = createdDate;
- }
-
- public Date getCreatedDate() {
- return createdDate;
- }
-
- public void setState(String status) {
- this.state = status;
- }
-
- public String getState() {
- return state;
- }
-
- public void setStorageType (String storageType) {
- this.storageType = storageType;
- }
-
- public String getStorageType() {
- return storageType;
- }
-
-}
+package com.cloud.async.executor;
+
+import java.util.Date;
+
+import com.cloud.async.AsyncInstanceCreateStatus;
+import com.cloud.serializer.Param;
+import com.cloud.storage.Volume.VolumeType;
+import com.cloud.storage.upload.UploadState;
+
+public class ExtractJobResultObject {
+
+ public ExtractJobResultObject(Long accountId, String typeName, String currState, int uploadPercent, Long uploadId){
+ this.accountId = accountId;
+ this.name = typeName;
+ this.state = currState;
+ this.id = uploadId;
+ this.uploadPercent = uploadPercent;
+ }
+
+ public ExtractJobResultObject(Long accountId, String typeName, String currState, Long uploadId, String url){
+ this.accountId = accountId;
+ this.name = typeName;
+ this.state = currState;
+ this.id = uploadId;
+ this.url = url;
+ }
+
+ public ExtractJobResultObject(){
+ }
+
+ @Param(name="id")
+ private long id;
+
+ @Param(name="name")
+ private String name;
+
+ @Param(name="uploadPercentage")
+ private int uploadPercent;
+
+ @Param(name="uploadStatus")
+ private String uploadStatus;
+
+ @Param(name="accountid")
+ long accountId;
+
+ @Param(name="result_string")
+ String result_string;
+
+ @Param(name="created")
+ private Date createdDate;
+
+ @Param(name="state")
+ private String state;
+
+ @Param(name="storagetype")
+ String storageType;
+
+ @Param(name="storage")
+ private String storage;
+
+ @Param(name="zoneid")
+ private Long zoneId;
+
+ @Param(name="zonename")
+ private String zoneName;
+
+ @Param(name="url")
+ private String url;
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public int getUploadPercent() {
+ return uploadPercent;
+ }
+
+ public void setUploadPercent(int i) {
+ this.uploadPercent = i;
+ }
+
+ public String getUploadStatus() {
+ return uploadStatus;
+ }
+
+ public void setUploadStatus(String uploadStatus) {
+ this.uploadStatus = uploadStatus;
+ }
+
+ public String getResult_string() {
+ return result_string;
+ }
+
+ public void setResult_string(String resultString) {
+ result_string = resultString;
+ }
+
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ public void setZoneId(Long zoneId) {
+ this.zoneId = zoneId;
+ }
+
+ public String getZoneName() {
+ return zoneName;
+ }
+
+ public void setZoneName(String zoneName) {
+ this.zoneName = zoneName;
+ }
+
+ public String getStorage() {
+ return storage;
+ }
+
+ public void setStorage(String storage) {
+ this.storage = storage;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setCreatedDate(Date createdDate) {
+ this.createdDate = createdDate;
+ }
+
+ public Date getCreatedDate() {
+ return createdDate;
+ }
+
+ public void setState(String status) {
+ this.state = status;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setStorageType (String storageType) {
+ this.storageType = storageType;
+ }
+
+ public String getStorageType() {
+ return storageType;
+ }
+
+}
diff --git a/server/src/com/cloud/async/executor/ExtractTemplateExecutor.java b/server/src/com/cloud/async/executor/ExtractTemplateExecutor.java
deleted file mode 100755
index 6229002ac7f..00000000000
--- a/server/src/com/cloud/async/executor/ExtractTemplateExecutor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-
-public class ExtractTemplateExecutor extends BaseAsyncJobExecutor {
-
- public static final Logger s_logger = Logger.getLogger(ExtractTemplateExecutor.class.getName());
- @Override
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
-
- ExtractTemplateParam param = gson.fromJson(job.getCmdInfo(), ExtractTemplateParam.class);
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
-
- /*
- try {
- managementServer.extractTemplate(param.getUrl(), param.getTemplateId(), param.getZoneId(), param.getEventId(), getJob().getId(), param.getExtractMode());
- } catch (Exception e) {
- s_logger.warn("Unable to extract template: " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- }
- */
-
- return true;
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/ExtractTemplateParam.java b/server/src/com/cloud/async/executor/ExtractTemplateParam.java
deleted file mode 100644
index 8fb2dbf2284..00000000000
--- a/server/src/com/cloud/async/executor/ExtractTemplateParam.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.cloud.async.executor;
-
-import com.cloud.storage.Upload;
-
-public class ExtractTemplateParam {
-
- private long userId;
- private long templateId;
- private Long zoneId;
- private long eventId;
- private String url;
- private Upload.Mode extractMode;
-
- public ExtractTemplateParam() {
- }
-
- public ExtractTemplateParam(long userId, long templateId, Long zoneId, long eventId, String url) {
- this.userId = userId;
- this.templateId = templateId;
- this.zoneId = zoneId;
- this.eventId = eventId;
- this.url = url;
- this.extractMode = Upload.Mode.FTP_UPLOAD;
- }
-
- public ExtractTemplateParam(long userId, long templateId, Long zoneId, long eventId, String url, Upload.Mode mode) {
- this.userId = userId;
- this.templateId = templateId;
- this.zoneId = zoneId;
- this.eventId = eventId;
- this.url = url;
- this.extractMode = mode;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public long getTemplateId() {
- return templateId;
- }
-
- public Long getZoneId() {
- return zoneId;
- }
-
- public void setEventId(long eventId) {
- this.eventId = eventId;
- }
-
- public long getEventId() {
- return eventId;
- }
-
- public Upload.Mode getExtractMode() {
- return extractMode;
- }
-
- public void setExtractMode(Upload.Mode extractMode) {
- this.extractMode = extractMode;
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/ExtractVolumeExecutor.java b/server/src/com/cloud/async/executor/ExtractVolumeExecutor.java
deleted file mode 100644
index 71ee35f1506..00000000000
--- a/server/src/com/cloud/async/executor/ExtractVolumeExecutor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-
-public class ExtractVolumeExecutor extends BaseAsyncJobExecutor {
-
- public static final Logger s_logger = Logger.getLogger(ExtractVolumeExecutor.class.getName());
-
- @Override
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
-
- ExtractTemplateParam param = gson.fromJson(job.getCmdInfo(), ExtractTemplateParam.class);
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
-
- /*
- try {
- managementServer.extractVolume(param.getUrl(), param.getTemplateId(), param.getZoneId(), param.getEventId(), getJob().getId());
-
- } catch (Exception e) {
- s_logger.warn("Unable to extract volume: " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- }
- */
-
- return true;
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/HostResultObject.java b/server/src/com/cloud/async/executor/HostResultObject.java
deleted file mode 100644
index 652d7539c64..00000000000
--- a/server/src/com/cloud/async/executor/HostResultObject.java
+++ /dev/null
@@ -1,442 +0,0 @@
-package com.cloud.async.executor;
-
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-import java.util.Date;
-import java.util.Set;
-
-import com.cloud.host.Status.Event;
-import com.cloud.serializer.Param;
-
-public class HostResultObject {
- @Param(name="id")
- private long id;
-
- @Param(name="averageload")
- private long averageLoad;
-
- @Param(name="name")
- private String name;
-
- @Param(name="state")
- private String state;
-
- @Param(name="type")
- private String type;
-
- @Param(name="ipaddress")
- private String ipAddress;
-
- @Param(name="hypervisor")
- private String hypervisorType;
-
- @Param(name="fstype")
- private String fsType;
-
-// @Param(name="available")
-// private boolean available;
-//
-// @Param(name="setup")
-// private boolean setup;
-
- @Param(name="zoneid")
- private long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="podid")
- private Long podId;
-
- @Param(name="podname")
- private String podName;
-
- @Param(name="cpuallocated")
- private String cpuAllocated;
-
- @Param(name="cpuused")
- private String cpuUsed;
-
- @Param(name="cpunumber")
- private long cpuNumber;
-
- @Param(name="url")
- private String storageUrl;
-
- @Param(name="cpuspeed")
- private Long cpuSpeed;
-
- @Param(name="memorytotal")
- private long totalMemory;
-
- @Param(name="memoryallocated")
- private long memoryAllocated;
-
- @Param(name="memoryused")
- private long memoryUsed;
-
- @Param(name="disksizetotal")
- private long diskSizeTotal;
-
- @Param(name="disksizeallocated")
- private long diskSizeAllocated;
-
- @Param(name="capabilities")
- private String caps;
-
- @Param(name="totalsize")
- private Long totalSize;
-
- @Param(name="managementserverid")
- private Long managementServerId;
-
- @Param(name="version")
- private String version;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="removed")
- private Date removed;
-
- @Param(name="disconnected")
- private Date disconnected;
-
- @Param(name="events")
- private Set events;
-
- @Param(name="oscategoryid")
- private Long osCategoryId;
-
- @Param(name="oscategoryname")
- private String osCategoryName;
-
- @Param(name="lastpinged")
- private long lastPinged;
-
- @Param(name="networkkbsread")
- private Long networkKbsRead;
-
- @Param(name="networkkbswrite")
- private Long networkKbsWrite;
-
- public long getId(){
- return this.id;
- }
-
- public void setId(long id){
- this.id = id;
- }
-
- public void setOsCategoryId(long osCategoryId){
- this.osCategoryId = osCategoryId;
- }
-
- public void setOsCategoryName(String osCategoryName){
- this.osCategoryName = osCategoryName;
- }
-
- public Long getOsCategoryId(){
- return this.osCategoryId;
- }
-
- public String getOsCategoryName(){
- return this.osCategoryName;
- }
-
- public HostResultObject() {
- }
-
- public SetgetEvents()
- {
- return this.events;
- }
-
- public void setEvents(Set eventSet)
- {
- this.events = eventSet;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getIpAddress() {
- return ipAddress;
- }
-
- public void setIpAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- }
-
- public String getHypervisorType() {
- return hypervisorType;
- }
-
- public void setHypervisorType(String hypervisorType) {
- this.hypervisorType = hypervisorType;
- }
-
- public String getFsType() {
- return fsType;
- }
-
- public void setFsType(String fsType) {
- this.fsType = fsType;
- }
-
-// public boolean isAvailable() {
-// return available;
-// }
-//
-// public void setAvailable(boolean available) {
-// this.available = available;
-// }
-//
-// public boolean isSetup() {
-// return setup;
-// }
-//
-// public void setSetup(boolean setup) {
-// this.setup = setup;
-// }
-
- public long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public String getPodName() {
- return podName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public void setPodName(String podName) {
- this.podName = podName;
- }
-
- public Long getPodId() {
- return podId;
- }
-
- public void setPodId(Long podId) {
- this.podId = podId;
- }
-
- public String getCpuAllocated() {
- return cpuAllocated;
- }
-
- public void setCpuAllocated(String cpuAllocated) {
- this.cpuAllocated = cpuAllocated;
- }
-
- public String getCpuUsed() {
- return cpuUsed;
- }
-
- public void setCpuUsed(String cpuUsed) {
- this.cpuUsed = cpuUsed;
- }
-
- public long getCpuNumber() {
- return cpuNumber;
- }
-
- public void setCpuNumber(long cpuNumber) {
- this.cpuNumber = cpuNumber;
- }
-
- public String getStorageUrl() {
- return storageUrl;
- }
-
- public void setStorageUrl(String storageUrl) {
- this.storageUrl = storageUrl;
- }
-
- public Long getCpuSpeed() {
- return cpuSpeed;
- }
-
- public void setCpuSpeed(Long cpuSpeed) {
- this.cpuSpeed = cpuSpeed;
- }
-
- public long getTotalMemory() {
- return totalMemory;
- }
-
- public void setTotalMemory(long totalMemory) {
- this.totalMemory = totalMemory;
- }
-
- public long getMemoryAllocated() {
- return memoryAllocated;
- }
-
- public void setMemoryAllocated(long memoryAllocated) {
- this.memoryAllocated = memoryAllocated;
- }
-
- public long getMemoryUsed() {
- return memoryUsed;
- }
-
- public void setMemoryUsed(long memoryUsed) {
- this.memoryUsed = memoryUsed;
- }
-
-// public long getDiskSize() {
-// return diskSizeTotal;
-// }
-
- public long isDiskSizeTotal() {
- return diskSizeTotal;
- }
-
- public void setDiskSizeTotal(long diskSizeTotal) {
- this.diskSizeTotal = diskSizeTotal;
- }
-
- public long getDiskSizeAllocated() {
- return diskSizeAllocated;
- }
-
- public void setDiskSizeAllocated(long diskSizeAllocated) {
- this.diskSizeAllocated = diskSizeAllocated;
- }
-
- public String getCaps() {
- return caps;
- }
-
- public void setCaps(String caps) {
- this.caps = caps;
- }
-
- public Long getTotalSize() {
- return totalSize;
- }
-
- public void setTotalSize(Long totalSize) {
- this.totalSize = totalSize;
- }
-
- public long getLastPinged() {
- return lastPinged;
- }
-
- public void setLastPinged(long l) {
- this.lastPinged = l;
- }
-
- public Long getManagementServerId() {
- return managementServerId;
- }
-
- public void setManagementServerId(Long managementServerId) {
- this.managementServerId = managementServerId;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public Date getRemoved() {
- return removed;
- }
-
- public void setRemoved(Date removed) {
- this.removed = removed;
- }
-
- public Date getDisconnected() {
- return disconnected;
- }
-
- public void setDisconnected(Date disconnected) {
- this.disconnected = disconnected;
- }
-
- public long getAverageLoad(){
- return this.averageLoad;
- }
-
- public void setAverageLoad(long averageLoad){
- this.averageLoad = averageLoad;
- }
-
- public Long getNetworkKbsRead(){
- return this.networkKbsRead;
- }
-
- public void setNetworkKbsRead(long networkKbsRead){
- this.networkKbsRead = networkKbsRead;
- }
-
- public Long getNetworkKbsWrite(){
- return this.networkKbsWrite;
- }
-
- public void setNetworkKbsWrite(long networkKbsWrite){
- this.networkKbsWrite = networkKbsWrite;
- }
-}
diff --git a/server/src/com/cloud/async/executor/LoadBalancerParam.java b/server/src/com/cloud/async/executor/LoadBalancerParam.java
deleted file mode 100644
index 34b2263024f..00000000000
--- a/server/src/com/cloud/async/executor/LoadBalancerParam.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.List;
-
-public class LoadBalancerParam {
- private Long userId;
- private Long domainRouterId;
- private Long loadBalancerId;
- private List instanceIdList;
-
- public LoadBalancerParam() {
- }
-
- public LoadBalancerParam(Long userId, Long domainRouterId, Long loadBalancerId, List instanceIdList) {
- this.userId = userId;
- this.domainRouterId = domainRouterId;
- this.loadBalancerId = loadBalancerId;
- this.instanceIdList = instanceIdList;
- }
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public Long getDomainRouterId() {
- return domainRouterId;
- }
-
- public void setDomainRouterId(Long domainRouterId) {
- this.domainRouterId = domainRouterId;
- }
-
- public Long getLoadBalancerId() {
- return loadBalancerId;
- }
-
- public void setLoadBalancerId(Long securityGroupId) {
- this.loadBalancerId = securityGroupId;
- }
-
- public List getInstanceIdList() {
- return instanceIdList;
- }
-
- public void setInstanceId(List instanceIdList) {
- this.instanceIdList = instanceIdList;
- }
-}
diff --git a/server/src/com/cloud/async/executor/OperationResponse.java b/server/src/com/cloud/async/executor/OperationResponse.java
deleted file mode 100644
index 0934eb6ea9b..00000000000
--- a/server/src/com/cloud/async/executor/OperationResponse.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.cloud.async.executor;
-
-public class OperationResponse {
-
- public static final int STATUS_IN_PROGRESS = 0;
- public static final int STATUS_SUCCEEDED = 1;
- public static final int STATUS_FAILED = 2;
-
- private int resultCode;
- private String resultDescription;
-
- public OperationResponse(int resultCode, String resultDescription) {
- this.resultCode = resultCode;
- this.resultDescription = resultDescription;
- }
-
- public int getResultCode() {
- return resultCode;
- }
-
- public void setResultCode(int resultCode) {
- this.resultCode = resultCode;
- }
-
- public String getResultDescription() {
- return resultDescription;
- }
-
- public void setResultDescription(String resultDescription) {
- this.resultDescription = resultDescription;
- }
-
-}
diff --git a/server/src/com/cloud/async/executor/PrepareMaintenanceExecutor.java b/server/src/com/cloud/async/executor/PrepareMaintenanceExecutor.java
deleted file mode 100644
index 2b90631aef0..00000000000
--- a/server/src/com/cloud/async/executor/PrepareMaintenanceExecutor.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.text.DecimalFormat;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.host.Host;
-import com.cloud.host.HostStats;
-import com.cloud.host.HostVO;
-import com.cloud.host.Status;
-import com.cloud.host.Status.Event;
-import com.cloud.offering.ServiceOffering;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.storage.GuestOSCategoryVO;
-import com.cloud.utils.fsm.StateMachine;
-import com.cloud.vm.UserVmVO;
-import com.google.gson.Gson;
-
-public class PrepareMaintenanceExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(PrepareMaintenanceExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- Long param = gson.fromJson(job.getCmdInfo(), Long.class);
- /*
- try {
- boolean result = managementServer.prepareForMaintenance(param.longValue());
- if(result)
- {
- HostVO host = managementServer.getHostBy(param);
- final StateMachine sm = new StateMachine();
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- composeResultObject(host,sm,managementServer));
- }
- else
- {
- HostVO host = managementServer.getHostBy(param);
- final StateMachine sm = new StateMachine();
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- composeResultObject(host,sm,managementServer));
- }
- } catch(Exception e) {
- s_logger.warn("Unable to prepare maintenance: " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- */
- return true;
- }
-
- private HostResultObject composeResultObject(HostVO hostVO, StateMachine sm, ManagementServer managementServer)
- {
-
- HostResultObject hostRO = new HostResultObject();
-
- hostRO.setId(hostVO.getId());
-
- hostRO.setName(hostVO.getName());
- hostRO.setState(hostVO.getStatus().toString());
-
- if(hostVO.getDisconnectedOn() != null)
- hostRO.setDisconnected(hostVO.getDisconnectedOn());
-
-
- if (hostVO.getType() != null) {
- hostRO.setType(hostVO.getType().toString());
- }
-
-// GuestOSCategoryVO guestOSCategory = managementServer.getHostGuestOSCategory(hostVO.getId());
-// if (guestOSCategory != null) {
-// hostRO.setOsCategoryId(guestOSCategory.getId());
-// hostRO.setOsCategoryName(guestOSCategory.getName());
-// }
-
-
- hostRO.setIpAddress(hostVO.getPrivateIpAddress());
- hostRO.setZoneId(hostVO.getDataCenterId());
-// hostRO.setZoneName(managementServer.getDataCenterBy(hostVO.getDataCenterId()).getName());
-
- if (hostVO.getPodId() != null && managementServer.findHostPodById(hostVO.getPodId()) != null) {
- hostRO.setPodId(hostVO.getPodId());
- hostRO.setPodName((managementServer.findHostPodById(hostVO.getPodId())).getName());
- }
-
- hostRO.setVersion(hostVO.getVersion().toString());
-
- if (hostVO.getHypervisorType() != null) {
- hostRO.setHypervisorType(hostVO.getHypervisorType().toString());
- }
-
- if ((hostVO.getCpus() != null) && (hostVO.getSpeed() != null) && !(hostVO.getType().toString().equals("Storage")))
- {
-
- hostRO.setCpuNumber(hostVO.getCpus());
- hostRO.setCpuSpeed(hostVO.getSpeed());
- // calculate cpu allocated by vm
- int cpu = 0;
- String cpuAlloc = null;
- DecimalFormat decimalFormat = new DecimalFormat("#.##");
-// List instances = managementServer.listUserVMsByHostId(hostVO.getId());
-// for (UserVmVO vm : instances) {
-// ServiceOffering so = managementServer.findServiceOfferingById(vm.getServiceOfferingId());
-// cpu += so.getCpu() * so.getSpeed();
-// }
- cpuAlloc = decimalFormat.format(((float) cpu / (float) (hostVO.getCpus() * hostVO.getSpeed())) * 100f) + "%";
- hostRO.setCpuAllocated(cpuAlloc);
-
- // calculate cpu utilized
- String cpuUsed = null;
-// HostStats hostStats = managementServer.getHostStatistics(hostVO.getId());
-// if (hostStats != null) {
-// float cpuUtil = (float) hostStats.getCpuUtilization();
-// cpuUsed = decimalFormat.format(cpuUtil) + "%";
-// hostRO.setCpuUsed(cpuUsed);
-//
-// long avgLoad = (long)hostStats.getAverageLoad();
-// hostRO.setAverageLoad(avgLoad);
-//
-// long networkKbsRead = (long)hostStats.getNetworkReadKBs();
-// hostRO.setNetworkKbsRead(networkKbsRead);
-//
-// long networkKbsWrite = (long)hostStats.getNetworkWriteKBs();
-// hostRO.setNetworkKbsWrite(networkKbsWrite);
-// }
- }
-
- if ( hostVO.getType() == Host.Type.Routing ) {
- Long memory = hostVO.getTotalMemory();
- hostRO.setTotalMemory(memory);
- // calculate memory allocated by systemVM and userVm
- long mem = managementServer.getMemoryUsagebyHost(hostVO.getId());
- hostRO.setMemoryAllocated(mem);
- // calculate memory utilized, we don't provide memory over commit
- hostRO.setMemoryUsed(mem);
- // calculate memory utilized
- }
- if (hostVO.getType().toString().equals("Storage")) {
- hostRO.setDiskSizeTotal(hostVO.getTotalSize());
- hostRO.setDiskSizeAllocated(0);
- }
- hostRO.setCaps(hostVO.getCapabilities());
- hostRO.setLastPinged(hostVO.getLastPinged());
- if (hostVO.getManagementServerId() != null) {
- hostRO.setManagementServerId(hostVO.getManagementServerId());
- }
-
- if (hostVO.getCreated() != null) {
- hostRO.setCreated(hostVO.getCreated());
- }
- if (hostVO.getRemoved() != null) {
- hostRO.setRemoved(hostVO.getRemoved());
- }
-
- Set possibleEvents = hostVO.getStatus().getPossibleEvents();
- hostRO.setEvents(possibleEvents);
-
- return hostRO;
-
- }
-}
diff --git a/server/src/com/cloud/async/executor/PreparePrimaryStorageMaintenanceExecutor.java b/server/src/com/cloud/async/executor/PreparePrimaryStorageMaintenanceExecutor.java
deleted file mode 100644
index 84cf0e573f2..00000000000
--- a/server/src/com/cloud/async/executor/PreparePrimaryStorageMaintenanceExecutor.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.dc.ClusterVO;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.storage.StoragePoolVO;
-import com.cloud.storage.StorageStats;
-import com.google.gson.Gson;
-
-public class PreparePrimaryStorageMaintenanceExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(PreparePrimaryStorageMaintenanceExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- Long param = gson.fromJson(job.getCmdInfo(), Long.class);
- Long userId = job.getUserId();
- /*
- try {
- boolean result = managementServer.preparePrimaryStorageForMaintenance(param.longValue(), userId.longValue());
- if(result)
- {
- StoragePoolVO primaryStorage = managementServer.findPoolById(param);
-
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- composeResultObject(primaryStorage,managementServer));
- }
- else
- {
- StoragePoolVO primaryStorage = managementServer.findPoolById(param);
-
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- composeResultObject(primaryStorage,managementServer));
- }
- } catch(Exception e) {
- s_logger.warn("Unable to prepare maintenance: " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- */
- return true;
- }
-
- private PrimaryStorageResultObject composeResultObject(StoragePoolVO storagePoolVO, ManagementServer managementServer)
- {
-
- PrimaryStorageResultObject primaryStorageRO = new PrimaryStorageResultObject();
-
- primaryStorageRO.setId(storagePoolVO.getId());
-
- primaryStorageRO.setName(storagePoolVO.getName());
- primaryStorageRO.setType(storagePoolVO.getPoolType().toString());
- primaryStorageRO.setState(storagePoolVO.getStatus().toString());
- primaryStorageRO.setIpAddress(storagePoolVO.getHostAddress());
- primaryStorageRO.setZoneId(storagePoolVO.getDataCenterId());
-// primaryStorageRO.setZoneName(managementServer.getDataCenterBy(storagePoolVO.getDataCenterId()).getName());
-
- if (storagePoolVO.getPodId() != null && managementServer.findHostPodById(storagePoolVO.getPodId()) != null) {
- primaryStorageRO.setPodId(storagePoolVO.getPodId());
- primaryStorageRO.setPodName((managementServer.findHostPodById(storagePoolVO.getPodId())).getName());
- }
-
- if (storagePoolVO.getCreated() != null) {
- primaryStorageRO.setCreated(storagePoolVO.getCreated());
- }
- primaryStorageRO.setDiskSizeTotal(storagePoolVO.getCapacityBytes());
-
-// StorageStats stats = managementServer.getStoragePoolStatistics(storagePoolVO.getId());
- long capacity = storagePoolVO.getCapacityBytes();
- long available = storagePoolVO.getAvailableBytes() ;
- long used = capacity - available;
-
-// if (stats != null) {
-// used = stats.getByteUsed();
-// available = capacity - used;
-// }
-
- primaryStorageRO.setDiskSizeAllocated(used);
- if (storagePoolVO.getClusterId() != null)
- {
-// ClusterVO cluster = managementServer.findClusterById(storagePoolVO.getClusterId());
- primaryStorageRO.setClusterId(storagePoolVO.getClusterId());
-// primaryStorageRO.setClusterName(cluster.getName());
- }
-
-// primaryStorageRO.setTags(managementServer.getStoragePoolTags(storagePoolVO.getId()));
- return primaryStorageRO;
-
- }
-}
diff --git a/server/src/com/cloud/async/executor/PrimaryStorageResultObject.java b/server/src/com/cloud/async/executor/PrimaryStorageResultObject.java
deleted file mode 100644
index f47f0f7e5f0..00000000000
--- a/server/src/com/cloud/async/executor/PrimaryStorageResultObject.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-
-public class PrimaryStorageResultObject
-{
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getIpAddress() {
- return ipAddress;
- }
-
- public void setIpAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- }
-
- public long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public Long getPodId() {
- return podId;
- }
-
- public void setPodId(Long podId) {
- this.podId = podId;
- }
-
- public String getPodName() {
- return podName;
- }
-
- public void setPodName(String podName) {
- this.podName = podName;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public Long getDiskSizeTotal() {
- return diskSizeTotal;
- }
-
- public void setDiskSizeTotal(Long diskSizeTotal) {
- this.diskSizeTotal = diskSizeTotal;
- }
-
- public Long getDiskSizeAllocated() {
- return diskSizeAllocated;
- }
-
- public void setDiskSizeAllocated(Long diskSizeAllocated) {
- this.diskSizeAllocated = diskSizeAllocated;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public Long getClusterId() {
- return clusterId;
- }
-
- public void setClusterId(Long clusterId) {
- this.clusterId = clusterId;
- }
-
- public String getClusterName() {
- return clusterName;
- }
-
- public void setClusterName(String clusterName) {
- this.clusterName = clusterName;
- }
-
- public String getTags() {
- return tags;
- }
-
- public void setTags(String tags) {
- this.tags = tags;
- }
-
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="type")
- private String type;
-
- @Param(name="state")
- private String state;
-
- @Param(name="ipaddress")
- private String ipAddress;
-
- @Param(name="zoneid")
- private long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="podid")
- private Long podId;
-
- @Param(name="podname")
- private String podName;
-
- @Param(name="path")
- private String path;
-
- @Param(name="disksizetotal")
- private Long diskSizeTotal;
-
- @Param(name="disksizeallocated")
- private Long diskSizeAllocated;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="clusterid")
- private Long clusterId;
-
- @Param(name="clustername")
- private String clusterName;
-
- @Param(name="tags")
- private String tags;
-
-}
diff --git a/server/src/com/cloud/async/executor/RebootConsoleProxyExecutor.java b/server/src/com/cloud/async/executor/RebootConsoleProxyExecutor.java
deleted file mode 100644
index c0eccab5726..00000000000
--- a/server/src/com/cloud/async/executor/RebootConsoleProxyExecutor.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.vm.ConsoleProxyVO;
-import com.google.gson.Gson;
-
-public class RebootConsoleProxyExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(RebootConsoleProxyExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
- /*
- if(getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job, "ConsoleProxy", param.getVmId());
- return true;
- } else {
- try {
- boolean result = managementServer.rebootConsoleProxy(param.getVmId(), param.getEventId());
- if(result)
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- composeResultObject(managementServer, param.getVmId()));
- else
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "operation failed");
- } catch(Exception e) {
- s_logger.warn("Unable to reboot console proxy " + param.getVmId() + ":" + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- return true;
- }
- */
- return true;
- }
-
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-
- private ConsoleProxyOperationResultObject composeResultObject(ManagementServer managementServer, long proxyVmId) {
- ConsoleProxyVO proxy = managementServer.findConsoleProxyById(proxyVmId);
- return ConsoleProxyExecutorHelper.composeResultObject(managementServer, proxy);
- }
-}
diff --git a/server/src/com/cloud/async/executor/RebootRouterExecutor.java b/server/src/com/cloud/async/executor/RebootRouterExecutor.java
deleted file mode 100644
index fa534471b9a..00000000000
--- a/server/src/com/cloud/async/executor/RebootRouterExecutor.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.exception.InternalErrorException;
-import com.cloud.network.router.VirtualRouter;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-
-public class RebootRouterExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(RebootRouterExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
-
- /*
- if(getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job, "Router", param.getVmId());
- return true;
- } else {
- try {
- if(managementServer.rebootRouter(param.getVmId(), param.getEventId())) {
- DomainRouter router = managementServer.findDomainRouterById(param.getVmId());
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- RouterExecutorHelper.composeResultObject(managementServer, router));
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "operation failed");
- }
- } catch (InternalErrorException e) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Unable to reboot router " + param.getVmId() + ":" + e.getMessage());
-
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- } catch(Exception e) {
- s_logger.warn("Unable to reboot router " + param.getVmId() + ":" + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- return true;
- }
- */
- return true;
- }
-
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-}
diff --git a/server/src/com/cloud/async/executor/RebootVMExecutor.java b/server/src/com/cloud/async/executor/RebootVMExecutor.java
deleted file mode 100644
index 0051893dd7c..00000000000
--- a/server/src/com/cloud/async/executor/RebootVMExecutor.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.vm.UserVmVO;
-import com.google.gson.Gson;
-
-public class RebootVMExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(RebootVMExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- UserVmVO vm = managementServer.findUserVMInstanceById(param.getVmId());
- OperationResponse response;
-
- /*
- if(getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job.getId(), "UserVM", param.getVmId());
-
- // always true if it does not have sync-source
- return true;
- } else {
-
- managementServer.saveStartedEvent(param.getUserId(), param.getAccountId(), EventTypes.EVENT_VM_REBOOT, "Rebooting Vm with Id: "+param.getVmId(), param.getEventId());
- asyncMgr.updateAsyncJobAttachment(job.getId(), "vm_instance", param.getVmId());
- response = asyncMgr.getExecutorContext().getVmMgr().executeRebootVM(this, param);
- String params = "id="+vm.getId() + "\nvmName=" + vm.getName() + "\nsoId=" + vm.getServiceOfferingId() + "\ntId=" + vm.getTemplateId() + "\ndcId=" + vm.getDataCenterId();
-
- if (OperationResponse.STATUS_SUCCEEDED == response.getResultCode() ){
- managementServer.saveEvent(param.getUserId(), param.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_VM_REBOOT,
- "Rebooting Vm with Id: " + param.getVmId(), params, param.getEventId());
- return true;
- }else if (OperationResponse.STATUS_FAILED == response.getResultCode()){
- managementServer.saveEvent(param.getUserId(), param.getAccountId(), EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_REBOOT,
- "Failed to reboot VM instance : " + response.getResultDescription(), params, param.getEventId());
- return true;
- }
- return false;
- }
- */
- return true;
- }
-
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- UserVmVO vm = listener.getVm();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
-
- boolean jobStatusUpdated = false;
- try {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Execute asynchronize Reboot VM command: received answer, " + vm.getHostId() + "-" + seq);
-
- if(answer != null) {
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_SUCCEEDED, 0, VMExecutorHelper.composeResultObject(asyncMgr.getExecutorContext().getManagementServer(), vm, null));
- jobStatusUpdated = true;
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, "Agent is unable to execute the command");
-
- jobStatusUpdated = true;
- }
-
- } catch(Exception e) {
- s_logger.error("Unexpected exception " + e.getMessage(), e);
-
- if(!jobStatusUpdated) {
- if(answer != null) {
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_SUCCEEDED, 0, VMExecutorHelper.composeResultObject(asyncMgr.getExecutorContext().getManagementServer(), vm, null));
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, "Agent is unable to execute the command");
- }
- }
- } finally {
- asyncMgr.releaseSyncSource(this);
- }
- }
-
- public void processDisconnect(VMOperationListener listener, long agentId) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Execute asynchronize Reboot VM command: agent " + agentId + " disconnected");
-
- processDisconnectAndTimeout(listener, "agent is disconnected");
- }
-
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Execute asynchronize Reboot VM command: timed out, " + agentId + "-" + seq);
-
- processDisconnectAndTimeout(listener, "operation timed out");
- }
-
- private void processDisconnectAndTimeout(VMOperationListener listener, String resultMessage) {
-
- AsyncJobManager asyncMgr = getAsyncJobMgr();
-
- boolean jobStatusUpdated = false;
- try {
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, 0, resultMessage);
- jobStatusUpdated = true;
- } catch (Exception e) {
- s_logger.error("Unexpected exception " + e.getMessage(), e);
- if(!jobStatusUpdated)
- asyncMgr.completeAsyncJob(getJob().getId(),
- AsyncJobResult.STATUS_FAILED, 0, resultMessage);
- } finally {
- asyncMgr.releaseSyncSource(this);
- }
- }
-}
diff --git a/server/src/com/cloud/async/executor/ReconnectExecutor.java b/server/src/com/cloud/async/executor/ReconnectExecutor.java
deleted file mode 100644
index 0fe39d4b4b5..00000000000
--- a/server/src/com/cloud/async/executor/ReconnectExecutor.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.text.DecimalFormat;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.host.Host;
-import com.cloud.host.HostStats;
-import com.cloud.host.HostVO;
-import com.cloud.host.Status;
-import com.cloud.host.Status.Event;
-import com.cloud.offering.ServiceOffering;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.storage.GuestOSCategoryVO;
-import com.cloud.utils.fsm.StateMachine;
-import com.cloud.vm.UserVmVO;
-import com.google.gson.Gson;
-
-public class ReconnectExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(ReconnectExecutor.class.getName());
-
- @Override
- public boolean execute() {
-
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobVO job = getJob();
-
- /*
- if(getSyncSource() == null) {
- Long param = gson.fromJson(job.getCmdInfo(), Long.class);
- asyncMgr.syncAsyncJobExecution(job.getId(), "host", param.longValue());
-
- // always true if it does not have sync-source
- return true;
- } else {
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- Long param = gson.fromJson(job.getCmdInfo(), Long.class);
-
- try {
- boolean success = managementServer.reconnect(param.longValue());
- if(success)
- {
- HostVO host = managementServer.getHostBy(param);
- final StateMachine sm = new StateMachine();
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, composeResultObject(host,sm,managementServer));
- }
- else
- {
- HostVO host = managementServer.getHostBy(param);
- final StateMachine sm = new StateMachine();
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- composeResultObject(host,sm, managementServer));
- }
- } catch(Exception e) {
- s_logger.warn("Unable to reconnect host " + param + ": " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- }
- */
- return true;
- }
-
- private HostResultObject composeResultObject(HostVO hostVO, StateMachine sm, ManagementServer managementServer)
- {
- HostResultObject hostRO = new HostResultObject();
-
- hostRO.setId(hostVO.getId());
-
- hostRO.setName(hostVO.getName());
- hostRO.setState(hostVO.getStatus().toString());
-
- if(hostVO.getDisconnectedOn() != null)
- hostRO.setDisconnected(hostVO.getDisconnectedOn());
-
-
- if (hostVO.getType() != null) {
- hostRO.setType(hostVO.getType().toString());
- }
-
-// GuestOSCategoryVO guestOSCategory = managementServer.getHostGuestOSCategory(hostVO.getId());
-// if (guestOSCategory != null) {
-// hostRO.setOsCategoryId(guestOSCategory.getId());
-// hostRO.setOsCategoryName(guestOSCategory.getName());
-// }
-
-
- hostRO.setIpAddress(hostVO.getPrivateIpAddress());
- hostRO.setZoneId(hostVO.getDataCenterId());
-// hostRO.setZoneName(managementServer.getDataCenterBy(hostVO.getDataCenterId()).getName());
-
- if (hostVO.getPodId() != null && managementServer.findHostPodById(hostVO.getPodId()) != null) {
- hostRO.setPodId(hostVO.getPodId());
- hostRO.setPodName((managementServer.findHostPodById(hostVO.getPodId())).getName());
- }
-
- hostRO.setVersion(hostVO.getVersion().toString());
-
- if (hostVO.getHypervisorType() != null) {
- hostRO.setHypervisorType(hostVO.getHypervisorType().toString());
- }
-
- if ((hostVO.getCpus() != null) && (hostVO.getSpeed() != null) && !(hostVO.getType().toString().equals("Storage")))
- {
-
- hostRO.setCpuNumber(hostVO.getCpus());
- hostRO.setCpuSpeed(hostVO.getSpeed());
- // calculate cpu allocated by vm
- int cpu = 0;
- String cpuAlloc = null;
- DecimalFormat decimalFormat = new DecimalFormat("#.##");
-// List instances = managementServer.listUserVMsByHostId(hostVO.getId());
-// for (UserVmVO vm : instances) {
-// ServiceOffering so = managementServer.findServiceOfferingById(vm.getServiceOfferingId());
-// cpu += so.getCpu() * so.getSpeed();
-// }
- cpuAlloc = decimalFormat.format(((float) cpu / (float) (hostVO.getCpus() * hostVO.getSpeed())) * 100f) + "%";
- hostRO.setCpuAllocated(cpuAlloc);
-
- // calculate cpu utilized
- String cpuUsed = null;
-// HostStats hostStats = managementServer.getHostStatistics(hostVO.getId());
-// if (hostStats != null) {
-// float cpuUtil = (float) hostStats.getCpuUtilization();
-// cpuUsed = decimalFormat.format(cpuUtil) + "%";
-// hostRO.setCpuUsed(cpuUsed);
-//
-// long avgLoad = (long)hostStats.getAverageLoad();
-// hostRO.setAverageLoad(avgLoad);
-//
-// long networkKbsRead = (long)hostStats.getNetworkReadKBs();
-// hostRO.setNetworkKbsRead(networkKbsRead);
-//
-// long networkKbsWrite = (long)hostStats.getNetworkWriteKBs();
-// hostRO.setNetworkKbsWrite(networkKbsWrite);
-// }
- }
-
- if ( hostVO.getType() == Host.Type.Routing ) {
- Long memory = hostVO.getTotalMemory();
- hostRO.setTotalMemory(memory);
- // calculate memory allocated by systemVM and userVm
- long mem = managementServer.getMemoryUsagebyHost(hostVO.getId());
- hostRO.setMemoryAllocated(mem);
- // calculate memory utilized, we don't provide memory over commit
- hostRO.setMemoryUsed(mem);
-
- }
- if (hostVO.getType().toString().equals("Storage")) {
- hostRO.setDiskSizeTotal(hostVO.getTotalSize());
- hostRO.setDiskSizeAllocated(0);
- }
- hostRO.setCaps(hostVO.getCapabilities());
- hostRO.setLastPinged(hostVO.getLastPinged());
- if (hostVO.getManagementServerId() != null) {
- hostRO.setManagementServerId(hostVO.getManagementServerId());
- }
-
- if (hostVO.getCreated() != null) {
- hostRO.setCreated(hostVO.getCreated());
- }
- if (hostVO.getRemoved() != null) {
- hostRO.setRemoved(hostVO.getRemoved());
- }
-
- Set possibleEvents = hostVO.getStatus().getPossibleEvents();
- hostRO.setEvents(possibleEvents);
-
- return hostRO;
-
- }
-}
diff --git a/server/src/com/cloud/async/executor/RecurringSnapshotParam.java b/server/src/com/cloud/async/executor/RecurringSnapshotParam.java
deleted file mode 100644
index 834e07872ec..00000000000
--- a/server/src/com/cloud/async/executor/RecurringSnapshotParam.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class RecurringSnapshotParam extends VMOperationParam {
- private int hourlyMax;
- private int dailyMax;
- private int weeklyMax;
- private int monthlyMax;
-
- public RecurringSnapshotParam() {
- }
-
- public RecurringSnapshotParam(long userId, long vmId, int hourlyMax, int dailyMax, int weeklyMax, int monthlyMax) {
- setUserId(userId);
- setVmId(vmId);
- this.hourlyMax = hourlyMax;
- this.dailyMax = dailyMax;
- this.weeklyMax = weeklyMax;
- this.monthlyMax = monthlyMax;
- }
-
- public int getHourlyMax() {
- return hourlyMax;
- }
-
- public void setHourlyMax(int hourlyMax) {
- this.hourlyMax = hourlyMax;
- }
-
- public int getDailyMax() {
- return dailyMax;
- }
-
- public void setDailyMax(int dailyMax) {
- this.dailyMax = dailyMax;
- }
-
- public int getWeeklyMax() {
- return weeklyMax;
- }
-
- public void setWeeklyMax(int weeklyMax) {
- this.weeklyMax = weeklyMax;
- }
-
- public int getMonthlyMax() {
- return monthlyMax;
- }
-
- public void setMonthlyMax(int monthlyMax) {
- this.monthlyMax = monthlyMax;
- }
-}
diff --git a/server/src/com/cloud/async/executor/RemoveFromLoadBalancerExecutor.java b/server/src/com/cloud/async/executor/RemoveFromLoadBalancerExecutor.java
deleted file mode 100644
index 45e876f2ebc..00000000000
--- a/server/src/com/cloud/async/executor/RemoveFromLoadBalancerExecutor.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.google.gson.Gson;
-
-public class RemoveFromLoadBalancerExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(RemoveFromLoadBalancerExecutor.class.getName());
-
- @Override
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- LoadBalancerParam param = gson.fromJson(job.getCmdInfo(), LoadBalancerParam.class);
-
- /*
- if (getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job.getId(), "Router", param.getDomainRouterId());
-
- // always true if it does not have sync-source
- return true;
- } else {
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- try {
- boolean result = managementServer.removeFromLoadBalancer(param.getUserId().longValue(), param.getLoadBalancerId().longValue(), param.getInstanceIdList());
- if (result) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, Boolean.valueOf(result).toString());
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, Boolean.valueOf(result).toString());
- }
- } catch(InvalidParameterValueException ex) {
- if (s_logger.isInfoEnabled()) {
- s_logger.info("Unable to remove from load balancer : " + ex.getMessage());
- }
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.PARAM_ERROR, ex.getMessage());
- } catch(Exception e) {
- s_logger.warn("Unable to remove from load balancer : " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- }
- return true;
- }
- */
- return true;
- }
-}
diff --git a/server/src/com/cloud/async/executor/RemoveSecurityGroupParam.java b/server/src/com/cloud/async/executor/RemoveSecurityGroupParam.java
deleted file mode 100644
index 36c20956e09..00000000000
--- a/server/src/com/cloud/async/executor/RemoveSecurityGroupParam.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class RemoveSecurityGroupParam {
- private Long userId;
- private Long securityGroupId;
- private String publicIp;
- private Long vmId;
-
- public RemoveSecurityGroupParam() {
- }
-
- public RemoveSecurityGroupParam(Long userId, Long securityGroupId, String publicIp, Long vmId) {
- this.userId = userId;
- this.securityGroupId = securityGroupId;
- this.publicIp = publicIp;
- this.vmId = vmId;
- }
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public Long getSecurityGroupId() {
- return securityGroupId;
- }
-
- public void setSecurityGroupId(Long securityGroupId) {
- this.securityGroupId = securityGroupId;
- }
-
- public String getPublicIp() {
- return publicIp;
- }
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public Long getVmId() {
- return vmId;
- }
-
- public void setVmId(Long vmId) {
- this.vmId = vmId;
- }
-}
diff --git a/server/src/com/cloud/async/executor/ResetVMPasswordExecutor.java b/server/src/com/cloud/async/executor/ResetVMPasswordExecutor.java
deleted file mode 100644
index 3e4a10fa7a5..00000000000
--- a/server/src/com/cloud/async/executor/ResetVMPasswordExecutor.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.vm.UserVmVO;
-import com.google.gson.Gson;
-
-public class ResetVMPasswordExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(ResetVMPasswordExecutor.class.getName());
-
- public boolean execute() {
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobVO job = getJob();
-
- /*
- if(getSyncSource() == null) {
- VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
- asyncMgr.syncAsyncJobExecution(job.getId(), "UserVM", param.getVmId());
-
- // always true if it does not have sync-source
- return true;
- } else {
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- ResetVMPasswordParam param = gson.fromJson(job.getCmdInfo(), ResetVMPasswordParam.class);
-
- asyncMgr.updateAsyncJobAttachment(job.getId(), "vm_instance", param.getVmId());
- try {
- boolean success = managementServer.resetVMPassword(param.getUserId(), param.getVmId(), param.getPassword());
- if(success) {
- UserVmVO userVm = managementServer.findUserVMInstanceById(param.getVmId());
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- VMExecutorHelper.composeResultObject(managementServer, userVm, param.getPassword()));
- }
- else
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "Operation failed");
- } catch(Exception e) {
- s_logger.warn("Unable to reset password for VM " + param.getVmId() + ": " + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- }
- */
- return true;
- }
-}
diff --git a/server/src/com/cloud/async/executor/ResetVMPasswordParam.java b/server/src/com/cloud/async/executor/ResetVMPasswordParam.java
deleted file mode 100644
index 1d2b5f7632f..00000000000
--- a/server/src/com/cloud/async/executor/ResetVMPasswordParam.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class ResetVMPasswordParam {
- private long userId;
- private long vmId;
- private String password;
-
- public ResetVMPasswordParam() {
- }
-
- public ResetVMPasswordParam(long userId, long vmId, String password) {
- this.userId = userId;
- this.vmId = vmId;
- this.password = password;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public void setUserId(long userId) {
- this.userId = userId;
- }
-
- public long getVmId() {
- return vmId;
- }
-
- public void setVmId(long vmId) {
- this.vmId = vmId;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-}
diff --git a/server/src/com/cloud/async/executor/RevokeNetworkGroupIngressExecutor.java b/server/src/com/cloud/async/executor/RevokeNetworkGroupIngressExecutor.java
deleted file mode 100644
index 59743002412..00000000000
--- a/server/src/com/cloud/async/executor/RevokeNetworkGroupIngressExecutor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.network.security.SecurityGroupVO;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.user.AccountVO;
-import com.google.gson.Gson;
-
-public class RevokeNetworkGroupIngressExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(RevokeNetworkGroupIngressExecutor.class.getName());
-
- @Override
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- SecurityGroupIngressParam param = gson.fromJson(job.getCmdInfo(), SecurityGroupIngressParam.class);
- AccountVO account = param.getAccount();
-
- /*
- if (getSyncSource() == null) {
- SecurityGroupVO networkGroup = managementServer.findNetworkGroupByName(param.getAccount().getId(), param.getGroupName());
- if(networkGroup == null) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED,
- BaseCmd.PARAM_ERROR, "Unable to find network group " + param.getGroupName() + " for account " + account.getAccountName() + " (id: " + account.getId() + ")");
- } else {
- asyncMgr.syncAsyncJobExecution(job.getId(), "SecurityGroup", networkGroup.getId());
- }
- return true;
- } else {
- try {
- boolean success = managementServer.revokeNetworkGroupIngress(account, param.getGroupName(), param.getProtocol(), param.getStartPort(), param.getEndPort(), param.getCidrList(), param.getAuthorizedGroups());
- if (success) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, "success");
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "Failed to revoke network group ingress from group: " + param.getGroupName() + " for account: " + account.getAccountName() + " (id: " + account.getId() + ")");
- }
- } catch(Exception e) {
- s_logger.warn("Failed to revoke network group ingress from group: " + param.getGroupName() + " for account: " + account.getAccountName() + " (id: " + account.getId() + ")", e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "Failed to revoke network group ingress from group: " + param.getGroupName() + " for account: " + account.getAccountName() + " (id: " + account.getId() + ")");
- }
- }
- */
-
- return true;
- }
-}
diff --git a/server/src/com/cloud/async/executor/RouterExecutorHelper.java b/server/src/com/cloud/async/executor/RouterExecutorHelper.java
deleted file mode 100644
index c28cd88f65c..00000000000
--- a/server/src/com/cloud/async/executor/RouterExecutorHelper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import com.cloud.network.router.VirtualRouter;
-import com.cloud.server.ManagementServer;
-import com.cloud.user.Account;
-
-public class RouterExecutorHelper {
- public static RouterOperationResultObject composeResultObject(ManagementServer managementServer, VirtualRouter router) {
- RouterOperationResultObject resultObject = new RouterOperationResultObject();
- resultObject.setId(router.getId());
- resultObject.setZoneId(router.getDataCenterId());
- resultObject.setZoneName(managementServer.findDataCenterById(router.getDataCenterId()).getName());
- resultObject.setDns1(router.getDns1());
- resultObject.setDns2(router.getDns2());
- resultObject.setNetworkDomain(router.getDomain());
- resultObject.setGateway(router.getGateway());
- resultObject.setName(router.getName());
- resultObject.setPodId(router.getPodId());
- resultObject.setPrivateIp(router.getPrivateIpAddress());
- resultObject.setPrivateMacAddress(router.getPrivateMacAddress());
- resultObject.setPrivateNetMask(router.getPrivateNetmask());
- resultObject.setPublicIp(router.getPublicIpAddress());
- resultObject.setPublicMacAddress(router.getPublicMacAddress());
- resultObject.setPublicNetMask(router.getPrivateNetmask());
- resultObject.setGuestIp(router.getGuestIpAddress());
- resultObject.setGuestMacAddress(router.getGuestMacAddress());
- resultObject.setTemplateId(router.getTemplateId());
- resultObject.setCreated(router.getCreated());
- resultObject.setGuestNetmask(router.getGuestNetmask());
-
- if (router.getHostId() != null) {
- resultObject.setHostname(managementServer.getHostBy(router.getHostId()).getName());
- resultObject.setHostId(router.getHostId());
- }
-
- Account acct = managementServer.findAccountById(Long.valueOf(router.getAccountId()));
- if (acct != null) {
- resultObject.setAccount(acct.getAccountName());
- resultObject.setDomainId(acct.getDomainId());
-// resultObject.setDomain(managementServer.findDomainIdById(acct.getDomainId()).getName());
- }
-
- if (router.getState() != null)
- resultObject.setState(router.getState().toString());
- return resultObject;
- }
-}
diff --git a/server/src/com/cloud/async/executor/RouterOperationResultObject.java b/server/src/com/cloud/async/executor/RouterOperationResultObject.java
deleted file mode 100644
index 74a0fb7a067..00000000000
--- a/server/src/com/cloud/async/executor/RouterOperationResultObject.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-
-public class RouterOperationResultObject {
- @Param(name="id")
- private long id;
-
- @Param(name="zoneid")
- private long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="dns1")
- private String dns1;
-
- @Param(name="dns2")
- private String dns2;
-
- @Param(name="networkdomain")
- private String networkDomain;
-
- @Param(name="gateway")
- private String gateway;
-
- @Param(name="name")
- private String name;
-
- @Param(name="podid")
- private long podId;
-
- @Param(name="privateip")
- private String privateIp;
-
- @Param(name="privatemacaddress")
- private String privateMacAddress;
-
- @Param(name="privatenetmask")
- private String privateNetMask;
-
- @Param(name="publicip")
- private String publicIp;
-
- @Param(name="publicmacaddress")
- private String publicMacAddress;
-
- @Param(name="publicnetmask")
- private String publicNetMask;
-
- @Param(name="guestipaddress")
- private String guestIp;
-
- @Param(name="macaddress")
- private String guestMacAddress;
-
- @Param(name="templateid")
- private long templateId;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="account")
- private String account;
-
- @Param(name="domainid")
- private long domainId;
-
- @Param(name="domain")
- private String domain;
-
- @Param(name="hostid")
- private Long hostId;
-
- @Param(name="state")
- private String state;
-
- @Param(name="hostname")
- private String hostname;
-
- @Param(name="guestnetmask")
- private String guestNetmask;
-
- public String getGuestNetmask(){
- return this.guestNetmask;
- }
-
- public void setGuestNetmask(String guestNetmask){
- this.guestNetmask = guestNetmask;
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public String getDns1() {
- return dns1;
- }
-
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public String getDns2() {
- return dns2;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
- public String getNetworkDomain() {
- return networkDomain;
- }
-
- public void setNetworkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- }
-
- public String getGateway() {
- return gateway;
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public long getPodId() {
- return podId;
- }
-
- public void setPodId(long podId) {
- this.podId = podId;
- }
-
- public String getPrivateIp() {
- return privateIp;
- }
-
- public void setPrivateIp(String privateIp) {
- this.privateIp = privateIp;
- }
-
- public String getPrivateMacAddress() {
- return privateMacAddress;
- }
-
- public void setPrivateMacAddress(String privateMacAddress) {
- this.privateMacAddress = privateMacAddress;
- }
-
- public String getPrivateNetMask() {
- return privateNetMask;
- }
-
- public void setPrivateNetMask(String privateNetMask) {
- this.privateNetMask = privateNetMask;
- }
-
- public String getPublicIp() {
- return publicIp;
- }
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public String getPublicMacAddress() {
- return publicMacAddress;
- }
-
- public void setPublicMacAddress(String publicMacAddress) {
- this.publicMacAddress = publicMacAddress;
- }
-
- public String getPublicNetMask() {
- return publicNetMask;
- }
-
- public void setPublicNetMask(String publicNetMask) {
- this.publicNetMask = publicNetMask;
- }
-
- public String getGuestIp() {
- return guestIp;
- }
-
- public void setGuestIp(String guestIp) {
- this.guestIp = guestIp;
- }
-
- public String getGuestMacAddress() {
- return guestMacAddress;
- }
-
- public void setGuestMacAddress(String guestMacAddress) {
- this.guestMacAddress = guestMacAddress;
- }
-
- public long getTemplateId() {
- return templateId;
- }
-
- public void setTemplateId(long templateId) {
- this.templateId = templateId;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public Long getHostId() {
- return hostId;
- }
-
- public void setHostId(Long hostId) {
- this.hostId = hostId;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public long getDomainId() {
- return domainId;
- }
-
- public void setDomainId(long domainId) {
- this.domainId = domainId;
- }
-
- public String getHostname() {
- return hostname;
- }
-
- public void setHostname(String hostname) {
- this.hostname = hostname;
- }
-}
diff --git a/server/src/com/cloud/async/executor/SecurityGroupIngressParam.java b/server/src/com/cloud/async/executor/SecurityGroupIngressParam.java
deleted file mode 100644
index 477ea3c9576..00000000000
--- a/server/src/com/cloud/async/executor/SecurityGroupIngressParam.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.cloud.async.executor;
-
-import java.util.List;
-
-import com.cloud.network.security.SecurityGroupVO;
-import com.cloud.user.AccountVO;
-
-public class SecurityGroupIngressParam {
- private AccountVO account;
- private String groupName;
- private String protocol;
- private int startPort;
- private int endPort;
- private String[] cidrList;
- private List authorizedGroups;
-
- protected SecurityGroupIngressParam() { }
-
- public SecurityGroupIngressParam(AccountVO account, String groupName, String protocol, int startPort, int endPort, String[] cidrList, List authorizedGroups) {
- this.account = account;
- this.groupName = groupName;
- this.protocol = protocol;
- this.startPort = startPort;
- this.endPort = endPort;
- this.cidrList = cidrList;
- this.authorizedGroups = authorizedGroups;
- }
-
- public AccountVO getAccount() {
- return account;
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public String getProtocol() {
- return protocol;
- }
-
- public int getStartPort() {
- return startPort;
- }
-
- public int getEndPort() {
- return endPort;
- }
-
- public String[] getCidrList() {
- return cidrList;
- }
-
- public List getAuthorizedGroups() {
- return authorizedGroups;
- }
-}
diff --git a/server/src/com/cloud/async/executor/SnapshotOperationParam.java b/server/src/com/cloud/async/executor/SnapshotOperationParam.java
deleted file mode 100644
index 6cffb2d2825..00000000000
--- a/server/src/com/cloud/async/executor/SnapshotOperationParam.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.List;
-
-public class SnapshotOperationParam {
- public enum SnapshotOp {Create, Delete, CreateVolume};
- private long accountId;
- private long userId;
- private long snapshotId = 0;
- private long policyId = 0;
- private long volumeId;
- private String name = null;
- private long eventId;
-
- public SnapshotOperationParam() {
- }
-
- // Used for delete snapshot
- public SnapshotOperationParam(long userId, long accountId, long volumeId, long snapshotId, long policyId) {
- setUserId(userId);
- setAccountId(accountId);
- setVolumeId(volumeId);
- this.snapshotId = snapshotId;
- this.policyId = policyId;
- }
-
- // Used to create a snapshot
- public SnapshotOperationParam(long userId, long accountId, long volumeId, long policyId) {
- setUserId(userId);
- setAccountId(accountId);
- setVolumeId(volumeId);
- this.policyId = policyId;
- }
-
- // Used for CreateVolumeFromSnapshot
- public SnapshotOperationParam(long userId, long accountId, long volumeId, long snapshotId, String volumeName) {
- setUserId(userId);
- setAccountId(accountId);
- setVolumeId(volumeId);
- this.snapshotId = snapshotId;
- setName(volumeName);
- }
-
- public long getUserId() {
- return userId;
- }
-
- public long getAccountId() {
- return accountId;
- }
-
- public long getVolumeId() {
- return volumeId;
- }
-
- public String getName() {
- return name;
- }
-
- public long getSnapshotId() {
- return snapshotId;
- }
-
- public void setSnapshotId(long snapshotId) {
- this.snapshotId = snapshotId;
- }
-
- public long getPolicyId() {
- return policyId;
- }
-
- private void setUserId(long userId) {
- this.userId = userId;
- }
-
- private void setAccountId(long accountId) {
- this.accountId = accountId;
- }
-
- private void setVolumeId(long volumeId) {
- this.volumeId = volumeId;
- }
-
- private void setName(String name) {
- this.name = name;
- }
-
- public void setEventId(long eventId) {
- this.eventId = eventId;
- }
-
- public long getEventId() {
- return eventId;
- }
-}
diff --git a/server/src/com/cloud/async/executor/StartConsoleProxyExecutor.java b/server/src/com/cloud/async/executor/StartConsoleProxyExecutor.java
deleted file mode 100644
index 740f34ee6e6..00000000000
--- a/server/src/com/cloud/async/executor/StartConsoleProxyExecutor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.vm.ConsoleProxyVO;
-import com.google.gson.Gson;
-
-public class StartConsoleProxyExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(StartConsoleProxyExecutor.class.getName());
-
- @Override
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
- if(getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job, "ConsoleProxy", param.getVmId());
- return true;
- } else {
- try {
- ConsoleProxyVO proxy = managementServer.startConsoleProxy(param.getVmId());
- if(proxy != null)
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- ConsoleProxyExecutorHelper.composeResultObject(managementServer, proxy));
- else
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "operation failed");
- } catch(Exception e) {
- s_logger.warn("Unable to start console proxy " + param.getVmId() + ":" + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- return true;
- }
- }
-
- @Override
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- @Override
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- @Override
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-}
diff --git a/server/src/com/cloud/async/executor/StartConsoleProxyResult.java b/server/src/com/cloud/async/executor/StartConsoleProxyResult.java
deleted file mode 100644
index 56e30992f4e..00000000000
--- a/server/src/com/cloud/async/executor/StartConsoleProxyResult.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-
-public class StartConsoleProxyResult {
-
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="zoneid")
- private long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="dns1")
- private String dns1;
-
- @Param(name="dns2")
- private String dns2;
-
- @Param(name="networkdomain")
- private String networkDomain;
-
- @Param(name="gateway")
- private String gateway;
-
- @Param(name="podid")
- private long podId;
-
- @Param(name="hostid")
- private Long hostId;
-
- @Param(name="hostname")
- private String hostName;
-
- @Param(name="privateip")
- private String privateIp;
-
- @Param(name="privatemacaddress")
- private String privateMac;
-
- @Param(name="privatenetmask")
- private String privateNetmask;
-
- @Param(name="publicip")
- private String publicIp;
-
- @Param(name="publicmacaddress")
- private String publicMac;
-
- @Param(name="publicnetmask")
- private String publicNetmask;
-
- @Param(name="templateid")
- private long templateId;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="activeviewersessions")
- private int actionSessions;
-
- @Param(name="state")
- private String state;
-
- public StartConsoleProxyResult() {
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public String getDns1() {
- return dns1;
- }
-
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public String getDns2() {
- return dns2;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
- public String getNetworkDomain() {
- return networkDomain;
- }
-
- public void setNetworkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- }
-
- public String getGateway() {
- return gateway;
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public long getPodId() {
- return podId;
- }
-
- public void setPodId(long podId) {
- this.podId = podId;
- }
-
- public Long getHostId() {
- return hostId;
- }
-
- public void setHostId(Long hostId) {
- this.hostId = hostId;
- }
-
- public String getHostName() {
- return hostName;
- }
-
- public void setHostName(String hostName) {
- this.hostName = hostName;
- }
-
- public String getPrivateIp() {
- return privateIp;
- }
-
- public void setPrivateIp(String privateIp) {
- this.privateIp = privateIp;
- }
-
- public String getPrivateMac() {
- return privateMac;
- }
-
- public void setPrivateMac(String privateMac) {
- this.privateMac = privateMac;
- }
-
- public String getPrivateNetmask() {
- return privateNetmask;
- }
-
- public void setPrivateNetmask(String privateNetmask) {
- this.privateNetmask = privateNetmask;
- }
-
- public String getPublicIp() {
- return publicIp;
- }
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public String getPublicMac() {
- return publicMac;
- }
-
- public void setPublicMac(String publicMac) {
- this.publicMac = publicMac;
- }
-
- public String getPublicNetmask() {
- return publicNetmask;
- }
-
- public void setPublicNetmask(String publicNetmask) {
- this.publicNetmask = publicNetmask;
- }
-
- public long getTemplateId() {
- return templateId;
- }
-
- public void setTemplateId(long templateId) {
- this.templateId = templateId;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public int getActionSessions() {
- return actionSessions;
- }
-
- public void setActionSessions(int actionSessions) {
- this.actionSessions = actionSessions;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-}
diff --git a/server/src/com/cloud/async/executor/StartRouterExecutor.java b/server/src/com/cloud/async/executor/StartRouterExecutor.java
deleted file mode 100644
index e9191d0a08c..00000000000
--- a/server/src/com/cloud/async/executor/StartRouterExecutor.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.event.EventTypes;
-import com.cloud.event.EventVO;
-import com.cloud.exception.InternalErrorException;
-import com.cloud.network.router.VirtualRouter;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.user.Account;
-import com.cloud.user.User;
-import com.google.gson.Gson;
-
-public class StartRouterExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(StartRouterExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
-
- /*
- if(getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job, "Router", param.getVmId());
- return true;
- } else {
- boolean success = false;
- try {
- DomainRouter router = managementServer.startRouter(param.getVmId(), param.getEventId());
- if(router != null){
- success = true;
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- RouterExecutorHelper.composeResultObject(managementServer, router));
- }
- else
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "operation failed");
- } catch (InternalErrorException e) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- } catch(Exception e) {
- s_logger.warn("Unable to start router " + param.getVmId() + ":" + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- } finally {
- if(!success){
- // Save completed event when operation fails
-// asyncMgr.getExecutorContext().getManagementServer().saveEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventVO.LEVEL_ERROR, EventTypes.EVENT_ROUTER_START, "Failed to start router", null, param.getEventId());
- }
- }
- return true;
- }
- */
- return true;
- }
-
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-}
diff --git a/server/src/com/cloud/async/executor/StartRouterResultObject.java b/server/src/com/cloud/async/executor/StartRouterResultObject.java
deleted file mode 100644
index 18ca14491a7..00000000000
--- a/server/src/com/cloud/async/executor/StartRouterResultObject.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-
-public class StartRouterResultObject {
- @Param(name="id")
- private long id;
-
- @Param(name="zoneid")
- private long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="dns1")
- private String dns1;
-
- @Param(name="dns2")
- private String dns2;
-
- @Param(name="networkdomain")
- private String networkDomain;
-
- @Param(name="gateway")
- private String gateway;
-
- @Param(name="name")
- private String name;
-
- @Param(name="podid")
- private long podId;
-
- @Param(name="privateip")
- private String privateIp;
-
- @Param(name="privatemacaddress")
- private String privateMacAddress;
-
- @Param(name="privatenetmask")
- private String privateNetMask;
-
- @Param(name="publicip")
- private String publicIp;
-
- @Param(name="publicmacaddress")
- private String publicMacAddress;
-
- @Param(name="publicnetmask")
- private String publicNetMask;
-
- @Param(name="ipaddress")
- private String guestIp;
-
- @Param(name="macaddress")
- private String guestMacAddress;
-
- @Param(name="templateid")
- private long templateId;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="account")
- private String account;
-
- @Param(name="domainid")
- private long domainId;
-
- @Param(name="domain")
- private String domain;
-
- @Param(name="hostid")
- private Long hostId;
-
- @Param(name="state")
- private String state;
-
- @Param(name="hostname")
- private String hostname;
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public String getDns1() {
- return dns1;
- }
-
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public String getDns2() {
- return dns2;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
- public String getNetworkDomain() {
- return networkDomain;
- }
-
- public void setNetworkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- }
-
- public String getGateway() {
- return gateway;
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public long getPodId() {
- return podId;
- }
-
- public void setPodId(long podId) {
- this.podId = podId;
- }
-
- public String getPrivateIp() {
- return privateIp;
- }
-
- public void setPrivateIp(String privateIp) {
- this.privateIp = privateIp;
- }
-
- public String getPrivateMacAddress() {
- return privateMacAddress;
- }
-
- public void setPrivateMacAddress(String privateMacAddress) {
- this.privateMacAddress = privateMacAddress;
- }
-
- public String getPrivateNetMask() {
- return privateNetMask;
- }
-
- public void setPrivateNetMask(String privateNetMask) {
- this.privateNetMask = privateNetMask;
- }
-
- public String getPublicIp() {
- return publicIp;
- }
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public String getPublicMacAddress() {
- return publicMacAddress;
- }
-
- public void setPublicMacAddress(String publicMacAddress) {
- this.publicMacAddress = publicMacAddress;
- }
-
- public String getPublicNetMask() {
- return publicNetMask;
- }
-
- public void setPublicNetMask(String publicNetMask) {
- this.publicNetMask = publicNetMask;
- }
-
- public String getGuestIp() {
- return guestIp;
- }
-
- public void setGuestIp(String guestIp) {
- this.guestIp = guestIp;
- }
-
- public String getGuestMacAddress() {
- return guestMacAddress;
- }
-
- public void setGuestMacAddress(String guestMacAddress) {
- this.guestMacAddress = guestMacAddress;
- }
-
- public long getTemplateId() {
- return templateId;
- }
-
- public void setTemplateId(long templateId) {
- this.templateId = templateId;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public Long getHostId() {
- return hostId;
- }
-
- public void setHostId(Long hostId) {
- this.hostId = hostId;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public long getDomainId() {
- return domainId;
- }
-
- public void setDomainId(long domainId) {
- this.domainId = domainId;
- }
-
- public String getHostname() {
- return hostname;
- }
-
- public void setHostname(String hostname) {
- this.hostname = hostname;
- }
-}
diff --git a/server/src/com/cloud/async/executor/StopConsoleProxyExecutor.java b/server/src/com/cloud/async/executor/StopConsoleProxyExecutor.java
deleted file mode 100644
index e0a37614b54..00000000000
--- a/server/src/com/cloud/async/executor/StopConsoleProxyExecutor.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.vm.ConsoleProxyVO;
-import com.google.gson.Gson;
-
-public class StopConsoleProxyExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(StopConsoleProxyExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
- /*
- if(getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job, "ConsoleProxy", param.getVmId());
- return true;
- } else {
- try {
- boolean result = managementServer.stopConsoleProxy(param.getVmId(), param.getEventId());
- if(result)
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- composeResultObject(managementServer, param.getVmId()));
- else
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "Operation failed");
- } catch(Exception e) {
- s_logger.warn("Unable to stop console proxy " + param.getVmId() + ":" + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- return true;
- }
- */
- return true;
- }
-
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-
- private ConsoleProxyOperationResultObject composeResultObject(ManagementServer managementServer, long proxyVmId) {
- ConsoleProxyVO proxy = managementServer.findConsoleProxyById(proxyVmId);
- return ConsoleProxyExecutorHelper.composeResultObject(managementServer, proxy);
- }
-}
diff --git a/server/src/com/cloud/async/executor/StopRouterExecutor.java b/server/src/com/cloud/async/executor/StopRouterExecutor.java
deleted file mode 100644
index ef3ff649235..00000000000
--- a/server/src/com/cloud/async/executor/StopRouterExecutor.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.network.router.VirtualRouter;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
-
-public class StopRouterExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(StopRouterExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
-
- /*
- if(getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job, "Router", param.getVmId());
- return true;
- } else {
- try {
- if(managementServer.stopRouter(param.getVmId(), param.getEventId())) {
- DomainRouter router = managementServer.findDomainRouterById(param.getVmId());
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- RouterExecutorHelper.composeResultObject(managementServer, router));
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "failed");
- }
- } catch(Exception e) {
- s_logger.warn("Unable to stop router " + param.getVmId() + ":" + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- return true;
- }
- */
- return true;
- }
-
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-}
diff --git a/server/src/com/cloud/async/executor/SystemVmCmdExecutor.java b/server/src/com/cloud/async/executor/SystemVmCmdExecutor.java
deleted file mode 100644
index 31726ef450b..00000000000
--- a/server/src/com/cloud/async/executor/SystemVmCmdExecutor.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.executor.VMOperationParam.VmOp;
-import com.cloud.exception.InternalErrorException;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.cloud.vm.SecondaryStorageVmVO;
-import com.cloud.vm.VMInstanceVO;
-import com.google.gson.Gson;
-
-public class SystemVmCmdExecutor extends VMOperationExecutor {
- public static final Logger s_logger = Logger.getLogger(SystemVmCmdExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
- VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
- VmOp oper = param.getOperation();
- VMInstanceVO vm;
- /*
- if(getSyncSource() == null) {
- asyncMgr.syncAsyncJobExecution(job.getId(), "SystemVm", param.getVmId());
- return true;
- } else {
- try {
- switch (oper){
- case Destroy:
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.UNSUPPORTED_ACTION_ERROR,
- "operation not allowed");
- break;
- case Noop:
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, "noop operation");
- break;
- case Start:
- vm = managementServer.startSystemVM(param.getVmId(), param.getEventId());
- if(vm != null)
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
- composeResultObject(managementServer, vm));
- else
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "operation failed");
- break;
- case Stop:
- boolean result = managementServer.stopSystemVM(param.getVmId(), param.getEventId());
- if(result) {
- vm = managementServer.findSystemVMById(param.getVmId());
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, composeResultObject(managementServer, vm));
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "operation failed");
- }
- break;
- case Reboot:
- result = managementServer.rebootSystemVM(param.getVmId(), param.getEventId());
- if(result) {
- vm = managementServer.findSystemVMById(param.getVmId());
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, composeResultObject(managementServer, vm));
- } else {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- "operation failed");
- }
- break;
- default:
- assert false :"Unknown vm operation";
- }
-
- } catch (InternalErrorException e) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- } catch(Exception e) {
- s_logger.warn("Unable to start console vm " + param.getVmId() + ":" + e.getMessage(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
- e.getMessage());
- }
- return true;
- }
- */
- return true;
- }
-
- private Object composeResultObject(ManagementServer managementServer, VMInstanceVO vm) {
- SystemVmOperationResultObject result = new SystemVmOperationResultObject();
- if (vm instanceof SecondaryStorageVmVO) {
- SecondaryStorageVmVO ssVm = (SecondaryStorageVmVO)vm;
- result.setId(ssVm.getId());
- result.setName(vm.getName());
- result.setZoneId(ssVm.getDataCenterId());
- result.setZoneName(managementServer.findDataCenterById(ssVm.getDataCenterId()).getName());
- result.setDns1(ssVm.getDns1());
- result.setDns2(ssVm.getDns2());
- result.setNetworkDomain(ssVm.getDomain());
- result.setGateway(ssVm.getGateway());
- result.setPodId(ssVm.getPodId());
- result.setHostId(ssVm.getHostId());
- if(ssVm.getHostId() != null)
- result.setHostName(managementServer.getHostBy(ssVm.getHostId()).getName());
-
- result.setPrivateIp(ssVm.getPrivateIpAddress());
- result.setPrivateMac(ssVm.getPrivateMacAddress());
- result.setPrivateNetmask(ssVm.getPrivateNetmask());
- result.setPublicIp(ssVm.getPublicIpAddress());
- result.setPublicMac(ssVm.getPublicMacAddress());
- result.setPublicNetmask(ssVm.getPublicNetmask());
- result.setTemplateId(ssVm.getTemplateId());
- result.setCreated(ssVm.getCreated());
- result.setState(ssVm.getState().toString());
- //result.setNfsShare(ssVm.getNfsShare());
- }
- return result;
- }
-
- public void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- public void processDisconnect(VMOperationListener listener, long agentId) {
- }
-
- public void processTimeout(VMOperationListener listener, long agentId, long seq) {
- }
-}
diff --git a/server/src/com/cloud/async/executor/SystemVmOperationResultObject.java b/server/src/com/cloud/async/executor/SystemVmOperationResultObject.java
deleted file mode 100644
index 9b5e591ae32..00000000000
--- a/server/src/com/cloud/async/executor/SystemVmOperationResultObject.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-
-public class SystemVmOperationResultObject {
-
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="zoneid")
- private long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="dns1")
- private String dns1;
-
- @Param(name="dns2")
- private String dns2;
-
- @Param(name="networkdomain")
- private String networkDomain;
-
- @Param(name="gateway")
- private String gateway;
-
- @Param(name="podid")
- private long podId;
-
- @Param(name="hostid")
- private Long hostId;
-
- @Param(name="hostname")
- private String hostName;
-
- @Param(name="privateip")
- private String privateIp;
-
- @Param(name="privatemacaddress")
- private String privateMac;
-
- @Param(name="privatenetmask")
- private String privateNetmask;
-
- @Param(name="publicip")
- private String publicIp;
-
- @Param(name="publicmacaddress")
- private String publicMac;
-
- @Param(name="publicnetmask")
- private String publicNetmask;
-
- @Param(name="templateid")
- private long templateId;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="activeviewersessions")
- private int actionSessions;
-
- @Param(name="state")
- private String state;
-
- public SystemVmOperationResultObject() {
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public String getDns1() {
- return dns1;
- }
-
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public String getDns2() {
- return dns2;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
- public String getNetworkDomain() {
- return networkDomain;
- }
-
- public void setNetworkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- }
-
- public String getGateway() {
- return gateway;
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public long getPodId() {
- return podId;
- }
-
- public void setPodId(long podId) {
- this.podId = podId;
- }
-
- public Long getHostId() {
- return hostId;
- }
-
- public void setHostId(Long hostId) {
- this.hostId = hostId;
- }
-
- public String getHostName() {
- return hostName;
- }
-
- public void setHostName(String hostName) {
- this.hostName = hostName;
- }
-
- public String getPrivateIp() {
- return privateIp;
- }
-
- public void setPrivateIp(String privateIp) {
- this.privateIp = privateIp;
- }
-
- public String getPrivateMac() {
- return privateMac;
- }
-
- public void setPrivateMac(String privateMac) {
- this.privateMac = privateMac;
- }
-
- public String getPrivateNetmask() {
- return privateNetmask;
- }
-
- public void setPrivateNetmask(String privateNetmask) {
- this.privateNetmask = privateNetmask;
- }
-
- public String getPublicIp() {
- return publicIp;
- }
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public String getPublicMac() {
- return publicMac;
- }
-
- public void setPublicMac(String publicMac) {
- this.publicMac = publicMac;
- }
-
- public String getPublicNetmask() {
- return publicNetmask;
- }
-
- public void setPublicNetmask(String publicNetmask) {
- this.publicNetmask = publicNetmask;
- }
-
- public long getTemplateId() {
- return templateId;
- }
-
- public void setTemplateId(long templateId) {
- this.templateId = templateId;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public int getActionSessions() {
- return actionSessions;
- }
-
- public void setActionSessions(int actionSessions) {
- this.actionSessions = actionSessions;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-}
diff --git a/server/src/com/cloud/async/executor/UpdateLoadBalancerParam.java b/server/src/com/cloud/async/executor/UpdateLoadBalancerParam.java
deleted file mode 100644
index 2d79d86a670..00000000000
--- a/server/src/com/cloud/async/executor/UpdateLoadBalancerParam.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.cloud.async.executor;
-
-public class UpdateLoadBalancerParam {
- private long userId;
- private long loadBalancerId;
- private String name;
- private String description;
- private String privatePort;
- private String algorithm;
-
- public UpdateLoadBalancerParam() { }
-
- public UpdateLoadBalancerParam(long userId, long loadBalancerId, String name, String description, String privatePort, String algorithm) {
- this.userId = userId;
- this.loadBalancerId = loadBalancerId;
- this.name = name;
- this.description = description;
- this.privatePort = privatePort;
- this.algorithm = algorithm;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public long getLoadBalancerId() {
- return loadBalancerId;
- }
-
- public String getName() {
- return name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public String getPrivatePort() {
- return privatePort;
- }
-
- public String getAlgorithm() {
- return algorithm;
- }
-}
diff --git a/server/src/com/cloud/async/executor/UpdateLoadBalancerRuleResultObject.java b/server/src/com/cloud/async/executor/UpdateLoadBalancerRuleResultObject.java
deleted file mode 100644
index 6afa5ee93d0..00000000000
--- a/server/src/com/cloud/async/executor/UpdateLoadBalancerRuleResultObject.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.cloud.async.executor;
-
-import com.cloud.serializer.Param;
-
-public class UpdateLoadBalancerRuleResultObject {
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="description")
- private String description;
-
- @Param(name="publicip")
- private String publicIp;
-
- @Param(name="publicport")
- private String publicPort;
-
- @Param(name="privateport")
- private String privatePort;
-
- @Param(name="algorithm")
- private String algorithm;
-
- @Param(name="account")
- private String accountName;
-
- @Param(name="domainid")
- private long domainId;
-
- @Param(name="domain")
- private String domainName;
-
- public long getId() {
- return id;
- }
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getPublicIp() {
- return publicIp;
- }
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public String getPublicPort() {
- return publicPort;
- }
- public void setPublicPort(String publicPort) {
- this.publicPort = publicPort;
- }
-
- public String getPrivatePort() {
- return privatePort;
- }
- public void setPrivatePort(String privatePort) {
- this.privatePort = privatePort;
- }
-
- public String getAlgorithm() {
- return algorithm;
- }
- public void setAlgorithm(String algorithm) {
- this.algorithm = algorithm;
- }
-
- public String getAccountName() {
- return accountName;
- }
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public long getDomainId() {
- return domainId;
- }
- public void setDomainId(long domainId) {
- this.domainId = domainId;
- }
-
- public String getDomainName() {
- return domainName;
- }
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-}
diff --git a/server/src/com/cloud/async/executor/UpdatePortForwardingRuleResultObject.java b/server/src/com/cloud/async/executor/UpdatePortForwardingRuleResultObject.java
deleted file mode 100644
index a5e81001963..00000000000
--- a/server/src/com/cloud/async/executor/UpdatePortForwardingRuleResultObject.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.cloud.async.executor;
-
-import com.cloud.serializer.Param;
-
-public class UpdatePortForwardingRuleResultObject {
- @Param(name="id")
- private long id;
-
- @Param(name="publicip")
- private String publicIp;
-
- @Param(name="privateip")
- private String privateIp;
-
- @Param(name="publicport")
- private String publicPort;
-
- @Param(name="privateport")
- private String privatePort;
-
- @Param(name="protocol")
- private String protocol;
-
- @Param(name="virtualmachineid")
- private long virtualMachineId;
-
- @Param(name="vmname")
- private String virtualMachineName;
-
- @Param(name="vmdisplayname")
- private String virtualMachineDisplayName;
-
- public String getVirtualMachineDisplayName(){
- return this.virtualMachineDisplayName;
- }
-
- public void setVirtualMachineDisplayName(String name){
- this.virtualMachineDisplayName = name;
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getPublicIp() {
- return publicIp;
- }
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public String getPrivateIp() {
- return privateIp;
- }
-
- public void setPrivateIp(String privateIp) {
- this.privateIp = privateIp;
- }
-
- public String getPublicPort() {
- return publicPort;
- }
-
- public void setPublicPort(String publicPort) {
- this.publicPort = publicPort;
- }
-
- public String getPrivatePort() {
- return privatePort;
- }
-
- public void setPrivatePort(String privatePort) {
- this.privatePort = privatePort;
- }
-
- public String getProtocol() {
- return protocol;
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-
- public long getVirtualMachineId() {
- return virtualMachineId;
- }
-
- public void setVirtualMachineId(long virtualMachineId) {
- this.virtualMachineId = virtualMachineId;
- }
-
- public String getVirtualMachineName() {
- return virtualMachineName;
- }
-
- public void setVirtualMachineName(String virtualMachineName) {
- this.virtualMachineName = virtualMachineName;
- }
-}
diff --git a/server/src/com/cloud/async/executor/UpgradeVMExecutor.java b/server/src/com/cloud/async/executor/UpgradeVMExecutor.java
deleted file mode 100644
index 496955dadad..00000000000
--- a/server/src/com/cloud/async/executor/UpgradeVMExecutor.java
+++ /dev/null
@@ -1,134 +0,0 @@
-//TODO -- This will be removed
-///**
-// * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
-// *
-// * This software is licensed under the GNU General Public License v3 or later.
-// *
-// * It is free software: you can redistribute it and/or modify
-// * it under the terms of the GNU General Public License as published by
-// * the Free Software Foundation, either version 3 of the License, or any later version.
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// * GNU General Public License for more details.
-// *
-// * You should have received a copy of the GNU General Public License
-// * along with this program. If not, see .
-// *
-// */
-//
-//package com.cloud.async.executor;
-//
-//import org.apache.log4j.Logger;
-//
-//import com.cloud.api.BaseCmd;
-//import com.cloud.async.AsyncJobManager;
-//import com.cloud.async.AsyncJobResult;
-//import com.cloud.async.AsyncJobVO;
-//import com.cloud.async.BaseAsyncJobExecutor;
-//import com.cloud.serializer.GsonHelper;
-//import com.cloud.server.ManagementServer;
-//import com.cloud.service.ServiceOfferingVO;
-//import com.cloud.storage.VMTemplateVO;
-//import com.cloud.user.Account;
-//import com.cloud.uservm.UserVm;
-//import com.cloud.vm.UserVmVO;
-//import com.cloud.vm.VMInstanceVO;
-//import com.cloud.vm.VmStats;
-//import com.google.gson.Gson;
-//
-//public class UpgradeVMExecutor extends BaseAsyncJobExecutor {
-// public static final Logger s_logger = Logger.getLogger(UpgradeVMExecutor.class.getName());
-//
-// public boolean execute() {
-// AsyncJobManager asyncMgr = getAsyncJobMgr();
-// AsyncJobVO job = getJob();
-// Gson gson = GsonHelper.getBuilder().create();
-//
-// if(getSyncSource() == null) {
-// VMOperationParam param = gson.fromJson(job.getCmdInfo(), VMOperationParam.class);
-// asyncMgr.syncAsyncJobExecution(job.getId(), "UserVM", param.getVmId());
-//
-// // always true if it does not have sync-source
-// return true;
-// } else {
-// ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
-// UpgradeVMParam param = gson.fromJson(job.getCmdInfo(), UpgradeVMParam.class);
-//
-// try {
-// asyncMgr.updateAsyncJobAttachment(job.getId(), "vm_instance", param.getVmId());
-// boolean success = managementServer.upgradeVirtualMachine(param.getUserId(),
-// param.getVmId(), param.getServiceOfferingId(), param.getEventId());
-//
-// if (success) {
-// //get the upgraded vm to compose the result object
-// UserVmVO userVm = managementServer.findUserVMInstanceById(param.getVmId());
-// asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0,
-// composeResultObject(userVm, managementServer));
-//
-// } else {
-// asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED,
-// BaseCmd.VM_CHANGE_SERVICE_ERROR,
-// composeResultObject(null, managementServer));
-// }
-// } catch(Exception e) {
-// s_logger.warn("Unable to upgrade VM " + param.getVmId() + ":" + e.getMessage(), e);
-// asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED,
-// BaseCmd.INTERNAL_ERROR,
-// e.getMessage());
-// }
-// return true;
-// }
-// }
-//
-// private VmResultObject composeResultObject(UserVmVO vm, ManagementServer ms)
-// {
-// if(vm == null)
-// return null;
-//
-// VmResultObject resultObj = new VmResultObject();
-// Account acct = ms.findAccountById(Long.valueOf(vm.getAccountId()));
-// resultObj.setAccount(acct.getAccountName());
-//
-// ServiceOfferingVO offering = ms.findServiceOfferingById(vm.getServiceOfferingId());
-// resultObj.setCpuSpeed(offering.getSpeed());
-// resultObj.setMemory(offering.getRamSize());
-// if(offering.getDisplayText()!=null)
-// resultObj.setServiceOfferingName(offering.getDisplayText());
-// else
-// resultObj.setServiceOfferingName(offering.getName());
-// resultObj.setServiceOfferingId(vm.getServiceOfferingId());
-//
-// VmStats vmStats = ms.getVmStatistics(vm.getId());
-// if(vmStats != null)
-// {
-// resultObj.setCpuUsed((long) vmStats.getCPUUtilization());
-// resultObj.setNetworkKbsRead((long) vmStats.getNetworkReadKBs());
-// resultObj.setNetworkKbsWrite((long) vmStats.getNetworkWriteKBs());
-// }
-//
-// resultObj.setCreated(vm.getCreated());
-// resultObj.setDisplayName(vm.getDisplayName());
-// resultObj.setDomain(ms.findDomainIdById(acct.getDomainId()).getName());
-// resultObj.setDomainId(acct.getDomainId());
-// resultObj.setHaEnable(vm.isHaEnabled());
-// if(vm.getHostId() != null)
-// {
-// resultObj.setHostId(vm.getHostId());
-// resultObj.setHostName(ms.getHostBy(vm.getHostId()).getName());
-// }
-// resultObj.setIpAddress(vm.getPrivateIpAddress());
-// resultObj.setName(vm.getName());
-// resultObj.setState(vm.getState().toString());
-// resultObj.setZoneId(vm.getDataCenterId());
-// resultObj.setZoneName(ms.findDataCenterById(vm.getDataCenterId()).getName());
-//
-// VMTemplateVO template = ms.findTemplateById(vm.getTemplateId());
-// resultObj.setPasswordEnabled(template.getEnablePassword());
-// resultObj.setTemplateDisplayText(template.getDisplayText());
-// resultObj.setTemplateId(template.getId());
-// resultObj.setTemplateName(template.getName());
-//
-// return resultObj;
-// }
-//}
diff --git a/server/src/com/cloud/async/executor/UpgradeVMParam.java b/server/src/com/cloud/async/executor/UpgradeVMParam.java
deleted file mode 100644
index 7da70472030..00000000000
--- a/server/src/com/cloud/async/executor/UpgradeVMParam.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class UpgradeVMParam {
- private long userId;
- private long vmId;
- private long serviceOfferingId;
- private long eventId;
-
- public UpgradeVMParam() {
- }
-
- public UpgradeVMParam(long userId, long vmId, long serviceOfferingId) {
- this.userId = userId;
- this.vmId = vmId;
- this.serviceOfferingId = serviceOfferingId;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public void setUserId(long userId) {
- this.userId = userId;
- }
-
- public long getVmId() {
- return vmId;
- }
-
- public void setVmId(long vmId) {
- this.vmId = vmId;
- }
-
- public long getServiceOfferingId() {
- return serviceOfferingId;
- }
-
- public void setServiceOfferingId(long serviceOfferingId) {
- this.serviceOfferingId = serviceOfferingId;
- }
-
- public void setEventId(long eventId) {
- this.eventId = eventId;
- }
-
- public long getEventId() {
- return eventId;
- }
-}
diff --git a/server/src/com/cloud/async/executor/VMExecutorHelper.java b/server/src/com/cloud/async/executor/VMExecutorHelper.java
deleted file mode 100644
index 6ec5d41339d..00000000000
--- a/server/src/com/cloud/async/executor/VMExecutorHelper.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.async.executor;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.server.ManagementServer;
-import com.cloud.service.ServiceOfferingVO;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.user.Account;
-import com.cloud.vm.UserVmVO;
-
-public class VMExecutorHelper {
- public static VMOperationResultObject composeResultObject(ManagementServer managementServer, UserVmVO vm, String vmPassword) {
-
- VMOperationResultObject resultObject = new VMOperationResultObject();
-
- resultObject.setId(vm.getId());
- resultObject.setName(vm.getName());
- resultObject.setCreated(vm.getCreated());
- resultObject.setZoneId(vm.getDataCenterId());
- resultObject.setZoneName(managementServer.findDataCenterById(vm.getDataCenterId()).getName());
- resultObject.setIpAddress(vm.getPrivateIpAddress());
- resultObject.setServiceOfferingId(vm.getServiceOfferingId());
- resultObject.setHaEnabled(vm.isHaEnabled());
- if (vm.getDisplayName() == null || vm.getDisplayName().length() == 0) {
- resultObject.setDisplayName(vm.getName());
- }
- else {
- resultObject.setDisplayName(vm.getDisplayName());
- }
-
- if(vm.getState() != null)
- resultObject.setState(vm.getState().toString());
-
-// InstanceGroupVO group = managementServer.getGroupForVm(vm.getId());
-// if (group != null) {
-// resultObject.setGroupId(group.getId());
-// resultObject.setGroup(group.getName());
-// }
-
- VMTemplateVO template = managementServer.findTemplateById(vm.getTemplateId());
-
- Account acct = managementServer.findAccountById(Long.valueOf(vm.getAccountId()));
- if (acct != null) {
- resultObject.setAccount(acct.getAccountName());
- resultObject.setDomainId(acct.getDomainId());
-// resultObject.setDomain(managementServer.findDomainIdById(acct.getDomainId()).getName());
- }
-
- if ( BaseCmd.isAdmin(acct.getType()) && (vm.getHostId() != null)) {
- resultObject.setHostname(managementServer.getHostBy(vm.getHostId()).getName());
- resultObject.setHostid(vm.getHostId());
- }
-
- String templateName = "ISO Boot";
- boolean templatePasswordEnabled = false;
- String templateDisplayText = "ISO Boot";
-
- if (template != null) {
- templateName = template.getName();
- templatePasswordEnabled = template.getEnablePassword();
- templateDisplayText = template.getDisplayText();
- if (templateDisplayText == null) {
- templateDisplayText = templateName;
- }
- }
-
- resultObject.setTemplateId(vm.getTemplateId());
- resultObject.setTemplateName(templateName);
- resultObject.setTemplateDisplayText(templateDisplayText);
- resultObject.setPasswordEnabled(templatePasswordEnabled);
- if(templatePasswordEnabled)
- resultObject.setPassword(vmPassword);
-// else
-// resultObject.setPassword("");
-
- String isoName = null;
- if (vm.getIsoId() != null) {
- VMTemplateVO iso = managementServer.findTemplateById(vm.getIsoId().longValue());
- if (iso != null) {
- isoName = iso.getName();
- }
- }
-
- resultObject.setIsoId(vm.getIsoId());
- resultObject.setIsoName(isoName);
-
-
- ServiceOfferingVO offering = managementServer.findServiceOfferingById(vm.getServiceOfferingId());
- resultObject.setServiceOfferingId(vm.getServiceOfferingId());
- resultObject.setServiceOfferingName(offering.getName());
-
- resultObject.setCpuNumber(String.valueOf(offering.getCpu()));
- resultObject.setCpuSpeed(String.valueOf(offering.getSpeed()));
- resultObject.setMemory(String.valueOf(offering.getRamSize()));
-
- //Network groups
-// resultObject.setNetworkGroupList(managementServer.getNetworkGroupsNamesForVm(vm.getId()));
-
- return resultObject;
- }
-}
diff --git a/server/src/com/cloud/async/executor/VMOperationExecutor.java b/server/src/com/cloud/async/executor/VMOperationExecutor.java
deleted file mode 100644
index 6a5932463a2..00000000000
--- a/server/src/com/cloud/async/executor/VMOperationExecutor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.async.BaseAsyncJobExecutor;
-
-public abstract class VMOperationExecutor extends BaseAsyncJobExecutor {
- public abstract void processAnswer(VMOperationListener listener, long agentId, long seq, Answer answer);
- public abstract void processDisconnect(VMOperationListener listener, long agentId);
- public abstract void processTimeout(VMOperationListener listener, long agentId, long seq);
-}
diff --git a/server/src/com/cloud/async/executor/VMOperationListener.java b/server/src/com/cloud/async/executor/VMOperationListener.java
deleted file mode 100644
index c15b901b030..00000000000
--- a/server/src/com/cloud/async/executor/VMOperationListener.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.Listener;
-import com.cloud.agent.api.AgentControlAnswer;
-import com.cloud.agent.api.AgentControlCommand;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
-import com.cloud.agent.api.StartupCommand;
-import com.cloud.host.HostVO;
-import com.cloud.host.Status;
-import com.cloud.vm.UserVmVO;
-
-public class VMOperationListener implements Listener {
- private static final Logger s_logger = Logger.getLogger(VMOperationListener.class);
-
- private final VMOperationExecutor _executor;
- private final VMOperationParam _param;
- private final UserVmVO _vm;
- private int _cookie;
-
- public VMOperationListener(VMOperationExecutor executor, VMOperationParam param,
- UserVmVO vm, int cookie) {
-
- if(s_logger.isDebugEnabled())
- s_logger.debug("VM operation listener is created");
-
- _executor = executor;
- _param = param;
- _vm = vm;
- _cookie = cookie;
- }
-
- @Override
- public boolean processAnswers(long agentId, long seq, Answer[] answers) {
- Answer answer = null;
- if(answers != null)
- answer = answers[0];
-
- if(s_logger.isDebugEnabled())
- s_logger.debug("Process command answer for " + agentId + "-" + seq + " " + answer);
- _executor.processAnswer(this, agentId, seq, answer);
- return true;
- }
-
- @Override
- public boolean processCommands(long agentId, long seq, Command[] commands) {
- return true;
- }
-
- @Override
- public AgentControlAnswer processControlCommand(long agentId, AgentControlCommand cmd) {
- return null;
- }
-
- @Override
- public void processConnect(HostVO agent, StartupCommand cmd) {
-// return true;
- }
-
- @Override
- public boolean processDisconnect(long agentId, Status state) {
- if(_vm.getHostId() == agentId)
- _executor.processDisconnect(this, agentId);
- return true;
- }
-
- @Override
- public boolean isRecurring() {
- return false;
- }
-
- @Override
- public int getTimeout() {
- // TODO : no time out support for now as underlying support does not work as expected
- return -1;
- }
-
- @Override
- public boolean processTimeout(long agentId, long seq) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Process time out for " + agentId + "-" + seq);
-
- _executor.processTimeout(this, agentId, seq);
- return true;
- }
-
- public int getCookie() {
- return _cookie;
- }
-
- public void setCookie(int cookie) {
- _cookie = cookie;
- }
-
- public VMOperationExecutor getExecutor() {
- return _executor;
- }
-
- public VMOperationParam getParam() {
- return _param;
- }
-
- public UserVmVO getVm() {
- return _vm;
- }
-}
diff --git a/server/src/com/cloud/async/executor/VMOperationParam.java b/server/src/com/cloud/async/executor/VMOperationParam.java
deleted file mode 100644
index 1c4e0e6465b..00000000000
--- a/server/src/com/cloud/async/executor/VMOperationParam.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class VMOperationParam {
- public static enum VmOp { Noop, Start, Stop, Reboot, Destroy}; //WARN: Noop may not actually be noop
-
- private long userId;
- private long accountId;
- private long vmId;
- private String isoPath;
- private VmOp operation;
- protected long eventId;
- protected long childEventId;// This would be used for child events we log during the parent event. In future it can as well be a Map.
-
-
- public VMOperationParam() {
- }
- // This constructor is kept for backward compatibility. REMOVE when no longer needed.
- public VMOperationParam(long userId, long vmId, String isoPath, long eventId) {
- this.userId = userId;
- this.vmId = vmId;
- this.isoPath = isoPath;
- this.operation = VmOp.Noop;
- this.eventId = eventId;
- }
- public VMOperationParam(long userId, long accountId, long vmId, String isoPath, long eventId) {
- this.userId = userId;
- this.accountId = accountId;
- this.vmId = vmId;
- this.isoPath = isoPath;
- this.operation = VmOp.Noop;
- this.eventId = eventId;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public void setUserId(long userId) {
- this.userId = userId;
- }
-
- public long getAccountId() {
- return accountId;
- }
-
- public void setAccountId(long accountId) {
- this.accountId = accountId;
- }
-
- public long getVmId() {
- return vmId;
- }
-
- public void setVmId(long vmId) {
- this.vmId = vmId;
- }
-
- public String getIsoPath() {
- return isoPath;
- }
-
- public void setIsoPath(String isoPath) {
- this.isoPath = isoPath;
- }
-
- public void setOperation(VmOp operation) {
- this.operation = operation;
- }
-
- public VmOp getOperation() {
- return operation;
- }
-
- public long getEventId() {
- return eventId;
- }
- public long getChildEventId() {
- return childEventId;
- }
- public void setChildEventId(long childEventId) {
- this.childEventId = childEventId;
- }
-}
diff --git a/server/src/com/cloud/async/executor/VMOperationResultObject.java b/server/src/com/cloud/async/executor/VMOperationResultObject.java
deleted file mode 100644
index 0293e07c3da..00000000000
--- a/server/src/com/cloud/async/executor/VMOperationResultObject.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-
-public class VMOperationResultObject {
-
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="zoneid")
- private Long zoneId;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="ipaddress")
- private String ipAddress;
-
- @Param(name="serviceofferingid")
- private Long serviceOfferingId;
-
- @Param(name="haenable")
- private boolean haEnabled;
-
- @Param(name="state")
- private String state;
-
- @Param(name="templateid")
- private Long templateId;
-
- @Param(name="password")
- private String password;
-
- @Param(name="templatename")
- private String templateName;
-
- @Param(name="templatedisplaytext")
- private String templateDisplayText;
-
- @Param(name="isoid")
- private Long isoId;
-
- @Param(name="isoname")
- private String isoName;
-
- @Param(name="passwordenabled")
- private boolean passwordEnabled;
-
- @Param(name="serviceofferingname")
- private String serviceOfferingName;
-
- @Param(name="diskofferingid")
- private Long diskOfferingId;
-
- @Param(name="datadiskofferingname")
- private String diskOfferingName;
-
- @Param(name="cpunumber")
- private String cpuNumber;
-
- @Param(name="cpuspeed")
- private String cpuSpeed;
-
- @Param(name="memory")
- private String memory;
-
- @Param(name="storage")
- private String storage;
-
- @Param(name="displayname")
- private String displayName;
-
- @Param(name="group")
- private String group;
-
- @Param(name="groupid")
- private Long groupId;
-
- @Param(name="domainid")
- private Long domainId;
-
- @Param(name="domain")
- private String domain;
-
- @Param(name="account")
- private String account;
-
- @Param(name="hostname")
- private String hostname;
-
- @Param(name="hostid")
- private Long hostid;
-
- @Param(name="securitygrouplist")
- private String securityGroupList;
-
- @Param(name="rootdeviceid")
- private Long rootDeviceId;
-
- @Param(name="rootdevicetype")
- private String rootDeviceType;
-
- public Long getRootDeviceId(){
- return this.rootDeviceId;
- }
-
- public void setRootDeviceId(Long rootDeviceId){
- this.rootDeviceId = rootDeviceId;
- }
-
- public String getRootDeviceType(){
- return this.rootDeviceType;
- }
-
- public void setRootDeviceType(String deviceType){
- this.rootDeviceType = deviceType;
- }
-
- public String getSecurityGroupList(){
- return this.securityGroupList;
- }
-
- public void setSecurityGroupList(String nGroups){
- this.securityGroupList = nGroups;
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public Long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public String getIpAddress() {
- return ipAddress;
- }
-
- public void setIpAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- }
-
- public Long getServiceOfferingId() {
- return serviceOfferingId;
- }
-
- public void setServiceOfferingId(Long serviceOfferingId) {
- this.serviceOfferingId = serviceOfferingId;
- }
-
- public boolean isHaEnabled() {
- return haEnabled;
- }
-
- public void setHaEnabled(boolean haEnabled) {
- this.haEnabled = haEnabled;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public Long getTemplateId() {
- return templateId;
- }
-
- public void setTemplateId(Long templateId) {
- this.templateId = templateId;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getTemplateName() {
- return templateName;
- }
-
- public void setTemplateName(String templateName) {
- this.templateName = templateName;
- }
-
- public String getTemplateDisplayText() {
- return templateDisplayText;
- }
-
- public void setTemplateDisplayText(String templateDisplayText) {
- this.templateDisplayText = templateDisplayText;
- }
-
- public Long getIsoId() {
- return isoId;
- }
-
- public void setIsoId(Long isoId) {
- this.isoId = isoId;
- }
-
- public String getIsoName() {
- return isoName;
- }
-
- public void setIsoName(String isoName) {
- this.isoName = isoName;
- }
-
- public boolean isPasswordEnabled() {
- return passwordEnabled;
- }
-
- public void setPasswordEnabled(boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- }
-
- public String getServiceOfferingName() {
- return serviceOfferingName;
- }
-
- public void setServiceOfferingName(String serviceOfferingName) {
- this.serviceOfferingName = serviceOfferingName;
- }
-
- public Long getDiskOfferingId() {
- return diskOfferingId;
- }
-
- public void setDiskOfferingId(Long diskOfferingId) {
- this.diskOfferingId = diskOfferingId;
- }
-
- public String getDiskOfferingName() {
- return diskOfferingName;
- }
-
- public void setDiskOfferingName(String diskOfferingName) {
- this.diskOfferingName = diskOfferingName;
- }
-
- public String getCpuNumber() {
- return cpuNumber;
- }
-
- public void setCpuNumber(String cpuNumber) {
- this.cpuNumber = cpuNumber;
- }
-
- public String getCpuSpeed() {
- return cpuSpeed;
- }
-
- public void setCpuSpeed(String cpuSpeed) {
- this.cpuSpeed = cpuSpeed;
- }
-
- public String getMemory() {
- return memory;
- }
-
- public void setMemory(String memory) {
- this.memory = memory;
- }
-
- public String getStorage() {
- return storage;
- }
-
- public void setStorage(String stroage) {
- this.storage = stroage;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
-
- public String getGroup() {
- return group;
- }
-
- public void setGroup(String group) {
- this.group = group;
- }
-
- public Long getGroupId() {
- return groupId;
- }
-
- public void setGroupId(Long groupId) {
- this.groupId = groupId;
- }
-
- public Long getDomainId() {
- return domainId;
- }
-
- public void setDomainId(Long domainId) {
- this.domainId = domainId;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public String getHostname() {
- return hostname;
- }
-
- public void setHostname(String hostname) {
- this.hostname = hostname;
- }
-
- public Long getHostid() {
- return hostid;
- }
-
- public void setHostid(Long hostid) {
- this.hostid = hostid;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-}
diff --git a/server/src/com/cloud/async/executor/VmResultObject.java b/server/src/com/cloud/async/executor/VmResultObject.java
deleted file mode 100644
index eaa32520e65..00000000000
--- a/server/src/com/cloud/async/executor/VmResultObject.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.serializer.Param;
-
-public class VmResultObject
-{
-
- @Param(name="id")
- private Long id;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public String getIpAddress() {
- return ipAddress;
- }
-
- public void setIpAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public long getDomainId() {
- return domainId;
- }
-
- public void setDomainId(long domainId) {
- this.domainId = domainId;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public boolean isHaEnable() {
- return haEnable;
- }
-
- public void setHaEnable(boolean haEnable) {
- this.haEnable = haEnable;
- }
-
- public long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public Long getHostId() {
- return hostId;
- }
-
- public void setHostId(Long hostId) {
- this.hostId = hostId;
- }
-
- public String getHostName() {
- return hostName;
- }
-
- public void setHostName(String hostName) {
- this.hostName = hostName;
- }
-
- public long getTemplateId() {
- return templateId;
- }
-
- public void setTemplateId(long templateId) {
- this.templateId = templateId;
- }
-
- public String getTemplateName() {
- return templateName;
- }
-
- public void setTemplateName(String templateName) {
- this.templateName = templateName;
- }
-
- public String getTemplateDisplayText() {
- return templateDisplayText;
- }
-
- public void setTemplateDisplayText(String templateDisplayText) {
- this.templateDisplayText = templateDisplayText;
- }
-
- public boolean isPasswordEnabled() {
- return passwordEnabled;
- }
-
- public void setPasswordEnabled(boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- }
-
- public long getServiceOfferingId() {
- return serviceOfferingId;
- }
-
- public void setServiceOfferingId(long serviceOfferingId) {
- this.serviceOfferingId = serviceOfferingId;
- }
-
- public String getServiceOfferingName() {
- return serviceOfferingName;
- }
-
- public void setServiceOfferingName(String serviceOfferingName) {
- this.serviceOfferingName = serviceOfferingName;
- }
-
- public long getCpuSpeed() {
- return cpuSpeed;
- }
-
- public void setCpuSpeed(long cpuSpeed) {
- this.cpuSpeed = cpuSpeed;
- }
-
- public long getMemory() {
- return memory;
- }
-
- public void setMemory(long memory) {
- this.memory = memory;
- }
-
- public long getCpuUsed() {
- return cpuUsed;
- }
-
- public void setCpuUsed(long cpuUsed) {
- this.cpuUsed = cpuUsed;
- }
-
- public long getNetworkKbsRead() {
- return networkKbsRead;
- }
-
- public void setNetworkKbsRead(long networkKbsRead) {
- this.networkKbsRead = networkKbsRead;
- }
-
- public long getNetworkKbsWrite() {
- return networkKbsWrite;
- }
-
- public void setNetworkKbsWrite(long networkKbsWrite) {
- this.networkKbsWrite = networkKbsWrite;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setId(Long id){
- this.id = id;
- }
-
- @Param(name="name")
- private String name;
-
- @Param(name="created")
- private Date created;
-
- @Param(name="ipaddress")
- private String ipAddress;
-
- @Param(name="state")
- private String state;
-
- @Param(name="account")
- private String account;
-
- @Param(name="domainid")
- private long domainId;
-
- @Param(name="domain")
- private String domain;
-
- @Param(name="haenable")
- private boolean haEnable;
-
- @Param(name="zoneid")
- private long zoneId;
-
- @Param(name="displayname")
- private String displayName;
-
- @Param(name="zonename")
- private String zoneName;
-
- @Param(name="hostid")
- private Long hostId;
-
- @Param(name="hostname")
- private String hostName;
-
- @Param(name="templateid")
- private long templateId;
-
- @Param(name="templatename")
- private String templateName;
-
- @Param(name="templatedisplaytext")
- private String templateDisplayText;
-
- @Param(name="passwordenabled")
- private boolean passwordEnabled;
-
- @Param(name="serviceofferingid")
- private long serviceOfferingId;
-
- @Param(name="serviceofferingname")
- private String serviceOfferingName;
-
- @Param(name="cpunumber")
- private long cpuSpeed;
-
- @Param(name="memory")
- private long memory;
-
- @Param(name="cpuused")
- private long cpuUsed;
-
- @Param(name="networkkbsread")
- private long networkKbsRead;
-
- @Param(name="networkkbswrite")
- private long networkKbsWrite;
-
-}
diff --git a/server/src/com/cloud/async/executor/VolumeOperationExecutor.java b/server/src/com/cloud/async/executor/VolumeOperationExecutor.java
deleted file mode 100644
index 25cb50212a1..00000000000
--- a/server/src/com/cloud/async/executor/VolumeOperationExecutor.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncInstanceCreateStatus;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.async.executor.VolumeOperationParam.VolumeOp;
-import com.cloud.event.EventTypes;
-import com.cloud.event.EventVO;
-import com.cloud.exception.InternalErrorException;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.storage.VolumeVO;
-import com.cloud.uservm.UserVm;
-import com.google.gson.Gson;
-
-
-public class VolumeOperationExecutor extends BaseAsyncJobExecutor {
- public static final Logger s_logger = Logger.getLogger(VolumeOperationExecutor.class.getName());
-
- public boolean execute() {
- Gson gson = GsonHelper.getBuilder().create();
- AsyncJobManager asyncMgr = getAsyncJobMgr();
- AsyncJobVO job = getJob();
- /*
- if (getSyncSource() == null) {
- VolumeOperationParam param = gson.fromJson(job.getCmdInfo(), VolumeOperationParam.class);
- asyncMgr.syncAsyncJobExecution(job.getId(), "Volume", param.getVolumeId());
-
- // always true if it does not have sync-source
- return true;
- } else {
- VolumeOperationParam param = gson.fromJson(job.getCmdInfo(), VolumeOperationParam.class);
- boolean success = false;
- String eventType = null;
- String failureDescription = "";
- try {
- VolumeVO volume = null;
- VolumeOp op = param.getOp();
- if (op == VolumeOp.Create) {
- eventType = EventTypes.EVENT_VOLUME_CREATE;
- failureDescription = "Failed to create volume";
- volume = asyncMgr.getExecutorContext().getManagementServer().createVolume(param.getUserId(), param.getAccountId(), param.getName(), param.getZoneId(), param.getDiskOfferingId(), param.getEventId(), param.getSize());
- if (volume.getStatus() == AsyncInstanceCreateStatus.Corrupted) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, "Failed to create volume.");
- } else {
- success = true;
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, composeResultObject(volume, param));
- }
- }
- else if (op == VolumeOp.Attach) {
- eventType = EventTypes.EVENT_VOLUME_ATTACH;
- failureDescription = "Failed to attach volume";
-
- asyncMgr.getExecutorContext().getManagementServer().attachVolumeToVM(param.getVmId(), param.getVolumeId(), param.getDeviceId(), param.getEventId());
-
- // get the VM instance and Volume for the result object
- UserVm vmInstance = asyncMgr.getExecutorContext().getManagementServer().findUserVMInstanceById(param.getVmId());
- VolumeVO vol = asyncMgr.getExecutorContext().getManagementServer().findVolumeById(param.getVolumeId());
- success = true;
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, composeAttachResultObject(vmInstance, vol));
- }
- else if (op == VolumeOp.Detach) {
- eventType = EventTypes.EVENT_VOLUME_DETACH;
- failureDescription = "Failed to detach volume";
-
- asyncMgr.getExecutorContext().getManagementServer().detachVolumeFromVM(param.getVolumeId(), param.getEventId(),param.getDeviceId(),param.getVmId());
- success = true;
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, null);
- } else {
- throw new Exception("Invalid Volume Operation. Valid Operations are: CreateVolume, AttachVolume, and DetachVolume.");
- }
-
- } catch (InternalErrorException e) {
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- } catch (Exception e) {
- s_logger.warn("Unhandled Exception executing volume operation " + param.getOp(), e);
- asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
- } finally {
- if(!success){
- // Save completed event when operation fails
- asyncMgr.getExecutorContext().getManagementServer().saveEvent(param.getUserId(), param.getAccountId(), EventVO.LEVEL_ERROR, eventType, failureDescription, null, param.getEventId());
- }
- }
- return true;
- }
-*/
- return true;
- }
-
- public void processAnswer(VolumeOperationListener listener, long agentId, long seq, Answer answer) {
- }
-
- public void processDisconnect(VolumeOperationListener listener, long agentId) {
- }
-
- public void processTimeout(VolumeOperationListener listener, long agentId, long seq) {
- }
-
- protected VolumeOperationResultObject composeResultObject(VolumeVO volume, VolumeOperationParam param) {
- VolumeOperationResultObject resultObject = new VolumeOperationResultObject();
- Long diskOfferingId = null;
-
- diskOfferingId = volume.getDiskOfferingId();
-
- resultObject.setId(volume.getId());
- resultObject.setName(param.getName());
- resultObject.setVolumeType(volume.getVolumeType());
- resultObject.setVolumeSize(volume.getSize());
- resultObject.setCreatedDate(volume.getCreated());
- resultObject.setState(volume.getStatus());
- resultObject.setAccountName(getAsyncJobMgr().getExecutorContext().getManagementServer().findAccountById(param.getAccountId()).getAccountName());
- resultObject.setDomainId(volume.getDomainId());
- resultObject.setDiskOfferingId(volume.getDiskOfferingId());
-
- if (diskOfferingId != null) {
- resultObject.setDiskOfferingName(getAsyncJobMgr().getExecutorContext().getManagementServer().findDiskOfferingById(diskOfferingId).getName());
- resultObject.setDiskOfferingDisplayText(getAsyncJobMgr().getExecutorContext().getManagementServer().findDiskOfferingById(diskOfferingId).getDisplayText());
- }
-// resultObject.setDomain(getAsyncJobMgr().getExecutorContext().getManagementServer().findDomainIdById(volume.getDomainId()).getName());
- resultObject.setStorageType("shared"); // NOTE: You can never create a local disk volume but if that changes, we need to change this
- if (volume.getPoolId() != null)
- resultObject.setStorage(getAsyncJobMgr().getExecutorContext().getManagementServer().findPoolById(volume.getPoolId()).getName());
- resultObject.setZoneId(volume.getDataCenterId());
-// resultObject.setZoneName(getAsyncJobMgr().getExecutorContext().getManagementServer().getDataCenterBy(volume.getDataCenterId()).getName());
- return resultObject;
- }
-
- private AttachVolumeOperationResultObject composeAttachResultObject(UserVm instance, VolumeVO vol) {
- AttachVolumeOperationResultObject resultObject = new AttachVolumeOperationResultObject();
-
- resultObject.setVmName(instance.getName());
- resultObject.setVmDisplayName(instance.getDisplayName());
- resultObject.setVirtualMachineId(instance.getId());
- resultObject.setVmState(instance.getState().toString());
- resultObject.setStorageType("shared"); // NOTE: You can never attach a local disk volume but if that changes, we need to change this
- resultObject.setVolumeId(vol.getId());
- resultObject.setVolumeName(vol.getName());
-
- return resultObject;
- }
-}
diff --git a/server/src/com/cloud/async/executor/VolumeOperationListener.java b/server/src/com/cloud/async/executor/VolumeOperationListener.java
deleted file mode 100644
index 0ef17af29de..00000000000
--- a/server/src/com/cloud/async/executor/VolumeOperationListener.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.Listener;
-import com.cloud.agent.api.AgentControlAnswer;
-import com.cloud.agent.api.AgentControlCommand;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
-import com.cloud.agent.api.StartupCommand;
-import com.cloud.host.HostVO;
-import com.cloud.host.Status;
-import com.cloud.storage.VolumeVO;
-import com.cloud.vm.UserVmVO;
-
-public class VolumeOperationListener implements Listener {
- private static final Logger s_logger = Logger.getLogger(VolumeOperationListener.class);
-
- private final VolumeOperationExecutor _executor;
- private final VolumeOperationParam _param;
- private final UserVmVO _vm;
- private final VolumeVO _volume;
- private int _cookie;
-
- public VolumeOperationListener(VolumeOperationExecutor executor, VolumeOperationParam param, UserVmVO vm, VolumeVO volume, int cookie) {
-
- if(s_logger.isDebugEnabled())
- s_logger.debug("VM operation listener is created");
-
- _executor = executor;
- _param = param;
- _vm = vm;
- _volume = volume;
- _cookie = cookie;
- }
-
- @Override
- public boolean processAnswers(long agentId, long seq, Answer[] answers) {
- Answer answer = null;
- if(answers != null)
- answer = answers[0];
-
- if(s_logger.isDebugEnabled())
- s_logger.debug("Process command answer for " + agentId + "-" + seq + " " + answer);
-
- _executor.processAnswer(this, agentId, seq, answer);
- return true;
- }
-
- @Override
- public boolean processCommands(long agentId, long seq, Command[] commands) {
- return true;
- }
-
- @Override
- public AgentControlAnswer processControlCommand(long agentId, AgentControlCommand cmd) {
- return null;
- }
-
- @Override
- public void processConnect(HostVO agent, StartupCommand cmd) {
- }
-
- @Override
- public boolean processDisconnect(long agentId, Status state) {
- if(_vm.getHostId() == agentId)
- _executor.processDisconnect(this, agentId);
- return true;
- }
-
- @Override
- public boolean isRecurring() {
- return false;
- }
-
- @Override
- public int getTimeout() {
- // TODO : no time out support for now as underlying support does not work as expected
- return -1;
- }
-
- @Override
- public boolean processTimeout(long agentId, long seq) {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Process time out for " + agentId + "-" + seq);
-
- _executor.processTimeout(this, agentId, seq);
- return true;
- }
-
- public int getCookie() {
- return _cookie;
- }
-
- public void setCookie(int cookie) {
- _cookie = cookie;
- }
-
- public VolumeOperationExecutor getExecutor() {
- return _executor;
- }
-
- public VolumeOperationParam getParam() {
- return _param;
- }
-
- public UserVmVO getVm() {
- return _vm;
- }
-}
diff --git a/server/src/com/cloud/async/executor/VolumeOperationParam.java b/server/src/com/cloud/async/executor/VolumeOperationParam.java
deleted file mode 100644
index b59ddd51f2f..00000000000
--- a/server/src/com/cloud/async/executor/VolumeOperationParam.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-public class VolumeOperationParam {
-
- public enum VolumeOp { Create, Attach, Detach;}
-
- // Used for all VolumeOps
- private VolumeOp op;
- private long accountId;
- private long userId;
-
- // Used for Create
- private long zoneId;
- private String name;
- private long diskOfferingId;
- private long size;
-
- // Used for Attach and Detach
- private long vmId;
-
-
- // Used for Attach, Detach, and Delete
- private long volumeId;
- private long eventId;
- private Long deviceId;
-
- public VolumeOperationParam() {
- }
-
- public VolumeOp getOp() {
- return op;
- }
-
- public void setOp(VolumeOp op) {
- this.op = op;
- }
-
- public long getAccountId() {
- return accountId;
- }
-
- public void setAccountId(long accountId) {
- this.accountId = accountId;
- }
-
- public long getUserId() {
- return userId;
- }
-
- public void setUserId(long userId) {
- this.userId = userId;
- }
-
- public long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public long getDiskOfferingId() {
- return diskOfferingId;
- }
-
- public void setDiskOfferingId(long diskOfferingId) {
- this.diskOfferingId = diskOfferingId;
- }
-
- public long getVolumeId() {
- return volumeId;
- }
-
- public void setVolumeId(long volumeId) {
- this.volumeId = volumeId;
- }
-
- public long getVmId() {
- return vmId;
- }
-
- public void setVmId(long vmId) {
- this.vmId = vmId;
- }
-
- public void setEventId(long eventId) {
- this.eventId = eventId;
- }
-
- public long getEventId() {
- return eventId;
- }
-
- public void setDeviceId(Long deviceId) {
- this.deviceId = deviceId;
- }
-
- public Long getDeviceId() {
- return deviceId;
- }
-
- public long getSize(){
- return size;
- }
-
- public void setSize(long size){
- this.size = size;
- }
-}
diff --git a/server/src/com/cloud/async/executor/VolumeOperationResultObject.java b/server/src/com/cloud/async/executor/VolumeOperationResultObject.java
deleted file mode 100644
index e19b7597f69..00000000000
--- a/server/src/com/cloud/async/executor/VolumeOperationResultObject.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package com.cloud.async.executor;
-
-import java.util.Date;
-
-import com.cloud.async.AsyncInstanceCreateStatus;
-import com.cloud.serializer.Param;
-import com.cloud.storage.Volume.VolumeType;
-
-public class VolumeOperationResultObject {
- @Param(name="id")
- private long id;
-
- @Param(name="name")
- private String name;
-
- @Param(name="hostname")
- private String hostName;
-
- // @Param(name="host_id")
- // private Long hostId;
-
- // @Param(name="pool_id")
- // private Long poolId;
-
- //@Param(name="accountid")
- //long accountId;
-
- @Param(name="account")
- private String accountName;
-
- @Param(name="domainid")
- long domainId;
-
- @Param(name="domain")
- String domain;
-
- @Param(name="iscsiname")
- String iscsiName;
-
- // @Param(name="pod_id")
- // Long podId;
-
- @Param(name="destroyed")
- boolean destroyed;
-
- // @Param(name="created")
- // Date created;
-
- // @Param(name="host_ip")
- // String hostip;
-
- @Param(name="diskofferingid")
- Long diskOfferingId;
-
- @Param(name="diskofferingname")
- String diskOfferingName;
-
- @Param(name="diskofferingdisplaytext")
- String diskOfferingDisplayText;
-
- // @Param(name="mirror_vol")
- // Long mirrorVolume;
-
- // @Param(name="template_name")
- // String templateName;
-
- // @Param(name="device_name")
- // String deviceName;
-
- @Param(name="type")
- VolumeType volumeType;
-
- @Param(name="size")
- private long volumeSize;
-
- // @Param(name="removed")
- // Date removed;
-
- @Param(name="vmstate")
- private String instanceState;
-
- @Param(name="created")
- private Date createdDate;
-
- @Param(name="state")
- private AsyncInstanceCreateStatus state;
-
- @Param(name="storagetype")
- String storageType;
-
- @Param(name="storage")
- private String storage;
-
- @Param(name="zoneid")
- private Long zoneId;
-
- public Long getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- @Param(name="zonename")
- private String zoneName;
-
- public String getStorage() {
- return storage;
- }
-
- public void setStorage(String storage) {
- this.storage = storage;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public long getId() {
- return id;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public void setHostName(String hostName) {
- this.hostName = hostName;
- }
-
- public String getHostName() {
- return hostName;
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public String getAccountName() {
- return accountName;
- }
-
- public void setDomainId(long domainId) {
- this.domainId = domainId;
- }
-
- public long getDomainId() {
- return domainId;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public String getDomain() {
- return domain;
- }
-
- /*
- public void setSize(long size) {
- this.size = size;
- }
- */
-
- /*
- public void setFolder(String folder) {
- this.folder = folder;
- }
- */
-
- /*
- public void setPath(String path) {
- this.path = path;
- }
- */
-
- public void setIscsiName(String iscsiName) {
- this.iscsiName = iscsiName;
- }
-
- public String getIscsiName() {
- return iscsiName;
- }
-
- /*
- public void setPodId(Long podId) {
- this.podId = podId;
- }
- */
-
- public void setDestroyed(boolean destroyed) {
- this.destroyed = destroyed;
- }
-
- public boolean getDestroyed() {
- return destroyed;
- }
-
- /*
- public void setCreated(Date created) {
- this.created = created;
- }
- */
-
- /*
- public void setHostIp(String hostIp) {
- this.hostip = hostIp;
- }
- */
-
- public void setDiskOfferingId(Long diskOfferingId) {
- this.diskOfferingId = diskOfferingId;
- }
-
- public Long getDiskOfferingId() {
- return diskOfferingId;
- }
-
- public void setDiskOfferingName(String diskOfferingName) {
- this.diskOfferingName = diskOfferingName;
- }
-
- public String getDiskOfferingDisplayText() {
- return diskOfferingDisplayText;
- }
-
- public void setDiskOfferingDisplayText(String diskOfferingDisplayText) {
- this.diskOfferingDisplayText = diskOfferingDisplayText;
- }
-
- public String getDiskOfferingName() {
- return diskOfferingName;
- }
-
-
- /*
- public void setMirrorVolume(long mirrorVolume) {
- this.mirrorVolume = mirrorVolume;
- }
- */
-
- /*
- public long getMirrorVolume() {
- return mirrorVolume;
- }
- */
-
- /*
- public void setTemplateName(String templateName) {
- this.templateName = templateName;
- }
- */
-
- /*
- public void setDeviceName(String deviceName) {
- this.deviceName = deviceName;
- }
- */
-
- public void setVolumeType(VolumeType volumeType) {
- this.volumeType = volumeType;
- }
-
- public VolumeType getVolumeType() {
- return volumeType;
- }
-
- public void setVolumeSize(long volumeSize) {
- this.volumeSize = volumeSize;
- }
-
- public long getVolumeSize() {
- return volumeSize;
- }
-
- /*
- public void setRemoved(Date removed) {
- this.removed = removed;
- }
- */
-
- public void setCreatedDate(Date createdDate) {
- this.createdDate = createdDate;
- }
-
- public Date getCreatedDate() {
- return createdDate;
- }
-
- public void setState(AsyncInstanceCreateStatus status) {
- this.state = status;
- }
-
- public AsyncInstanceCreateStatus getState() {
- return state;
- }
-
- public void setStorageType (String storageType) {
- this.storageType = storageType;
- }
-
- public String getStorageType() {
- return storageType;
- }
-
- public void setInstanceState(String state) {
- this.instanceState = state;
- }
-
- public String getInstanceState() {
- return instanceState;
- }
-}
diff --git a/server/src/com/cloud/capacity/dao/CapacityDao.java b/server/src/com/cloud/capacity/dao/CapacityDao.java
old mode 100644
new mode 100755
index 9d26287abce..7401ced3b7a
--- a/server/src/com/cloud/capacity/dao/CapacityDao.java
+++ b/server/src/com/cloud/capacity/dao/CapacityDao.java
@@ -18,14 +18,16 @@
package com.cloud.capacity.dao;
+import java.util.List;
+
import com.cloud.capacity.CapacityVO;
import com.cloud.utils.db.GenericDao;
-import com.cloud.vm.VMInstanceVO;
public interface CapacityDao extends GenericDao {
void clearNonStorageCapacities();
void clearStorageCapacities();
CapacityVO findByHostIdType(Long hostId, short capacityType);
void clearNonStorageCapacities2();
+ List findByHostorPoolId(Long hostorPoolId);
}
diff --git a/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
old mode 100644
new mode 100755
index 6a23621a2de..fda470afc5c
--- a/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -25,13 +25,10 @@ import javax.ejb.Local;
import org.apache.log4j.Logger;
import com.cloud.capacity.CapacityVO;
-import com.cloud.service.ServiceOfferingVO;
-import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
-import com.cloud.vm.VMInstanceVO;
@Local(value = { CapacityDao.class })
public class CapacityDaoImpl extends GenericDaoBase implements CapacityDao {
@@ -43,12 +40,17 @@ public class CapacityDaoImpl extends GenericDaoBase implements
private static final String CLEAR_NON_STORAGE_CAPACITIES = "DELETE FROM `cloud`.`op_host_capacity` WHERE capacity_type<>2 AND capacity_type<>3 AND capacity_type<>6"; //clear non-storage and non-secondary_storage capacities
private static final String CLEAR_NON_STORAGE_CAPACITIES2 = "DELETE FROM `cloud`.`op_host_capacity` WHERE capacity_type<>2 AND capacity_type<>3 AND capacity_type<>6 AND capacity_type<>0 AND capacity_type<>1"; //clear non-storage and non-secondary_storage capacities
private SearchBuilder _hostIdTypeSearch;
+ private SearchBuilder _hostOrPoolIdSearch;
public CapacityDaoImpl() {
_hostIdTypeSearch = createSearchBuilder();
_hostIdTypeSearch.and("hostId", _hostIdTypeSearch.entity().getHostOrPoolId(), SearchCriteria.Op.EQ);
_hostIdTypeSearch.and("type", _hostIdTypeSearch.entity().getCapacityType(), SearchCriteria.Op.EQ);
_hostIdTypeSearch.done();
+
+ _hostOrPoolIdSearch = createSearchBuilder();
+ _hostOrPoolIdSearch.and("hostId", _hostOrPoolIdSearch.entity().getHostOrPoolId(), SearchCriteria.Op.EQ);
+ _hostOrPoolIdSearch.done();
}
public void updateAllocated(Long hostId, long allocatedAmount, short capacityType, boolean add) {
@@ -129,5 +131,12 @@ public class CapacityDaoImpl extends GenericDaoBase implements
sc.setParameters("hostId", hostId);
sc.setParameters("type", capacityType);
return findOneBy(sc);
+ }
+
+ @Override
+ public java.util.List findByHostorPoolId(Long hostorPoolId){
+ SearchCriteria sc = _hostOrPoolIdSearch.create();
+ sc.setParameters("hostId", hostorPoolId);
+ return listBy(sc);
}
}
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index dc32b45da9f..f0f275d2624 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -56,11 +56,12 @@ public enum Config {
GuestIpNetwork("Network", AgentManager.class, String.class, "guest.ip.network", "10.1.1.1", "The network address of the guest virtual network. Virtual machines will be assigned an IP in this subnet.", "privateip"),
GuestNetmask("Network", AgentManager.class, String.class, "guest.netmask", "255.255.255.0", "The netmask of the guest virtual network.", "netmask"),
GuestVlanBits("Network", ManagementServer.class, Integer.class, "guest.vlan.bits", "12", "The number of bits to reserve for the VLAN identifier in the guest subnet.", null),
- MulticastThrottlingRate("Network", ManagementServer.class, Integer.class, "multicast.throttling.rate", "10", "Default multicast rate in megabits per second allowed.", null),
+ //MulticastThrottlingRate("Network", ManagementServer.class, Integer.class, "multicast.throttling.rate", "10", "Default multicast rate in megabits per second allowed.", null),
NetworkThrottlingRate("Network", ManagementServer.class, Integer.class, "network.throttling.rate", "200", "Default data transfer rate in megabits per second allowed.", null),
GuestDomainSuffix("Network", AgentManager.class, String.class, "guest.domain.suffix", "cloud.internal", "Default domain name for vms inside virtualized networks fronted by router", null),
DirectNetworkNoDefaultRoute("Network", ManagementServer.class, Boolean.class, "direct.network.no.default.route", "false", "Direct Network Dhcp Server should not send a default route", "true/false"),
- OvsNetwork("Network", ManagementServer.class, Boolean.class, "open.vswitch.network", "false", "enable/disable open vswitch network", null),
+ OvsNetwork("Network", ManagementServer.class, Boolean.class, "open.vswitch.vlan.network", "false", "enable/disable vlan remapping of open vswitch network", null),
+ OvsTunnelNetwork("Network", ManagementServer.class, Boolean.class, "open.vswitch.tunnel.network", "false", "enable/disable open vswitch tunnel network(no vlan)", null),
//VPN
RemoteAccessVpnPskLength("Network", AgentManager.class, Integer.class, "remote.access.vpn.psk.length", "24", "The length of the ipsec preshared key (minimum 8, maximum 256)", null),
@@ -72,8 +73,6 @@ public enum Config {
// Usage
CapacityCheckPeriod("Usage", ManagementServer.class, Integer.class, "capacity.check.period", "300000", "The interval in milliseconds between capacity checks", null),
- CapacitySkipCountingHours("Usage", ManagementServer.class, Integer.class, "capacity.skipcounting.hours", "24", "The interval in hours since VM has stopped to skip counting its allocated CPU/Memory capacity. Applies to vms in Stopped state", null),
- CapacitySkipCountingDestroyedHours("Usage", ManagementServer.class, Integer.class, "capacity.skipcounting.destroyed.hours", "0", "The interval in hours since VM has stopped to skip counting its allocated CPU/Memory capacity. Applies to vms in Destroyed state", null),
StorageAllocatedCapacityThreshold("Usage", ManagementServer.class, Float.class, "storage.allocated.capacity.threshold", "0.85", "Percentage (as a value between 0 and 1) of allocated storage utilization above which alerts will be sent about low storage available.", null),
StorageCapacityThreshold("Usage", ManagementServer.class, Float.class, "storage.capacity.threshold", "0.85", "Percentage (as a value between 0 and 1) of storage utilization above which alerts will be sent about low storage available.", null),
CPUCapacityThreshold("Usage", ManagementServer.class, Float.class, "cpu.capacity.threshold", "0.85", "Percentage (as a value between 0 and 1) of cpu utilization above which alerts will be sent about low cpu available.", null),
@@ -161,7 +160,6 @@ public enum Config {
DirectAttachNetworkEnabled("Advanced", ManagementServer.class, Boolean.class, "direct.attach.network.externalIpAllocator.enabled", "false", "Direct-attach VMs using external DHCP server", "true,false"),
DirectAttachNetworkExternalAPIURL("Advanced", ManagementServer.class, String.class, "direct.attach.network.externalIpAllocator.url", null, "Direct-attach VMs using external DHCP server (API url)", null),
CheckPodCIDRs("Advanced", ManagementServer.class, String.class, "check.pod.cidrs", "true", "If true, different pods must belong to different CIDR subnets.", "true,false"),
- MD5Hashed("Advanced", ManagementServer.class, Boolean.class, "security.password.md5hashed", "true", "If set to false password is sent in clear text or else md5hashed", null),
NetworkGcWait("Advanced", ManagementServer.class, Integer.class, "network.gc.wait", "600", "Seconds to wait before shutting down a network that's not in used", null),
NetworkGcInterval("Advanced", ManagementServer.class, Integer.class, "network.gc.interval", "600", "Seconds to wait before checking for networks to shutdown", null),
HostCapacityCheckerWait("Advanced", ManagementServer.class, Integer.class, "host.capacity.checker.wait", "3600", "Seconds to wait before starting host capacity background checker", null),
diff --git a/server/src/com/cloud/configuration/ConfigurationManager.java b/server/src/com/cloud/configuration/ConfigurationManager.java
index a9163cbeb63..60c3d95cdcc 100644
--- a/server/src/com/cloud/configuration/ConfigurationManager.java
+++ b/server/src/com/cloud/configuration/ConfigurationManager.java
@@ -19,16 +19,17 @@ package com.cloud.configuration;
import java.util.List;
+import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
import com.cloud.dc.Vlan;
import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
+import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Networks.TrafficType;
import com.cloud.offering.DiskOffering;
import com.cloud.offering.NetworkOffering.Availability;
@@ -43,7 +44,7 @@ import com.cloud.utils.component.Manager;
* ConfigurationManager handles adding pods/zones, changing IP ranges, enabling external firewalls, and editing configuration values
*
*/
-public interface ConfigurationManager extends Manager {
+public interface ConfigurationManager extends ConfigurationService, Manager {
/**
* Updates a configuration entry with a new value
@@ -111,17 +112,6 @@ public interface ConfigurationManager extends Manager {
* @throws
*/
DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String vnetRange, String guestCidr, String domain, Long domainId, NetworkType zoneType);
-
- /**
- * Associates an ip address list to an account. The list of ip addresses are all addresses associated with the given vlan id.
- * @param userId
- * @param accountId
- * @param zoneId
- * @param vlanId
- * @throws InsufficientAddressCapacityException
- * @throws
- */
- public void associateIpAddressListToAccount(long userId, long accountId, long zoneId, Long vlanId) throws InsufficientAddressCapacityException, ConcurrentOperationException;
/**
* Deletes a VLAN from the database, along with all of its IP addresses. Will not delete VLANs that have allocated IP addresses.
@@ -180,11 +170,15 @@ public interface ConfigurationManager extends Manager {
*/
NetworkOfferingVO createNetworkOffering(long userId, String name, String displayText, TrafficType trafficType, String tags, Integer maxConnections, boolean specifyVlan, Availability availability);
- Vlan createVlanAndPublicIpRange(Long userId, Long zoneId, Long podId, String startIP, String endIP, String vlanGateway, String vlanNetmask, boolean forVirtualNetwork, String vlanId, Account account, Long networkId) throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException;
+ Vlan createVlanAndPublicIpRange(Long userId, Long zoneId, Long podId, String startIP, String endIP, String vlanGateway, String vlanNetmask, boolean forVirtualNetwork, String vlanId, Account account, Long networkId) throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException, ResourceUnavailableException;
void createDefaultNetworks(long zoneId) throws ConcurrentOperationException;
- Long saveConfigurationEvent(long userId, Long accountId, String type, String description, String... paramsList);
-
DataCenterVO getZone(long id);
+
+ HostPodVO getPod(long id);
+
+ ClusterVO getCluster(long id);
+
+ boolean deleteAccountSpecificVirtualRanges(long accountId);
}
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index b666a28da25..d65ede3d2d7 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -21,13 +21,11 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Vector;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
@@ -60,6 +58,7 @@ import com.cloud.api.commands.UpdateZoneCmd;
import com.cloud.configuration.ResourceCount.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.AccountVlanMapVO;
+import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.dc.DataCenterIpAddressVO;
@@ -71,6 +70,7 @@ import com.cloud.dc.Vlan;
import com.cloud.dc.Vlan.VlanType;
import com.cloud.dc.VlanVO;
import com.cloud.dc.dao.AccountVlanMapDao;
+import com.cloud.dc.dao.ClusterDao;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.DataCenterIpAddressDao;
import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl;
@@ -80,17 +80,13 @@ import com.cloud.dc.dao.VlanDao;
import com.cloud.deploy.DataCenterDeployment;
import com.cloud.domain.DomainVO;
import com.cloud.domain.dao.DomainDao;
-import com.cloud.event.EventTypes;
-import com.cloud.event.EventUtils;
-import com.cloud.event.EventVO;
import com.cloud.event.dao.EventDao;
import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
+import com.cloud.exception.ResourceUnavailableException;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.IPAddressVO;
import com.cloud.network.Network;
import com.cloud.network.Network.GuestIpType;
import com.cloud.network.NetworkManager;
@@ -115,7 +111,6 @@ import com.cloud.user.AccountManager;
import com.cloud.user.AccountVO;
import com.cloud.user.User;
import com.cloud.user.UserContext;
-import com.cloud.user.UserVO;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.UserDao;
import com.cloud.utils.NumbersUtil;
@@ -127,14 +122,8 @@ import com.cloud.utils.db.Filter;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.net.Ip;
import com.cloud.utils.net.NetUtils;
-import com.cloud.vm.ConsoleProxyVO;
-import com.cloud.vm.DomainRouterVO;
-import com.cloud.vm.SecondaryStorageVmVO;
import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.ConsoleProxyDao;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.SecondaryStorageVmDao;
@@ -167,6 +156,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
@Inject SecondaryStorageVmDao _secStorageDao;
@Inject AccountManager _accountMgr;
@Inject NetworkManager _networkMgr;
+ @Inject ClusterDao _clusterDao;
@Inject(adapter=SecurityChecker.class)
Adapters _secChecker;
@@ -242,7 +232,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
throw new CloudRuntimeException("Failed to update configuration value. Please contact Cloud Support.");
}
- saveConfigurationEvent(userId, null, EventTypes.EVENT_CONFIGURATION_VALUE_EDIT, "Successfully edited configuration value.", "name=" + name, "value=" + value);
}
@Override
@@ -496,11 +485,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
@DB
public boolean deletePod(DeletePodCmd cmd) {
Long podId = cmd.getId();
- Long userId = 1L;
-
- if (UserContext.current() != null) {
- userId = UserContext.current().getCallerUserId();
- }
// Make sure the pod exists
if (!validPod(podId)) {
@@ -510,7 +494,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
checkIfPodIsDeletable(podId);
HostPodVO pod = _podDao.findById(podId);
- DataCenterVO zone = _zoneDao.findById(pod.getDataCenterId());
//Delete private ip addresses for the pod if there are any
List privateIps = _privateIpAddressDao.listByPodIdDcId(Long.valueOf(podId), pod.getDataCenterId());
@@ -538,7 +521,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
throw new CloudRuntimeException("Failed to delete pod " + podId);
}
- saveConfigurationEvent(userId, null, EventTypes.EVENT_POD_DELETE, "Successfully deleted pod with name: " + pod.getName() + " in zone: " + zone.getName() + ".", "podId=" + podId, "dcId=" + zone.getId());
return true;
}
@@ -554,7 +536,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
String cidr = null;
Long id = cmd.getId();
String name = cmd.getPodName();
- Long userId = UserContext.current().getCallerUserId();
//verify parameters
HostPodVO pod = _podDao.findById(id);;
@@ -658,8 +639,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
throw new CloudRuntimeException("Failed to edit pod. Please contact Cloud Support.");
}
- saveConfigurationEvent(userId, null, EventTypes.EVENT_POD_EDIT, "Successfully edited pod. New pod name is: " + name + " and new zone name is: " + zone.getName() + ".", "podId=" + pod.getId(), "dcId=" + zone.getId(), "gateway=" + gateway, "cidr=" + cidr, "startIp=" + startIp, "endIp=" + endIp);
-
return pod;
}
@@ -742,9 +721,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
throw new CloudRuntimeException("Failed to create new pod. Please contact Cloud Support.");
}
- DataCenterVO zone = _zoneDao.findById(zoneId);
- saveConfigurationEvent(userId, null, EventTypes.EVENT_POD_CREATE, "Successfully created new pod with name: " + podName + " in zone: " + zone.getName() + ".", "podId=" + pod.getId(), "zoneId=" + zone.getId(), "gateway=" + gateway, "cidr=" + cidr, "startIp=" + startIp, "endIp=" + endIp);
-
return pod;
}
@@ -922,8 +898,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
checkIfZoneIsDeletable(zoneId);
- DataCenterVO zone = _zoneDao.findById(zoneId);
-
boolean success = _zoneDao.expunge(zoneId);
try {
@@ -949,7 +923,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
}
if (success){
- saveConfigurationEvent(userId, null, EventTypes.EVENT_ZONE_DELETE, "Successfully deleted zone with name: " + zone.getName() + ".", "dcId=" + zoneId);
return true;
} else{
return false;
@@ -1094,48 +1067,9 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
}
if(dnsUpdate){
-
- //Update dns for domRs in zone
-
- List DomainRouters = _domrDao.listByDataCenter(zoneId);
-
- for(DomainRouterVO domR : DomainRouters)
- {
- domR.setDns1(dns1);
- domR.setDns2(dns2);
- _domrDao.update(domR.getId(), domR);
- }
-
- //Update dns for console proxies in zone
- List ConsoleProxies = _vmInstanceDao.listByZoneIdAndType(zoneId, VirtualMachine.Type.ConsoleProxy);
-
- for(VMInstanceVO consoleVm : ConsoleProxies)
- {
- ConsoleProxyVO proxy = _consoleDao.findById(consoleVm.getId());
- if( proxy!= null ){
- proxy.setDns1(dns1);
- proxy.setDns2(dns2);
- _consoleDao.update(proxy.getId(), proxy);
- }
- }
-
- //Update dns for secondary storage Vms in zone
- List storageVms = _vmInstanceDao.listByZoneIdAndType(zoneId, VirtualMachine.Type.SecondaryStorageVm);
-
- for(VMInstanceVO storageVm : storageVms)
- {
- SecondaryStorageVmVO secStorageVm = _secStorageDao.findById(storageVm.getId());
- if( secStorageVm!= null ){
- secStorageVm.setDns1(dns1);
- secStorageVm.setDns2(dns2);
- _secStorageDao.update(secStorageVm.getId(), secStorageVm);
- }
- }
-
+ // FIXME: Need to update dns in network rather than in the vms.
}
- saveConfigurationEvent(userId, null, EventTypes.EVENT_ZONE_EDIT, "Successfully edited zone with name: " + zone.getName() + ".", "dcId=" + zone.getId(), "dns1=" + dns1, "dns2=" + dns2, "internalDns1=" + internalDns1, "internalDns2=" + internalDns2, "vnetRange=" + vnetRange, "guestCidr=" + guestCidr);
-
return zone;
}
@@ -1185,12 +1119,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
//Create deafult networks
createDefaultNetworks(zone.getId());
- if (vnetRange != null) {
- saveConfigurationEvent(userId, null, EventTypes.EVENT_ZONE_CREATE, "Successfully created new zone with name: " + zoneName + ".", "dcId=" + zone.getId(), "dns1=" + dns1, "dns2=" + dns2, "internalDns1=" + internalDns1, "internalDns2=" + internalDns2, "vnetRange=" + vnetRange, "guestCidr=" + guestCidr);
- } else {
- saveConfigurationEvent(userId, null, EventTypes.EVENT_ZONE_CREATE, "Successfully created new zone with name: " + zoneName + ".", "dcId=" + zone.getId(), "dns1=" + dns1, "dns2=" + dns2, "internalDns1=" + internalDns1, "internalDns2=" + internalDns2, "guestCidr=" + guestCidr);
- }
-
txn.commit();
return zone;
} catch (Exception ex) {
@@ -1368,8 +1296,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
ServiceOfferingVO offering = new ServiceOfferingVO(name, cpu, ramSize, speed, networkRate, multicastRate, offerHA, displayText, guestIpType, localStorageRequired, false, tags, false,domainId);
if ((offering = _serviceOfferingDao.persist(offering)) != null) {
- saveConfigurationEvent(userId, null, EventTypes.EVENT_SERVICE_OFFERING_CREATE, "Successfully created new service offering with name: " + name + ".", "soId=" + offering.getId(), "name=" + name, "numCPUs=" + cpu, "ram=" + ramSize, "cpuSpeed=" + speed,
- "displayText=" + displayText, "guestIPType=" + guestIpType, "localStorageRequired=" + localStorageRequired, "offerHA=" + offerHA, "useVirtualNetwork=" + useVirtualNetwork, "tags=" + tags);
return offering;
} else {
return null;
@@ -1444,8 +1370,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
if (_serviceOfferingDao.update(id, offering)) {
offering = _serviceOfferingDao.findById(id);
- saveConfigurationEvent(userId, null, EventTypes.EVENT_SERVICE_OFFERING_EDIT, "Successfully updated service offering with name: " + offering.getName() + ".", "soId=" + offering.getId(), "name=" + offering.getName(),
- "displayText=" + offering.getDisplayText(), "offerHA=" + offering.getOfferHA(), "useVirtualNetwork=" + (offering.getGuestIpType() == Network.GuestIpType.Virtual), "tags=" + offering.getTags(), "domainId=" + offering.getDomainId());
return offering;
} else {
return null;
@@ -1548,8 +1472,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
// }
if (_diskOfferingDao.update(diskOfferingId, diskOffering)) {
- saveConfigurationEvent(UserContext.current().getCallerUserId(), null, EventTypes.EVENT_DISK_OFFERING_EDIT, "Successfully updated disk offering with name: " + diskOffering.getName() + ".", "doId=" + diskOffering.getId(), "name=" + diskOffering.getName(),
- "displayText=" + diskOffering.getDisplayText(), "diskSize=" + diskOffering.getDiskSize(),"tags=" + diskOffering.getTags(),"domainId="+cmd.getDomainId());
return _diskOfferingDao.findById(diskOfferingId);
} else {
return null;
@@ -1592,8 +1514,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
}
if (_serviceOfferingDao.remove(offeringId)) {
- saveConfigurationEvent(userId, null, EventTypes.EVENT_SERVICE_OFFERING_EDIT, "Successfully deleted service offering with name: " + offering.getName(), "soId=" + offeringId, "name=" + offering.getName(),
- "displayText=" + offering.getDisplayText(), "offerHA=" + offering.getOfferHA(), "useVirtualNetwork=" + (offering.getGuestIpType() == GuestIpType.Virtual));
return true;
} else {
return false;
@@ -1620,7 +1540,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
}
@Override
- public Vlan createVlanAndPublicIpRange(CreateVlanIpRangeCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException {
+ public Vlan createVlanAndPublicIpRange(CreateVlanIpRangeCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException, ResourceUnavailableException {
Long zoneId = cmd.getZoneId();
Long podId = cmd.getPodId();
String startIP = cmd.getStartIp();
@@ -1724,7 +1644,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
@Override
- public Vlan createVlanAndPublicIpRange(Long userId, Long zoneId, Long podId, String startIP, String endIP, String vlanGateway, String vlanNetmask, boolean forVirtualNetwork, String vlanId, Account account, Long networkId) throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException{
+ public Vlan createVlanAndPublicIpRange(Long userId, Long zoneId, Long podId, String startIP, String endIP, String vlanGateway, String vlanNetmask, boolean forVirtualNetwork, String vlanId, Account account, Long networkId) throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException, ResourceUnavailableException{
// Check that the pod ID is valid
if (podId != null && ((_podDao.findById(podId)) == null)) {
@@ -1771,20 +1691,8 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
throw new CloudRuntimeException("For adding an untagged IP range, please set up xen.public.network.device");
}
}
-
}
- //if we have an ip range for vlan id=x, vlantype=y; we should
- //only allow adding another range with id=x for same type y
- if (!vlanId.equals(Vlan.UNTAGGED)) {
- VlanVO vlanHandle = _vlanDao.findByZoneAndVlanId(zoneId, vlanId);
-
- if (vlanHandle!=null && !vlanHandle.getVlanType().equals(vlanType)) {
- throw new InvalidParameterValueException("This vlan id is already associated with the vlan type "+vlanHandle.getVlanType().toString()
- +",whilst you are trying to associate it with vlan type "+vlanType.toString());
- }
- }
-
//ACL check
checkAccess(account, zone);
@@ -1803,11 +1711,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
associateIpRangeToAccount = true;
}
} else if (vlanType.equals(VlanType.DirectAttached)) {
-// if (!((account != null && podId == null) ||
-// (account == null && podId != null))) {
-// throw new InvalidParameterValueException("Direct Attached IP ranges must either be pod-wide, or for one account.");
-// }
-
if (account != null) {
// VLANs for an account must be tagged
if (vlanId.equals(Vlan.UNTAGGED)) {
@@ -1827,7 +1730,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
throw new InvalidParameterValueException("Direct Attached IP ranges for a pod must be untagged.");
}
-
// Make sure there aren't any account VLANs in this zone
List accountVlanMaps = _accountVlanMapDao.listAllIncludingRemoved();
for (AccountVlanMapVO accountVlanMap : accountVlanMaps) {
@@ -1934,14 +1836,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
VlanVO vlan = new VlanVO(vlanType, vlanId, vlanGateway, vlanNetmask, zone.getId(), ipRange, networkId);
vlan = _vlanDao.persist(vlan);
- // Persist the IP range
- if (account != null && vlanType.equals(VlanType.VirtualNetwork)){
- if(!savePublicIPRangeForAccount(startIP, endIP, zoneId, vlan.getId(), account.getId(), account.getDomainId())) {
- deletePublicIPRange(vlan.getId());
- _vlanDao.expunge(vlan.getId());
- throw new CloudRuntimeException("Failed to save IP range. Please contact Cloud Support."); //It can be Direct IP or Public IP.
- }
- }else if (!savePublicIPRange(startIP, endIP, zoneId, vlan.getId())) {
+ if (!savePublicIPRange(startIP, endIP, zoneId, vlan.getId())) {
deletePublicIPRange(vlan.getId());
_vlanDao.expunge(vlan.getId());
throw new CloudRuntimeException("Failed to save IP range. Please contact Cloud Support."); //It can be Direct IP or Public IP.
@@ -1962,96 +1857,15 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
eventMsg += ", end IP = " + endIP;
}
eventMsg += ".";
- Long accountId = ((account == null) ? Account.ACCOUNT_ID_SYSTEM : account.getId());
- saveConfigurationEvent(userId, accountId, EventTypes.EVENT_VLAN_IP_RANGE_CREATE, eventMsg, "vlanType=" + vlanType, "dcId=" + zoneId,
- "accountId=" + accountId, "podId=" + podId,
- "vlanId=" + vlanId, "vlanGateway=" + vlanGateway,
- "vlanNetmask=" + vlanNetmask, "startIP=" + startIP,
- "endIP=" + endIP);
-
if (associateIpRangeToAccount) {
// if this is an account VLAN, now associate the IP Addresses to the account
- associateIpAddressListToAccount(userId, account.getId(), zoneId, vlan.getId());
+ long ipCount = _publicIpAddressDao.countIPs(zoneId, vlan.getId(), false);
+ _accountMgr.incrementResourceCount(account.getId(), ResourceType.public_ip, ipCount);
+ s_logger.trace("Updated " + ResourceType.public_ip + " resource count on " + ipCount + " for account " + account);
+ _networkMgr.associateIpAddressListToAccount(userId, account.getId(), zoneId, vlan.getId());
}
return vlan;
}
-
- @Override @DB
- public void associateIpAddressListToAccount(long userId, long accountId, long zoneId, Long vlanId) throws InsufficientAddressCapacityException,
- ConcurrentOperationException {
-
- Transaction txn = Transaction.currentTxn();
- AccountVO account = null;
-
- try {
- //Acquire Lock
- account = _accountDao.acquireInLockTable(accountId);
- if (account == null) {
- s_logger.warn("Unable to lock account: " + accountId);
- throw new ConcurrentOperationException("Unable to acquire account lock");
- }
- s_logger.debug("Associate IP address lock acquired");
-
- //Get Router
- DomainRouterVO router = _domrDao.findBy(accountId, zoneId);
- if (router == null) {
- s_logger.debug("No router found for account: " + account.getAccountName() + ".");
- return;
- }
-
- if (router.getState() == State.Running) {
- //Get Vlans associated with the account
- List vlansForAccount = new ArrayList();
- if (vlanId == null){
- vlansForAccount.addAll(_vlanDao.listVlansForAccountByType(zoneId, account.getId(), VlanType.VirtualNetwork));
- s_logger.debug("vlansForAccount "+ vlansForAccount);
- }else{
- vlansForAccount.add(_vlanDao.findById(vlanId));
- }
-
- // Creating a list of all the ips that can be assigned to this account
- txn.start();
- List ipAddrsList = new ArrayList();
- for (VlanVO vlan : vlansForAccount){
- ipAddrsList.addAll(_publicIpAddressDao.assignAcccountSpecificIps(accountId, account.getDomainId(), vlan.getId(), false));
-
- long size = ipAddrsList.size();
- _accountMgr.incrementResourceCount(accountId, ResourceType.public_ip, size);
- s_logger.debug("Assigning new ip addresses " +ipAddrsList);
- }
- if(ipAddrsList.isEmpty()) {
- return;
- }
-
- // Associate the IP's to DomR
- boolean success = _networkMgr.associateIP(router,ipAddrsList, true, 0);
- String errorMsg = "Unable to assign public IP address pool";
- if (!success) {
- s_logger.debug(errorMsg);
- for(String ip : ipAddrsList){
- EventUtils.saveEvent(userId, accountId, EventVO.LEVEL_ERROR, EventTypes.EVENT_NET_IP_ASSIGN, "Unable to assign public IP " +ip);
- }
- throw new CloudRuntimeException(errorMsg);
- }
- txn.commit();
- for(String ip : ipAddrsList){
- EventUtils.saveEvent(userId, accountId, EventVO.LEVEL_INFO, EventTypes.EVENT_NET_IP_ASSIGN, "Successfully assigned account IP " +ip);
- }
- }
- } catch (CloudRuntimeException iee) {
- s_logger.error("Associate IP threw an CloudRuntimeException.", iee);
- throw iee;
- } catch (Throwable t) {
- s_logger.error("Associate IP address threw an exception.", t);
- throw new CloudRuntimeException("Associate IP address exception");
- } finally {
- if (account != null) {
- _accountDao.releaseFromLockTable(accountId);
- s_logger.debug("Associate IP address lock released");
- }
- }
-
- }
@Override
public boolean deleteVlanAndPublicIpRange(long userId, long vlanDbId) throws InvalidParameterValueException {
@@ -2060,28 +1874,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
throw new InvalidParameterValueException("Please specify a valid IP range id.");
}
- // Check if the VLAN has any allocated public IPs
- if (_publicIpAddressDao.countIPs(vlan.getDataCenterId(), vlanDbId, true) > 0) {
- throw new InvalidParameterValueException("The IP range can't be deleted because it has allocated public IP addresses.");
- }
-
- // Check if the VLAN is being used by any domain router
- if (_domrDao.listByVlanDbId(vlanDbId).size() > 0) {
- throw new InvalidParameterValueException("The IP range can't be deleted because it is being used by a domain router.");
- }
-
- Long accountId = null;
- Long podId = null;
- List accountVlanMaps = _accountVlanMapDao.listAccountVlanMapsByVlan(vlanDbId);
- List podVlanMaps = _podVlanMapDao.listPodVlanMapsByVlan(vlanDbId);
-
- if (accountVlanMaps.size() > 0) {
- accountId = accountVlanMaps.get(0).getAccountId();
- }
-
- if (podVlanMaps.size() > 0) {
- podId = podVlanMaps.get(0).getPodId();
- }
+ // Check if the VLAN has any allocated public IPs
+ if (_publicIpAddressDao.countIPs(vlan.getDataCenterId(), vlanDbId, true) > 0) {
+ throw new InvalidParameterValueException("The IP range can't be deleted because it has allocated public IP addresses.");
+ }
// Delete all public IPs in the VLAN
if (!deletePublicIPRange(vlanDbId)) {
@@ -2089,25 +1885,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
}
// Delete the VLAN
- boolean success = _vlanDao.expunge(vlanDbId);
-
- if (success) {
- String[] ipRange = vlan.getIpRange().split("\\-");
- String startIP = ipRange[0];
- String endIP = (ipRange.length > 1) ? ipRange[1] : null;
- String eventMsg = "Successfully deleted IP range (tag = " + vlan.getVlanTag() + ", gateway = " + vlan.getVlanGateway() + ", netmask = " + vlan.getVlanNetmask() + ", start IP = " + startIP;
- if (endIP != null) {
- eventMsg += ", end IP = " + endIP;
- }
- eventMsg += ".";
- saveConfigurationEvent(userId, null, EventTypes.EVENT_VLAN_IP_RANGE_DELETE, eventMsg, "vlanType=" + vlan.getVlanType(), "dcId=" + vlan.getDataCenterId(),
- "accountId=" + accountId, "podId=" + podId,
- "vlanId=" + vlan.getVlanTag(), "vlanGateway=" + vlan.getVlanGateway(),
- "vlanNetmask=" + vlan.getVlanNetmask(), "startIP=" + startIP,
- "endIP=" + endIP);
- }
-
- return success;
+ return _vlanDao.expunge(vlanDbId);
}
@Override
@@ -2241,33 +2019,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
return true;
}
- @DB
- protected boolean savePublicIPRangeForAccount(String startIP, String endIP, long zoneId, long vlanDbId, long accountId, long domainId) {
- IPRangeConfig config = new IPRangeConfig();
- Transaction txn = Transaction.currentTxn();
- txn.start();
- long startIPLong = NetUtils.ip2Long(startIP);
- long endIPLong = NetUtils.ip2Long(endIP);
- Vector ips = config.savePublicIPRange(txn, startIPLong, endIPLong, zoneId, vlanDbId);
- List skip = new ArrayList(ips.size());
- for (String ip : ips) {
- skip.add(NetUtils.ip2Long(ip));
- }
- for (long ip = startIPLong; ip <= endIPLong; ip++) {
- if (skip.contains(ip)) {
- continue;
- }
-
- IPAddressVO addr = _publicIpAddressDao.findById(new Ip(ip));
- addr.setAllocatedInDomainId(domainId);
- addr.setAllocatedTime(new Date());
- addr.setAllocatedToAccountId(accountId);
- _publicIpAddressDao.update(addr.getAddress(), addr);
- }
- txn.commit();
- return true;
- }
-
@DB
protected List savePrivateIPRange(String startIP, String endIP, long podId, long zoneId) {
Transaction txn = Transaction.currentTxn();
@@ -2523,48 +2274,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
}
}
- @Override
- public Long saveConfigurationEvent(long userId, Long accountId, String type, String description, String... paramsList) {
- UserVO user = _userDao.findById(userId);
- long accountIdToUse = (accountId != null) ? accountId : user.getAccountId();
-
- String eventParams = "";
- String logParams = "";
- for (int i = 0; i < paramsList.length; i++) {
- String param = paramsList[i];
- boolean lastParam = (i == (paramsList.length - 1));
-
- logParams += param;
- if (!lastParam) {
- logParams += ", ";
- }
-
- String[] valList = param.split("\\=");
- String val = (valList.length < 2) ? "null" : valList[1];
- if (val.equals("null")) {
- continue;
- }
-
- eventParams += param;
- if (!lastParam) {
- eventParams += "\n";
- }
- }
-
- EventVO event = new EventVO();
- event.setUserId(userId);
- event.setAccountId(accountIdToUse);
- event.setType(type);
- event.setDescription(description);
- event.setLevel(EventVO.LEVEL_INFO);
- event.setParameters(eventParams);
- event = _eventDao.persist(event);
-
- s_logger.debug("User " + user.getUsername() + " performed configuration action: " + type + ", " + description + " | params: " + logParams);
-
- return event.getId();
- }
-
private String[] getLinkLocalIPRange() throws InvalidParameterValueException {
String ipNums = _configDao.getValue("linkLocalIp.nums");
int nums = Integer.parseInt(ipNums);
@@ -2614,10 +2323,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
if (vlan == null) {
throw new InvalidParameterValueException("Please specify a valid IP range id.");
}
-
-// if (vlan.getNetworkId() != null) {
-// throw new InvalidParameterValueException("Fail to delete a vlan range as there are networks associated with it");
-// }
return deleteVlanAndPublicIpRange(userId, vlanDbId);
@@ -2725,8 +2430,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
NetworkOfferingVO offering = new NetworkOfferingVO(name, displayText, trafficType, false, specifyVlan, networkRate, multicastRate, maxConnections, false, availability, false, false, false, false, false, false, false);
if ((offering = _networkOfferingDao.persist(offering)) != null) {
- saveConfigurationEvent(userId, null, EventTypes.EVENT_NETWORK_OFFERING_CREATE, "Successfully created new network offering with name: " + name + ".", "noId=" + offering.getId(), "name=" + name,
- "displayText=" + displayText, "tags=" + tags);
return offering;
} else {
return null;
@@ -2796,7 +2499,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
@Override
public boolean deleteNetworkOffering(DeleteNetworkOfferingCmd cmd) throws InvalidParameterValueException{
Long offeringId = cmd.getId();
- Long userId = UserContext.current().getCallerUserId();
//Verify network offering id
NetworkOfferingVO offering = _networkOfferingDao.findById(offeringId);
@@ -2812,8 +2514,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
}
if (_networkOfferingDao.remove(offeringId)) {
- saveConfigurationEvent(userId, null, EventTypes.EVENT_NETWORK_OFFERING_DELETE, "Successfully deleted network offering with name: " + offering.getName(), "noId=" + offeringId, "name=" + offering.getName(),
- "displayText=" + offering.getDisplayText());
return true;
} else {
return false;
@@ -2889,4 +2589,94 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
public DataCenterVO getZone(long id){
return _zoneDao.findById(id);
}
+
+ @Override
+ public NetworkOffering getNetworkOffering(long id) {
+ return _networkOfferingDao.findById(id);
+ }
+
+ @Override
+ public Integer getNetworkRate(long networkOfferingId) {
+ NetworkOffering no = getNetworkOffering(networkOfferingId);
+ Integer networkRate = null;
+ if (no == null) {
+ throw new InvalidParameterValueException("Unable to find network offering by id=" + networkOfferingId);
+ }
+ if (no.getRateMbps() != null) {
+ networkRate = no.getRateMbps();
+ } else {
+ networkRate = Integer.parseInt(_configDao.getValue(Config.NetworkThrottlingRate.key()));
+ }
+
+ return networkRate;
+ }
+
+ @Override
+ public Account getVlanAccount(long vlanId) {
+ Vlan vlan = _vlanDao.findById(vlanId);
+ Long accountId = null;
+
+ //if vlan is Virtual Account specific, get vlan information from the accountVlanMap; otherwise get account information from the network
+ if (vlan.getVlanType() == VlanType.VirtualNetwork) {
+ List maps = _accountVlanMapDao.listAccountVlanMapsByVlan(vlanId);
+ if (maps != null && !maps.isEmpty()) {
+ return _accountMgr.getAccount(maps.get(0).getAccountId());
+ }
+ }
+
+ Long networkId = vlan.getNetworkId();
+ if (networkId != null) {
+ Network network = _networkMgr.getNetwork(networkId);
+ if (network != null) {
+ accountId = network.getAccountId();
+ }
+ }
+
+ return _accountMgr.getAccount(accountId);
+ }
+
+ @Override
+ public List listNetworkOfferings(TrafficType trafficType, boolean systemOnly) {
+ Filter searchFilter = new Filter(NetworkOfferingVO.class, "created", false, null, null);
+ SearchCriteria sc = _networkOfferingDao.createSearchCriteria();
+ if (trafficType != null) {
+ sc.addAnd("trafficType", SearchCriteria.Op.EQ, trafficType);
+ }
+ sc.addAnd("systemOnly", SearchCriteria.Op.EQ, systemOnly);
+
+ return _networkOfferingDao.search(sc, searchFilter);
+ }
+
+ @Override @DB
+ public boolean deleteAccountSpecificVirtualRanges(long accountId) {
+ List maps = _accountVlanMapDao.listAccountVlanMapsByAccount(accountId);
+ boolean result = true;
+ if (maps != null && !maps.isEmpty()) {
+ Transaction txn = Transaction.currentTxn();
+ txn.start();
+ for (AccountVlanMapVO map : maps) {
+ if (!deleteVlanAndPublicIpRange(_accountMgr.getSystemUser().getId(), map.getVlanDbId())) {
+ result = false;
+ }
+ }
+ if (result) {
+ txn.commit();
+ } else {
+ s_logger.error("Failed to delete account specific virtual ip ranges for account id=" + accountId);
+ }
+ } else {
+ s_logger.trace("Account id=" + accountId + " has no account specific virtual ip ranges, nothing to delete");
+ }
+ return result;
+ }
+
+ @Override
+ public HostPodVO getPod(long id) {
+ return _podDao.findById(id);
+ }
+
+ @Override
+ public ClusterVO getCluster(long id) {
+ return _clusterDao.findById(id);
+ }
}
diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
index 6ba6c5edf5c..c373dbdaa87 100644
--- a/server/src/com/cloud/configuration/DefaultComponentLibrary.java
+++ b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
@@ -73,7 +73,11 @@ import com.cloud.network.dao.RemoteAccessVpnDaoImpl;
import com.cloud.network.dao.VpnUserDaoImpl;
import com.cloud.network.lb.LoadBalancingRulesManagerImpl;
import com.cloud.network.ovs.OvsNetworkManagerImpl;
+import com.cloud.network.ovs.OvsTunnelManagerImpl;
import com.cloud.network.ovs.dao.GreTunnelDaoImpl;
+import com.cloud.network.ovs.dao.OvsTunnelAccountDao;
+import com.cloud.network.ovs.dao.OvsTunnelAccountDaoImpl;
+import com.cloud.network.ovs.dao.OvsTunnelDaoImpl;
import com.cloud.network.ovs.dao.OvsWorkDaoImpl;
import com.cloud.network.ovs.dao.VlanMappingDaoImpl;
import com.cloud.network.ovs.dao.VlanMappingDirtyDaoImpl;
@@ -251,6 +255,8 @@ public class DefaultComponentLibrary implements ComponentLibrary {
addDao("OvsWorkDao", OvsWorkDaoImpl.class);
addDao("VmFlowLogDao", VmFlowLogDaoImpl.class);
addDao("GreTunnelDao", GreTunnelDaoImpl.class);
+ addDao("OvsTunnelDao", OvsTunnelDaoImpl.class);
+ addDao("OvsTunnelAccountDao", OvsTunnelAccountDaoImpl.class);
}
Map> _managers = new HashMap>();
@@ -306,6 +312,7 @@ public class DefaultComponentLibrary implements ComponentLibrary {
addManager("RulesManager", RulesManagerImpl.class);
addManager("RemoteAccessVpnManager", RemoteAccessVpnManagerImpl.class);
addManager("OvsNetworkManager", OvsNetworkManagerImpl.class);
+ addManager("OvsTunnelManager", OvsTunnelManagerImpl.class);
}
protected List> addAdapterChain(Class interphace, List>> adapters) {
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 1d8a0cb1013..2ca2e0de0f7 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -75,9 +75,6 @@ import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.HostPodDao;
import com.cloud.deploy.DataCenterDeployment;
import com.cloud.deploy.DeployDestination;
-import com.cloud.event.EventTypes;
-import com.cloud.event.EventUtils;
-import com.cloud.event.EventVO;
import com.cloud.event.dao.EventDao;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.ConcurrentOperationException;
@@ -340,8 +337,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
try {
if (proxyLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_SYNC)) {
try {
- long accountId = proxy.getAccountId();
- long startEventId = EventUtils.saveStartedEvent(User.UID_SYSTEM, accountId, EventTypes.EVENT_PROXY_START, "Starting proxy : " + proxy.getName());
proxy = startProxy(proxyVmId);
if (proxy == null) {
@@ -363,7 +358,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
if (s_logger.isInfoEnabled()) {
s_logger.info("Unable to start console proxy, proxy vm Id : " + proxyVmId + " will recycle it and restart a new one");
}
- EventUtils.saveEvent(User.UID_SYSTEM, accountId, EventVO.LEVEL_ERROR, EventTypes.EVENT_PROXY_START, "Failed to start console proxy", startEventId);
destroyProxy(proxyVmId);
return null;
} else {
@@ -371,7 +365,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
s_logger.trace("Console proxy " + proxy.getName() + " is started");
}
- EventUtils.saveEvent(User.UID_SYSTEM, accountId, EventVO.LEVEL_INFO, EventTypes.EVENT_PROXY_START, "Started console proxy: "+proxy.getName(), startEventId);
// if it is a new assignment or a changed assignment,
// update the
// record
@@ -644,7 +637,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
}
- long startEventId = EventUtils.saveStartedEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_PROXY_CREATE, "Creating console proxy");
Map context = createProxyInstance(dataCenterId);
long proxyVmId = (Long) context.get("proxyVmId");
@@ -652,14 +644,12 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
if (s_logger.isTraceEnabled()) {
s_logger.trace("Creating proxy instance failed, data center id : " + dataCenterId);
}
- EventUtils.saveEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventVO.LEVEL_ERROR, EventTypes.EVENT_PROXY_CREATE, "console proxy creation failed", startEventId);
return null;
}
ConsoleProxyVO proxy = _consoleProxyDao.findById(proxyVmId);
// allocProxyStorage(dataCenterId, proxyVmId);
if (proxy != null) {
- EventUtils.saveEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventVO.LEVEL_INFO, EventTypes.EVENT_PROXY_CREATE, "Succesfully created console proxy", startEventId);
SubscriptionMgr.getInstance().notifySubscribers(ConsoleProxyManager.ALERT_SUBJECT, this,
new ConsoleProxyAlertEventArgs(ConsoleProxyAlertEventArgs.PROXY_CREATED, dataCenterId, proxy.getId(), proxy, null));
return proxy;
@@ -673,7 +663,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
this,
new ConsoleProxyAlertEventArgs(ConsoleProxyAlertEventArgs.PROXY_CREATE_FAILURE, dataCenterId, proxyVmId, null,
"Unable to allocate storage"));
- EventUtils.saveEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventVO.LEVEL_ERROR, EventTypes.EVENT_PROXY_CREATE, "console proxy creation failed", startEventId);
}
return null;
}
@@ -936,7 +925,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
return;
}
console.setPrivateIpAddress(cmd.getPrivateIpAddress());
- console.setPrivateNetmask(cmd.getPrivateNetmask());
console.setPublicIpAddress(cmd.getPublicIpAddress());
console.setPublicNetmask(cmd.getPublicNetmask());
_consoleProxyDao.persist(console);
@@ -1171,8 +1159,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
if (proxy != null) {
long proxyVmId = proxy.getId();
GlobalLock proxyLock = GlobalLock.getInternLock(getProxyLockName(proxyVmId));
- long accountId = proxy.getAccountId();
- long startEventId = EventUtils.saveStartedEvent(User.UID_SYSTEM, accountId, EventTypes.EVENT_PROXY_START, "Starting proxy : " + proxy.getName());
try {
if (proxyLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_SYNC)) {
try {
@@ -1195,7 +1181,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
s_logger.info("Unable to start console proxy for standby capacity, proxy vm Id : " + proxyVmId
+ ", will recycle it and start a new one");
}
- EventUtils.saveEvent(User.UID_SYSTEM, accountId, EventVO.LEVEL_ERROR, EventTypes.EVENT_PROXY_START, "Failed to start console proxy", startEventId);
if (proxyFromStoppedPool) {
destroyProxy(proxyVmId);
@@ -1204,8 +1189,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
if (s_logger.isInfoEnabled()) {
s_logger.info("Console proxy " + proxy.getName() + " is started");
}
-
- EventUtils.saveEvent(User.UID_SYSTEM, accountId, EventVO.LEVEL_INFO, EventTypes.EVENT_PROXY_START, "Started console proxy: "+proxy.getName(), startEventId);
}
}
}
@@ -1682,13 +1665,8 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
proxy.setPublicIpAddress(nic.getIp4Address());
proxy.setPublicNetmask(nic.getNetmask());
proxy.setPublicMacAddress(nic.getMacAddress());
- } else if (network.getTrafficType() == TrafficType.Control) {
- proxy.setGuestIpAddress(nic.getIp4Address());
- proxy.setGuestNetmask(nic.getNetmask());
- proxy.setGuestMacAddress(nic.getMacAddress());
} else if (network.getTrafficType() == TrafficType.Management) {
proxy.setPrivateIpAddress(nic.getIp4Address());
- proxy.setPrivateNetmask(nic.getNetmask());
proxy.setPrivateMacAddress(nic.getMacAddress());
}
}
diff --git a/server/src/com/cloud/dc/dao/ClusterDao.java b/server/src/com/cloud/dc/dao/ClusterDao.java
index 35a3f563836..da7e574911b 100644
--- a/server/src/com/cloud/dc/dao/ClusterDao.java
+++ b/server/src/com/cloud/dc/dao/ClusterDao.java
@@ -26,4 +26,5 @@ public interface ClusterDao extends GenericDao {
List listByPodId(long podId);
ClusterVO findBy(String name, long podId);
List listByHyTypeWithoutGuid(String hyType);
+ List listByZoneId(long zoneId);
}
diff --git a/server/src/com/cloud/dc/dao/ClusterDaoImpl.java b/server/src/com/cloud/dc/dao/ClusterDaoImpl.java
index d400df284af..a76e30186ae 100644
--- a/server/src/com/cloud/dc/dao/ClusterDaoImpl.java
+++ b/server/src/com/cloud/dc/dao/ClusterDaoImpl.java
@@ -31,6 +31,7 @@ public class ClusterDaoImpl extends GenericDaoBase implements C
protected final SearchBuilder PodSearch;
protected final SearchBuilder HyTypeWithoutGuidSearch;
+ protected final SearchBuilder ZoneSearch;
protected ClusterDaoImpl() {
super();
@@ -43,6 +44,17 @@ public class ClusterDaoImpl extends GenericDaoBase implements C
PodSearch.and("pod", PodSearch.entity().getPodId(), SearchCriteria.Op.EQ);
PodSearch.and("name", PodSearch.entity().getName(), SearchCriteria.Op.EQ);
PodSearch.done();
+
+ ZoneSearch = createSearchBuilder();
+ ZoneSearch.and("dataCenterId", ZoneSearch.entity().getPodId(), SearchCriteria.Op.EQ);
+ ZoneSearch.done();
+ }
+
+ @Override
+ public List listByZoneId(long zoneId) {
+ SearchCriteria sc = ZoneSearch.create();
+ sc.setParameters("dataCenterId", zoneId);
+ return listBy(sc);
}
@Override
diff --git a/server/src/com/cloud/event/ActionEventCallback.java b/server/src/com/cloud/event/ActionEventCallback.java
index 65da7e6a8b0..c25ac2e7a1c 100644
--- a/server/src/com/cloud/event/ActionEventCallback.java
+++ b/server/src/com/cloud/event/ActionEventCallback.java
@@ -24,36 +24,14 @@ import net.sf.cglib.proxy.Callback;
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
-import com.cloud.user.Account;
-import com.cloud.user.User;
import com.cloud.user.UserContext;
import com.cloud.utils.component.AnnotationInterceptor;
public class ActionEventCallback implements MethodInterceptor, AnnotationInterceptor {
- boolean create = false;
- private String eventType = null;
- private long accountId = Account.ACCOUNT_ID_SYSTEM;
- private long userId = User.UID_SYSTEM;
- private String description = null;
- private long startEventId = 0;
@Override
public Object intercept(Object object, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
- ActionEvent actionEvent = method.getAnnotation(ActionEvent.class);
- EventVO event = null;
- if (actionEvent != null) {
- create = actionEvent.create();
- UserContext ctx = UserContext.current();
- Long userID = ctx.getCallerUserId();
- userId = (userID == null) ? User.UID_SYSTEM : userID;
- eventType = actionEvent.eventType();
- description = actionEvent.eventDescription();
- startEventId = ctx.getStartEventId();
-
- if(!create){
- event = interceptStart(method);
- }
- }
+ EventVO event = interceptStart(method);;
try {
return methodProxy.invokeSuper(object, args);
} finally {
@@ -70,30 +48,25 @@ public class ActionEventCallback implements MethodInterceptor, AnnotationInterce
Method method = (Method)element;
ActionEvent actionEvent = method.getAnnotation(ActionEvent.class);
if (actionEvent != null) {
- create = actionEvent.create();
return true;
}
- Class clazz = method.getDeclaringClass();
- do {
- actionEvent = clazz.getAnnotation(ActionEvent.class);
- if (actionEvent != null) {
- return true;
- }
- clazz = clazz.getSuperclass();
- } while (clazz != Object.class && clazz != null);
-
return false;
}
@Override
public EventVO interceptStart(AnnotatedElement element) {
EventVO event = null;
- if(eventType != null){
- long eventId = EventUtils.saveStartedEvent(userId, accountId, eventType, description, startEventId);
- if(startEventId == 0){
- // There was no scheduled event. so Started event Id
- startEventId = eventId;
+ Method method = (Method)element;
+ ActionEvent actionEvent = method.getAnnotation(ActionEvent.class);
+ if (actionEvent != null) {
+ boolean async = actionEvent.async();
+ if(async){
+ UserContext ctx = UserContext.current();
+ long userId = ctx.getCallerUserId();
+ long accountId = ctx.getAccountId();
+ long startEventId = ctx.getStartEventId();
+ EventUtils.saveStartedEvent(userId, accountId, actionEvent.eventType(), actionEvent.eventDescription(), startEventId);
}
}
return event;
@@ -101,25 +74,37 @@ public class ActionEventCallback implements MethodInterceptor, AnnotationInterce
@Override
public void interceptComplete(AnnotatedElement element, EventVO event) {
- if(eventType != null){
- if(create){
+ Method method = (Method)element;
+ ActionEvent actionEvent = method.getAnnotation(ActionEvent.class);
+ if (actionEvent != null) {
+ UserContext ctx = UserContext.current();
+ long userId = ctx.getCallerUserId();
+ long accountId = ctx.getAccountId();
+ long startEventId = ctx.getStartEventId();
+ if(actionEvent.create()){
//This start event has to be used for subsequent events of this action
- startEventId = EventUtils.saveCreatedEvent(userId, accountId, EventVO.LEVEL_INFO, eventType, "Successfully created entity for "+description);
- UserContext ctx = UserContext.current();
+ startEventId = EventUtils.saveCreatedEvent(userId, accountId, EventVO.LEVEL_INFO, actionEvent.eventType(), "Successfully created entity for "+actionEvent.eventDescription());
ctx.setStartEventId(startEventId);
} else {
- EventUtils.saveEvent(userId, accountId, EventVO.LEVEL_INFO, eventType, "Successfully completed "+description, startEventId);
+ EventUtils.saveEvent(userId, accountId, EventVO.LEVEL_INFO, actionEvent.eventType(), "Successfully completed "+actionEvent.eventDescription(), startEventId);
}
}
}
@Override
public void interceptException(AnnotatedElement element, EventVO event) {
- if(eventType != null){
- if(create){
- EventUtils.saveCreatedEvent(userId, accountId, EventVO.LEVEL_ERROR, eventType, "Error while creating entity for "+description);
+ Method method = (Method)element;
+ ActionEvent actionEvent = method.getAnnotation(ActionEvent.class);
+ if (actionEvent != null) {
+ UserContext ctx = UserContext.current();
+ long userId = ctx.getCallerUserId();
+ long accountId = ctx.getAccountId();
+ long startEventId = ctx.getStartEventId();
+ if(actionEvent.create()){
+ long eventId = EventUtils.saveCreatedEvent(userId, accountId, EventVO.LEVEL_ERROR, actionEvent.eventType(), "Error while creating entity for "+actionEvent.eventDescription());
+ ctx.setStartEventId(eventId);
} else {
- EventUtils.saveEvent(userId, accountId, EventVO.LEVEL_ERROR, eventType, "Error while "+description, startEventId);
+ EventUtils.saveEvent(userId, accountId, EventVO.LEVEL_ERROR, actionEvent.eventType(), "Error while "+actionEvent.eventDescription(), startEventId);
}
}
}
diff --git a/server/src/com/cloud/event/EventUtils.java b/server/src/com/cloud/event/EventUtils.java
index 40fd1848843..cfe4104b426 100755
--- a/server/src/com/cloud/event/EventUtils.java
+++ b/server/src/com/cloud/event/EventUtils.java
@@ -20,11 +20,12 @@ public class EventUtils {
/*
* Save event after scheduling an async job
*/
- public static Long saveScheduledEvent(Long userId, Long accountId, String type, String description) {
+ public static Long saveScheduledEvent(Long userId, Long accountId, String type, String description, long startEventId) {
EventVO event = new EventVO();
event.setUserId(userId);
event.setAccountId(accountId);
event.setType(type);
+ event.setStartId(startEventId);
event.setState(Event.State.Scheduled);
event.setDescription("Scheduled async job for "+description);
event = _eventDao.persist(event);
diff --git a/server/src/com/cloud/ha/InvestigatorImpl.java b/server/src/com/cloud/ha/InvestigatorImpl.java
index 3d1e49c6237..eda08a88cf1 100644
--- a/server/src/com/cloud/ha/InvestigatorImpl.java
+++ b/server/src/com/cloud/ha/InvestigatorImpl.java
@@ -62,7 +62,7 @@ public class InvestigatorImpl implements Investigator {
if (vm.getType() == VirtualMachine.Type.User) {
// to verify that the VM is alive, we ask the domR (router) to ping the VM (private IP)
UserVmVO userVm = _userVmDao.findById(vm.getId());
- Long routerId = userVm.getDomainRouterId();
+ Long routerId = null; // FIXME: This doesn't work. Need to grab the domain router from the network.
if (routerId == null) {
/*TODO: checking vm status for external dhcp mode*/
s_logger.debug("It's external dhcp mode, how to checking the vm is alive?");
diff --git a/server/src/com/cloud/ha/StorageFence.java b/server/src/com/cloud/ha/StorageFence.java
deleted file mode 100644
index a1cbddf9ed6..00000000000
--- a/server/src/com/cloud/ha/StorageFence.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-package com.cloud.ha;
-
-import java.util.Map;
-
-import javax.ejb.Local;
-import javax.naming.ConfigurationException;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.host.HostVO;
-import com.cloud.storage.StorageManager;
-import com.cloud.utils.component.ComponentLocator;
-import com.cloud.vm.VMInstanceVO;
-
-@Local(value=FenceBuilder.class)
-public class StorageFence implements FenceBuilder {
- private final static Logger s_logger = Logger.getLogger(StorageFence.class);
-
- String _name;
-
- StorageManager _storageMgr;
-
- public StorageFence() {
- }
-
- @Override
- public Boolean fenceOff(VMInstanceVO vm, HostVO host) {
- s_logger.debug("Asking storage server to unshare " + vm.toString());
- return _storageMgr.unshare(vm, host) != null;
- }
-
- @Override
- public boolean configure(String name, Map params)
- throws ConfigurationException {
- _name = name;
-
- ComponentLocator locator = ComponentLocator.getCurrentLocator();
- if (locator == null) {
- throw new ConfigurationException("Unable to locate the locator!");
- }
-
- _storageMgr = locator.getManager(StorageManager.class);
- if (_storageMgr == null) {
- throw new ConfigurationException("Unable to get " + StorageManager.class);
- }
-
- return true;
- }
-
- @Override
- public String getName() {
- return _name;
- }
-
- @Override
- public boolean start() {
- return true;
- }
-
- @Override
- public boolean stop() {
- return true;
- }
-}
diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
index d033e2e60a2..f7a85b5ed36 100644
--- a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
+++ b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -47,7 +47,7 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
to.setDefaultNic(profile.isDefaultNic());
to.setBroadcastUri(profile.getBroadCastUri());
to.setIsolationuri(profile.getIsolationUri());
-
+ to.setNetworkRateMbps(profile.getNetworkRate());
return to;
}
diff --git a/server/src/com/cloud/migration/Db20to21MigrationUtil.java b/server/src/com/cloud/migration/Db20to21MigrationUtil.java
index 9d141fef251..0862efbd3a8 100644
--- a/server/src/com/cloud/migration/Db20to21MigrationUtil.java
+++ b/server/src/com/cloud/migration/Db20to21MigrationUtil.java
@@ -563,15 +563,12 @@ public class Db20to21MigrationUtil {
String[] macAddresses = _dcDao.getNextAvailableMacAddressPair(zoneId, (1L << 31));
String guestMacAddress = macAddresses[0];
- proxy.setGuestMacAddress(guestMacAddress);
if(proxy.getState() == State.Running || proxy.getState() == State.Starting) {
System.out.println("System VM " + proxy.getName() + " is in active state, mark it to Stopping state for migration");
proxy.setState(State.Stopping);
}
String guestIpAddress = _dcDao.allocateLinkLocalIpAddress(proxy.getDataCenterId(), proxy.getPodId(), proxy.getId(), null);
- proxy.setGuestIpAddress(guestIpAddress);
- proxy.setGuestNetmask("255.255.0.0");
System.out.println("Assign link loal address to proxy " + proxy.getName() + ", link local address: " + guestIpAddress);
_consoleProxyDao.update(proxy.getId(), proxy);
@@ -590,15 +587,12 @@ public class Db20to21MigrationUtil {
String[] macAddresses = _dcDao.getNextAvailableMacAddressPair(zoneId, (1L << 31));
String guestMacAddress = macAddresses[0];
- secStorageVm.setGuestMacAddress(guestMacAddress);
if(secStorageVm.getState() == State.Running || secStorageVm.getState() == State.Starting) {
System.out.println("System VM " + secStorageVm.getName() + " is in active state, mark it to Stopping state for migration");
secStorageVm.setState(State.Stopping);
}
String guestIpAddress = _dcDao.allocateLinkLocalIpAddress(secStorageVm.getDataCenterId(), secStorageVm.getPodId(), secStorageVm.getId(), null);
- secStorageVm.setGuestIpAddress(guestIpAddress);
- secStorageVm.setGuestNetmask("255.255.0.0");
System.out.println("Assign link loal address to secondary storage VM " + secStorageVm.getName() + ", link local address: " + guestIpAddress);
_secStorageVmDao.update(secStorageVm.getId(), secStorageVm);
diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java
index a6cb5ff5bef..9d2dfde0c0b 100644
--- a/server/src/com/cloud/network/NetworkManager.java
+++ b/server/src/com/cloud/network/NetworkManager.java
@@ -27,6 +27,8 @@ import com.cloud.deploy.DeploymentPlan;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network.Capability;
import com.cloud.network.Network.Service;
@@ -40,7 +42,6 @@ import com.cloud.user.Account;
import com.cloud.user.AccountVO;
import com.cloud.utils.Pair;
import com.cloud.utils.net.Ip;
-import com.cloud.vm.DomainRouterVO;
import com.cloud.vm.Nic;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
@@ -53,8 +54,6 @@ import com.cloud.vm.VirtualMachineProfile;
*
*/
public interface NetworkManager extends NetworkService {
- public static final boolean USE_POD_VLAN = false;
-
/**
* Assigns a new public ip address.
*
@@ -89,16 +88,6 @@ public interface NetworkManager extends NetworkService {
*/
public boolean releasePublicIpAddress(Ip ipAddress, long ownerId, long userId);
- /**
- * Associates or disassociates a list of public IP address for a router.
- * @param router router object to send the association to
- * @param ipAddrList list of public IP addresses
- * @param add true if associate, false if disassociate
- * @param vmId
- * @return
- */
- boolean associateIP(DomainRouterVO router, List ipAddrList, boolean add, long vmId) throws ConcurrentOperationException;
-
/**
* Lists IP addresses that belong to VirtualNetwork VLANs
* @param accountId - account that the IP address should belong to
@@ -120,6 +109,8 @@ public interface NetworkManager extends NetworkService {
void cleanupNics(VirtualMachineProfile vm);
+ void expungeNics(VirtualMachineProfile vm);
+
List getNics(VirtualMachine vm);
List getAccountsUsingNetwork(long configurationId);
@@ -149,5 +140,22 @@ public interface NetworkManager extends NetworkService {
void shutdownNetwork(long networkId);
boolean destroyNetwork(long networkId, long callerUserId);
+
+ Network createNetwork(long networkOfferingId, String name, String displayText, Boolean isShared, Boolean isDefault, Long zoneId, String gateway, String startIP, String endIP, String netmask, String vlanId, String networkDomain, Account owner) throws InvalidParameterValueException, PermissionDeniedException;
+
+ /**
+ * Associates an ip address list to an account. The list of ip addresses are all addresses associated with the given vlan id.
+ * @param userId
+ * @param accountId
+ * @param zoneId
+ * @param vlanId
+ * @throws InsufficientAddressCapacityException
+ * @throws
+ */
+ boolean associateIpAddressListToAccount(long userId, long accountId, long zoneId, Long vlanId) throws InsufficientAddressCapacityException,
+ ConcurrentOperationException, ResourceUnavailableException;
+ Nic getNicInNetwork(long vmId, long networkId);
+
+ Nic getNicForTraffic(long vmId, TrafficType type);
}
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 5388bcd85ee..8a990d4dc93 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -48,6 +48,7 @@ import com.cloud.configuration.ConfigurationManager;
import com.cloud.configuration.ResourceCount.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.configuration.dao.ResourceLimitDao;
+import com.cloud.dc.AccountVlanMapVO;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.dc.DataCenterVO;
@@ -65,8 +66,6 @@ import com.cloud.deploy.DeploymentPlan;
import com.cloud.domain.Domain;
import com.cloud.domain.dao.DomainDao;
import com.cloud.event.EventTypes;
-import com.cloud.event.EventUtils;
-import com.cloud.event.EventVO;
import com.cloud.event.UsageEventVO;
import com.cloud.event.dao.EventDao;
import com.cloud.event.dao.UsageEventDao;
@@ -89,21 +88,18 @@ import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.element.NetworkElement;
import com.cloud.network.guru.NetworkGuru;
-import com.cloud.network.lb.LoadBalancingRule;
import com.cloud.network.lb.LoadBalancingRulesManager;
import com.cloud.network.rules.FirewallRule;
-import com.cloud.network.rules.PortForwardingRule;
import com.cloud.network.rules.RulesManager;
import com.cloud.network.vpn.RemoteAccessVpnElement;
import com.cloud.offering.NetworkOffering;
import com.cloud.offering.NetworkOffering.Availability;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
-import com.cloud.resource.Resource;
-import com.cloud.resource.Resource.ReservationStrategy;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.AccountVO;
+import com.cloud.user.User;
import com.cloud.user.UserContext;
import com.cloud.user.UserStatisticsVO;
import com.cloud.user.dao.AccountDao;
@@ -125,11 +121,11 @@ import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.Ip;
import com.cloud.utils.net.NetUtils;
-import com.cloud.vm.DomainRouterVO;
import com.cloud.vm.Nic;
import com.cloud.vm.NicProfile;
import com.cloud.vm.NicVO;
import com.cloud.vm.ReservationContext;
+import com.cloud.vm.ReservationContextImpl;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.Type;
@@ -140,36 +136,58 @@ import com.cloud.vm.dao.UserVmDao;
/**
* NetworkManagerImpl implements NetworkManager.
*/
-@Local(value={NetworkManager.class, NetworkService.class})
+@Local(value = { NetworkManager.class, NetworkService.class })
public class NetworkManagerImpl implements NetworkManager, NetworkService, Manager {
private static final Logger s_logger = Logger.getLogger(NetworkManagerImpl.class);
String _name;
- @Inject DataCenterDao _dcDao = null;
- @Inject VlanDao _vlanDao = null;
- @Inject IPAddressDao _ipAddressDao = null;
- @Inject AccountDao _accountDao = null;
- @Inject DomainDao _domainDao = null;
- @Inject UserStatisticsDao _userStatsDao = null;
- @Inject EventDao _eventDao = null;
- @Inject ConfigurationDao _configDao;
- @Inject UserVmDao _vmDao = null;
- @Inject ResourceLimitDao _limitDao = null;
- @Inject CapacityDao _capacityDao = null;
- @Inject AlertManager _alertMgr;
- @Inject AccountManager _accountMgr;
- @Inject ConfigurationManager _configMgr;
- @Inject AccountVlanMapDao _accountVlanMapDao;
- @Inject NetworkOfferingDao _networkOfferingDao = null;
- @Inject NetworkDao _networksDao = null;
- @Inject NicDao _nicDao = null;
- @Inject RulesManager _rulesMgr;
- @Inject LoadBalancingRulesManager _lbMgr;
- @Inject UsageEventDao _usageEventDao;
- @Inject PodVlanMapDao _podVlanMapDao;
- @Inject(adapter=NetworkGuru.class)
+ @Inject
+ DataCenterDao _dcDao = null;
+ @Inject
+ VlanDao _vlanDao = null;
+ @Inject
+ IPAddressDao _ipAddressDao = null;
+ @Inject
+ AccountDao _accountDao = null;
+ @Inject
+ DomainDao _domainDao = null;
+ @Inject
+ UserStatisticsDao _userStatsDao = null;
+ @Inject
+ EventDao _eventDao = null;
+ @Inject
+ ConfigurationDao _configDao;
+ @Inject
+ UserVmDao _vmDao = null;
+ @Inject
+ ResourceLimitDao _limitDao = null;
+ @Inject
+ CapacityDao _capacityDao = null;
+ @Inject
+ AlertManager _alertMgr;
+ @Inject
+ AccountManager _accountMgr;
+ @Inject
+ ConfigurationManager _configMgr;
+ @Inject
+ AccountVlanMapDao _accountVlanMapDao;
+ @Inject
+ NetworkOfferingDao _networkOfferingDao = null;
+ @Inject
+ NetworkDao _networksDao = null;
+ @Inject
+ NicDao _nicDao = null;
+ @Inject
+ RulesManager _rulesMgr;
+ @Inject
+ LoadBalancingRulesManager _lbMgr;
+ @Inject
+ UsageEventDao _usageEventDao;
+ @Inject
+ PodVlanMapDao _podVlanMapDao;
+ @Inject(adapter = NetworkGuru.class)
Adapters _networkGurus;
- @Inject(adapter=NetworkElement.class)
+ @Inject(adapter = NetworkElement.class)
Adapters _networkElements;
private HashMap _systemNetworks = new HashMap(5);
@@ -180,22 +198,23 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
SearchBuilder AssignIpAddressSearch;
SearchBuilder AssignIpAddressFromPodVlanSearch;
SearchBuilder IpAddressSearch;
-
+ SearchBuilder NicForTrafficTypeSearch;
+
int _networkGcWait;
int _networkGcInterval;
String _networkDomain;
private Map _configs;
-
+
HashMap _lastNetworkIdsToFree = new HashMap();
@Override
public PublicIp assignPublicIpAddress(long dcId, Long podId, Account owner, VlanType type, Long networkId) throws InsufficientAddressCapacityException {
- return fetchNewPublicIp(dcId, podId, owner, type, networkId, false, true);
+ return fetchNewPublicIp(dcId, podId, null, owner, type, networkId, false, true);
}
-
- @DB
- public PublicIp fetchNewPublicIp(long dcId, Long podId, Account owner, VlanType vlanUse, Long networkId, boolean sourceNat, boolean assign) throws InsufficientAddressCapacityException {
+
+ @DB
+ public PublicIp fetchNewPublicIp(long dcId, Long podId, Long vlanDbId, Account owner, VlanType vlanUse, Long networkId, boolean sourceNat, boolean assign) throws InsufficientAddressCapacityException {
Transaction txn = Transaction.currentTxn();
txn.start();
SearchCriteria sc = null;
@@ -206,66 +225,67 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
sc = AssignIpAddressSearch.create();
}
+ if (vlanDbId != null) {
+ sc.addAnd("vlanId", SearchCriteria.Op.EQ, vlanDbId);
+ }
+
sc.setParameters("dc", dcId);
-
- //for direct network take ip addresses only from the vlans belonging to the network
+
+ // for direct network take ip addresses only from the vlans belonging to the network
if (vlanUse == VlanType.DirectAttached) {
sc.setJoinParameters("vlan", "networkId", networkId);
}
sc.setJoinParameters("vlan", "type", vlanUse);
-
+
Filter filter = new Filter(IPAddressVO.class, "vlanId", true, 0l, 1l);
-
+
List addrs = _ipAddressDao.lockRows(sc, filter, true);
-
+
if (addrs.size() == 0) {
throw new InsufficientAddressCapacityException("Insufficient address capacity", DataCenter.class, dcId);
}
-
+
assert (addrs.size() == 1) : "Return size is incorrect: " + addrs.size();
-
+
IPAddressVO addr = addrs.get(0);
- addr.setSourceNat(sourceNat);
+ addr.setSourceNat(sourceNat);
addr.setAllocatedTime(new Date());
addr.setAllocatedInDomainId(owner.getDomainId());
addr.setAllocatedToAccountId(owner.getId());
+
addr.setState(assign ? IpAddress.State.Allocated : IpAddress.State.Allocating);
-
+
if (vlanUse == VlanType.DirectAttached) {
addr.setState(IpAddress.State.Allocated);
} else {
addr.setAssociatedWithNetworkId(networkId);
}
-
+
if (!_ipAddressDao.update(addr.getAddress(), addr)) {
throw new CloudRuntimeException("Found address to allocate but unable to update: " + addr);
}
- if(!sourceNat && (owner.getAccountId() != Account.ACCOUNT_ID_SYSTEM)){
- UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_NET_IP_ASSIGN, owner.getAccountId(), dcId, 0, addr.getAddress().toString());
+ if(owner.getAccountId() != Account.ACCOUNT_ID_SYSTEM){
+ long isSourceNat = (sourceNat) ? 1 : 0 ;
+ UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_NET_IP_ASSIGN, owner.getAccountId(), dcId, isSourceNat, addr.getAddress().toString());
_usageEventDao.persist(usageEvent);
}
-
+
txn.commit();
long macAddress = NetUtils.createSequenceBasedMacAddress(addr.getMacAddress());
return new PublicIp(addr, _vlanDao.findById(addr.getVlanId()), macAddress);
}
-
+
@Override
@DB
public PublicIp assignSourceNatIpAddress(Account owner, Network network, long callerId) throws ConcurrentOperationException, InsufficientAddressCapacityException {
assert (network.getTrafficType() != null) : "You're asking for a source nat but your network can't participate in source nat. What do you have to say for yourself?";
-
+
long dcId = network.getDataCenterId();
long ownerId = owner.getId();
- final EventVO event = new EventVO();
- event.setUserId(callerId); // system user performed the action...
- event.setAccountId(ownerId);
- event.setType(EventTypes.EVENT_NET_IP_ASSIGN);
-
PublicIp ip = null;
-
+
Transaction txn = Transaction.currentTxn();
try {
txn.start();
@@ -279,40 +299,44 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
IPAddressVO sourceNat = null;
- List addrs = listPublicIpAddressesInVirtualNetwork(ownerId, dcId, null);
+ List addrs = listPublicIpAddressesInVirtualNetwork(ownerId, dcId, null);
if (addrs.size() == 0) {
// Check that the maximum number of public IPs for the given accountId will not be exceeded
if (_accountMgr.resourceLimitExceeded(owner, ResourceType.public_ip)) {
throw new AccountLimitException("Maximum number of public IP addresses for account: " + owner.getAccountName() + " has been exceeded.");
}
-
+
if (s_logger.isDebugEnabled()) {
s_logger.debug("assigning a new ip address in " + dcId + " to " + owner);
- }
+ }
+
+ //If account has Account specific ip ranges, try to allocate ip from there
+ Long vlanId = null;
+ List maps = _accountVlanMapDao.listAccountVlanMapsByAccount(ownerId);
+ if (maps != null && !maps.isEmpty()) {
+ vlanId = maps.get(0).getVlanDbId();
+ }
- ip = fetchNewPublicIp(dcId, null, owner, VlanType.VirtualNetwork, network.getId(), true, false);
+ ip = fetchNewPublicIp(dcId, null, vlanId, owner, VlanType.VirtualNetwork, network.getId(), true, false);
sourceNat = ip.ip();
sourceNat.setState(IpAddress.State.Allocated);
_ipAddressDao.update(sourceNat.getAddress(), sourceNat);
// Increment the number of public IPs for this accountId in the database
_accountMgr.incrementResourceCount(ownerId, ResourceType.public_ip);
- event.setDescription("Acquired a public ip: " + ip.getAddress());
- _eventDao.persist(event);
} else {
// Account already has ip addresses
-
for (IPAddressVO addr : addrs) {
if (addr.isSourceNat()) {
sourceNat = addr;
break;
}
}
-
- assert(sourceNat != null) : "How do we get a bunch of ip addresses but none of them are source nat? account=" + ownerId + "; dc=" + dcId;
+
+ assert (sourceNat != null) : "How do we get a bunch of ip addresses but none of them are source nat? account=" + ownerId + "; dc=" + dcId;
ip = new PublicIp(sourceNat, _vlanDao.findById(sourceNat.getVlanId()), NetUtils.createSequenceBasedMacAddress(sourceNat.getMacAddress()));
}
-
+
UserStatisticsVO stats = _userStatsDao.findBy(ownerId, dcId, null, null);
if (stats == null) {
if (s_logger.isDebugEnabled()) {
@@ -325,7 +349,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
return ip;
} finally {
if (owner != null) {
- if(s_logger.isDebugEnabled()) {
+ if (s_logger.isDebugEnabled()) {
s_logger.debug("Releasing lock account " + ownerId);
}
@@ -333,103 +357,25 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
if (ip == null) {
txn.rollback();
- event.setLevel(EventVO.LEVEL_ERROR);
- event.setDescription("Failed to acquire a public ip.");
- _eventDao.persist(event);
s_logger.error("Unable to get source nat ip address for account " + ownerId);
}
}
}
-
-
- @Override
- public boolean associateIP(final DomainRouterVO router, final List ipAddrList, final boolean add, long vmId) {
-// Commands cmds = new Commands(OnError.Continue);
-// boolean sourceNat = false;
-// Map> vlanIpMap = new HashMap>();
-// for (final String ipAddress: ipAddrList) {
-// IPAddressVO ip = _ipAddressDao.findById(new Ip(ipAddress));
-//
-// VlanVO vlan = _vlanDao.findById(ip.getVlanId());
-// ArrayList ipList = vlanIpMap.get(vlan.getId());
-// if (ipList == null) {
-// ipList = new ArrayList();
-// }
-// ipList.add(ip);
-// vlanIpMap.put(vlan, ipList);
-// }
-// for (Map.Entry> vlanAndIp: vlanIpMap.entrySet()) {
-// boolean firstIP = true;
-// ArrayList ipList = vlanAndIp.getValue();
-// Collections.sort(ipList, new Comparator() {
-// @Override
-// public int compare(IPAddressVO o1, IPAddressVO o2) {
-// return o1.getAddress().compareTo(o2.getAddress());
-// } });
-//
-// for (final IPAddressVO ip: ipList) {
-// sourceNat = ip.isSourceNat();
-// VlanVO vlan = vlanAndIp.getKey();
-// String vlanId = vlan.getVlanTag();
-// String vlanGateway = vlan.getVlanGateway();
-// String vlanNetmask = vlan.getVlanNetmask();
-//
-// String vifMacAddress = null;
-// if (firstIP && add) {
-// String[] macAddresses = _dcDao.getNextAvailableMacAddressPair(ip.getDataCenterId());
-// vifMacAddress = macAddresses[1];
-// }
-// String vmGuestAddress = null;
-// if(vmId!=0){
-// vmGuestAddress = _vmDao.findById(vmId).getGuestIpAddress();
-// }
-//
-// //cmds.addCommand(new IPAssocCommand(router.getInstanceName(), router.getPrivateIpAddress(), ip.getAddress(), add, firstIP, sourceNat, vlanId, vlanGateway, vlanNetmask, vifMacAddress, vmGuestAddress));
-//
-// firstIP = false;
-// }
-// }
-//
-// Answer[] answers = null;
-// try {
-// answers = _agentMgr.send(router.getHostId(), cmds);
-// } catch (final AgentUnavailableException e) {
-// s_logger.warn("Agent unavailable", e);
-// return false;
-// } catch (final OperationTimedoutException e) {
-// s_logger.warn("Timed Out", e);
-// return false;
-// }
-//
-// if (answers == null) {
-// return false;
-// }
-//
-// if (answers.length != ipAddrList.size()) {
-// return false;
-// }
-//
-// // FIXME: this used to be a loop for all answers, but then we always returned the
-// // first one in the array, so what should really be done here?
-// if (answers.length > 0) {
-// Answer ans = answers[0];
-// return ans.getResult();
-// }
-
- return true;
- }
-
- /** Returns the target account for an api command
- * @param accountName - non-null if the account name was passed in in the command
- * @param domainId - non-null if the domainId was passed in in the command.
+ /**
+ * Returns the target account for an api command
+ *
+ * @param accountName
+ * - non-null if the account name was passed in in the command
+ * @param domainId
+ * - non-null if the domainId was passed in in the command.
* @return
*/
- protected Account getAccountForApiCommand(String accountName, Long domainId) throws InvalidParameterValueException, PermissionDeniedException{
+ protected Account getAccountForApiCommand(String accountName, Long domainId) throws InvalidParameterValueException, PermissionDeniedException {
Account account = UserContext.current().getCaller();
if (_accountMgr.isAdmin(account.getType())) {
- //The admin is making the call, determine if it is for someone else or for himself
+ // The admin is making the call, determine if it is for someone else or for himself
if (domainId != null) {
if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), domainId)) {
throw new PermissionDeniedException("Invalid domain id (" + domainId + ") given, , permission denied");
@@ -445,13 +391,13 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
} else {
// the admin is calling the api on his own behalf
return account;
- }
- }
+ }
+ }
return account;
}
-
+
public boolean applyIpAssociations(Network network, boolean continueOnError) throws ResourceUnavailableException {
- List userIps = _ipAddressDao.listByNetwork(network.getId());
+ List userIps = _ipAddressDao.listByAssociatedNetwork(network.getId());
List publicIps = new ArrayList();
if (userIps != null && !userIps.isEmpty()) {
for (IPAddressVO userIp : userIps) {
@@ -459,7 +405,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
publicIps.add(publicIp);
}
}
-
+
boolean success = true;
for (NetworkElement element : _networkElements) {
try {
@@ -473,7 +419,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
}
}
-
+
if (success) {
for (IPAddressVO addr : userIps) {
if (addr.getState() == IpAddress.State.Allocating) {
@@ -485,22 +431,23 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
}
}
-
+
return success;
}
-
+
@Override
public List getVirtualNetworksOwnedByAccountInZone(String accountName, long domainId, long zoneId) {
Account owner = _accountMgr.getActiveAccount(accountName, domainId);
if (owner == null) {
throw new InvalidParameterValueException("Unable to find account " + accountName + " in domain " + domainId + ", permission denied");
}
-
+
return _networksDao.listBy(owner.getId(), zoneId, GuestIpType.Virtual);
}
- @Override @DB
- public IpAddress associateIP(AssociateIPAddrCmd cmd) throws ResourceAllocationException, ResourceUnavailableException, InsufficientAddressCapacityException, ConcurrentOperationException {
+ @Override
+ @DB
+ public IpAddress associateIP(AssociateIPAddrCmd cmd) throws ResourceAllocationException, ResourceUnavailableException, InsufficientAddressCapacityException, ConcurrentOperationException {
String accountName = cmd.getAccountName();
long domainId = cmd.getDomainId();
Long zoneId = cmd.getZoneId();
@@ -511,9 +458,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (owner == null) {
throw new InvalidParameterValueException("Unable to find account " + accountName + " in domain " + domainId + ", permission denied");
}
-
+
_accountMgr.checkAccess(caller, owner);
-
+
long ownerId = owner.getId();
Long networkId = cmd.getNetworkId();
Network network = null;
@@ -524,14 +471,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
}
- EventVO event = new EventVO();
- event.setUserId(userId);
- event.setAccountId(ownerId);
- event.setType(EventTypes.EVENT_NET_IP_ASSIGN);
-
PublicIp ip = null;
boolean success = false;
-
+
Transaction txn = Transaction.currentTxn();
Account accountToLock = null;
try {
@@ -557,19 +499,16 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
txn.start();
- ip = fetchNewPublicIp(zoneId, null, owner, VlanType.VirtualNetwork, network.getId(), false, false);
-
+ ip = fetchNewPublicIp(zoneId, null, null, owner, VlanType.VirtualNetwork, network.getId(), false, false);
+
if (ip == null) {
throw new InsufficientAddressCapacityException("Unable to find available public IP addresses", DataCenter.class, zoneId);
- }
-
+ }
+
_accountMgr.incrementResourceCount(ownerId, ResourceType.public_ip);
Ip ipAddress = ip.getAddress();
- event.setParameters("address=" + ipAddress + "\nsourceNat=" + false + "\ndcId=" + zoneId);
- event.setDescription("Assigned a public IP address: " + ipAddress);
- _eventDao.persist(event);
-
+
s_logger.debug("Got " + ipAddress + " to assign for account " + owner.getId() + " in zone " + network.getDataCenterId());
txn.commit();
@@ -580,7 +519,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
} else {
s_logger.warn("Failed to associate ip address " + ip + " for account " + owner.getId() + " in zone " + network.getDataCenterId());
}
-
+
return ip;
} catch (ResourceUnavailableException e) {
s_logger.error("Unable to associate ip address due to resource unavailable exception", e);
@@ -590,7 +529,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
_accountDao.releaseFromLockTable(ownerId);
s_logger.debug("Associate IP address lock released");
}
-
+
if (!success) {
if (ip != null) {
try {
@@ -604,9 +543,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
_ipAddressDao.unassignIpAddress(ip.getAddress());
_accountMgr.decrementResourceCount(ownerId, ResourceType.public_ip);
- event.setLevel(EventVO.LEVEL_ERROR);
- event.setDescription("");
- _eventDao.persist(event);
txn.commit();
}
}
@@ -620,11 +556,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (ip == null) {
return true;
}
-
+
if (s_logger.isDebugEnabled()) {
s_logger.debug("Releasing ip " + addr + "; sourceNat = " + ip.isSourceNat());
}
-
+
boolean success = true;
try {
if (!_rulesMgr.revokeAllRules(addr, userId)) {
@@ -635,12 +571,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
s_logger.warn("Unable to revoke all the port forwarding rules for ip " + ip, e);
success = false;
}
-
+
if (!_lbMgr.removeAllLoadBalanacers(addr)) {
s_logger.warn("Unable to revoke all the load balancer rules for ip " + ip);
success = false;
}
-
+
if (ip.getAssociatedWithNetworkId() != null) {
Network network = _networksDao.findById(ip.getAssociatedWithNetworkId());
try {
@@ -652,40 +588,29 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
throw new CloudRuntimeException("We should nver get to here because we used true when applyIpAssociations", e);
}
}
-
+
if (success) {
_ipAddressDao.unassignIpAddress(addr);
s_logger.debug("released a public ip: " + addr);
- if(!ip.isSourceNat() && (ownerId != Account.ACCOUNT_ID_SYSTEM)){
+ if(ownerId != Account.ACCOUNT_ID_SYSTEM){
UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_NET_IP_RELEASE, ownerId, ip.getDataCenterId(), 0, addr.toString());
_usageEventDao.persist(usageEvent);
}
- }
-
- EventUtils.saveEvent(userId, ip.getAllocatedToAccountId(), EventTypes.EVENT_NET_IP_RELEASE, "released a public ip: " + addr);
-
+ _accountMgr.decrementResourceCount(ownerId, ResourceType.public_ip);
+ }
+
return success;
}
- private Integer getIntegerConfigValue(String configKey, Integer dflt) {
- String value = _configs.get(configKey);
- if (value != null) {
- return Integer.parseInt(value);
- }
- return dflt;
- }
-
@Override
public boolean configure(final String name, final Map params) throws ConfigurationException {
_name = name;
_configs = _configDao.getConfiguration("AgentManager", params);
- Integer rateMbps = getIntegerConfigValue(Config.NetworkThrottlingRate.key(), null);
- Integer multicastRateMbps = getIntegerConfigValue(Config.MulticastThrottlingRate.key(), null);
_networkGcWait = NumbersUtil.parseInt(_configs.get(Config.NetworkGcWait.key()), 600);
_networkGcInterval = NumbersUtil.parseInt(_configs.get(Config.NetworkGcInterval.key()), 600);
-
+
_configs = _configDao.getConfiguration("Network", params);
_networkDomain = _configs.get(Config.GuestDomainSuffix.key());
@@ -704,28 +629,31 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
NetworkOfferingVO guestNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SysteGuestNetwork, TrafficType.Guest);
guestNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(guestNetworkOffering);
_systemNetworks.put(NetworkOfferingVO.SysteGuestNetwork, guestNetworkOffering);
-
- NetworkOfferingVO defaultGuestNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultVirtualizedNetworkOffering, "Virtual Vlan", TrafficType.Guest, false, false, rateMbps, multicastRateMbps, null, true, Availability.Required, false, false, false, false, false, false, false);
+
+ NetworkOfferingVO defaultGuestNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultVirtualizedNetworkOffering, "Virtual Vlan", TrafficType.Guest, false, false, null, null, null, true, Availability.Required, false, false, false, false,
+ false, false, false);
defaultGuestNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultGuestNetworkOffering);
- NetworkOfferingVO defaultGuestDirectNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultDirectNetworkOffering, "Direct", TrafficType.Public, false, false, rateMbps, multicastRateMbps, null, true, Availability.Required, false, false, false, false, false, false, false);
+ NetworkOfferingVO defaultGuestDirectNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultDirectNetworkOffering, "Direct", TrafficType.Public, false, false, null, null, null, true, Availability.Required, false, false, false, false, false,
+ false, false);
defaultGuestDirectNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultGuestDirectNetworkOffering);
-
+
AccountsUsingNetworkSearch = _accountDao.createSearchBuilder();
SearchBuilder networkAccountSearch = _networksDao.createSearchBuilderForAccount();
AccountsUsingNetworkSearch.join("nc", networkAccountSearch, AccountsUsingNetworkSearch.entity().getId(), networkAccountSearch.entity().getAccountId(), JoinType.INNER);
networkAccountSearch.and("config", networkAccountSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
networkAccountSearch.and("owner", networkAccountSearch.entity().isOwner(), SearchCriteria.Op.EQ);
AccountsUsingNetworkSearch.done();
-
+
AssignIpAddressSearch = _ipAddressDao.createSearchBuilder();
AssignIpAddressSearch.and("dc", AssignIpAddressSearch.entity().getDataCenterId(), Op.EQ);
AssignIpAddressSearch.and("allocated", AssignIpAddressSearch.entity().getAllocatedTime(), Op.NULL);
+ AssignIpAddressSearch.and("vlanId", AssignIpAddressSearch.entity().getVlanId(), Op.EQ);
SearchBuilder vlanSearch = _vlanDao.createSearchBuilder();
vlanSearch.and("type", vlanSearch.entity().getVlanType(), Op.EQ);
vlanSearch.and("networkId", vlanSearch.entity().getNetworkId(), Op.EQ);
AssignIpAddressSearch.join("vlan", vlanSearch, vlanSearch.entity().getId(), AssignIpAddressSearch.entity().getVlanId(), JoinType.INNER);
AssignIpAddressSearch.done();
-
+
AssignIpAddressFromPodVlanSearch = _ipAddressDao.createSearchBuilder();
AssignIpAddressFromPodVlanSearch.and("dc", AssignIpAddressFromPodVlanSearch.entity().getDataCenterId(), Op.EQ);
AssignIpAddressFromPodVlanSearch.and("allocated", AssignIpAddressFromPodVlanSearch.entity().getAllocatedTime(), Op.NULL);
@@ -734,10 +662,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
podVlanSearch.and("networkId", podVlanSearch.entity().getNetworkId(), Op.EQ);
SearchBuilder podVlanMapSB = _podVlanMapDao.createSearchBuilder();
podVlanMapSB.and("podId", podVlanMapSB.entity().getPodId(), Op.EQ);
- AssignIpAddressFromPodVlanSearch.join("podVlanMapSB", podVlanMapSB, podVlanMapSB.entity().getVlanDbId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER);
+ AssignIpAddressFromPodVlanSearch.join("podVlanMapSB", podVlanMapSB, podVlanMapSB.entity().getVlanDbId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER);
AssignIpAddressFromPodVlanSearch.join("vlan", podVlanSearch, podVlanSearch.entity().getId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER);
AssignIpAddressFromPodVlanSearch.done();
-
+
IpAddressSearch = _ipAddressDao.createSearchBuilder();
IpAddressSearch.and("accountId", IpAddressSearch.entity().getAllocatedToAccountId(), Op.EQ);
IpAddressSearch.and("dataCenterId", IpAddressSearch.entity().getDataCenterId(), Op.EQ);
@@ -746,13 +674,20 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
IpAddressSearch.join("virtualNetworkVlanSB", virtualNetworkVlanSB, IpAddressSearch.entity().getVlanId(), virtualNetworkVlanSB.entity().getId(), JoinBuilder.JoinType.INNER);
IpAddressSearch.done();
+ NicForTrafficTypeSearch = _nicDao.createSearchBuilder();
+ SearchBuilder networkSearch = _networksDao.createSearchBuilder();
+ NicForTrafficTypeSearch.join("network", networkSearch, networkSearch.entity().getId(), NicForTrafficTypeSearch.entity().getNetworkId(), JoinType.INNER);
+ NicForTrafficTypeSearch.and("instance", NicForTrafficTypeSearch.entity().getInstanceId(), Op.EQ);
+ networkSearch.and("traffictype", networkSearch.entity().getTrafficType(), Op.EQ);
+ NicForTrafficTypeSearch.done();
+
_executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Network-Scavenger"));
s_logger.info("Network Manager is configured.");
return true;
}
-
+
@Override
public String getName() {
return _name;
@@ -790,7 +725,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
return setupNetwork(owner, offering, null, plan, name, displayText, isShared, isDefault);
}
- @Override @DB
+ @Override
+ @DB
public List setupNetwork(Account owner, NetworkOfferingVO offering, Network predefined, DeploymentPlan plan, String name, String displayText, boolean isShared, boolean isDefault) throws ConcurrentOperationException {
Transaction.currentTxn();
Account locked = _accountDao.acquireInLockTable(owner.getId());
@@ -798,7 +734,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
throw new ConcurrentOperationException("Unable to acquire lock on " + owner);
}
try {
-
+
if (predefined == null || (predefined.getBroadcastUri() == null && predefined.getBroadcastDomainType() != BroadcastDomainType.Vlan)) {
List configs = _networksDao.listBy(owner.getId(), offering.getId(), plan.getDataCenterId());
if (configs.size() > 0) {
@@ -807,40 +743,40 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
return configs;
}
- }
-
+ }
+
List configs = new ArrayList();
-
+
long related = -1;
-
+
for (NetworkGuru guru : _networkGurus) {
Network config = guru.design(offering, plan, predefined, owner);
if (config == null) {
continue;
}
-
+
if (config.getId() != -1) {
if (config instanceof NetworkVO) {
- configs.add((NetworkVO)config);
+ configs.add((NetworkVO) config);
} else {
configs.add(_networksDao.findById(config.getId()));
}
continue;
}
-
+
long id = _networksDao.getNextInSequence(Long.class, "id");
if (related == -1) {
related = id;
- }
-
+ }
+
NetworkVO vo = new NetworkVO(id, config, offering.getId(), plan.getDataCenterId(), guru.getName(), owner.getDomainId(), owner.getId(), related, name, displayText, isShared, isDefault);
configs.add(_networksDao.persist(vo, vo.getGuestType() != null));
}
-
+
if (configs.size() < 1) {
throw new CloudRuntimeException("Unable to convert network offering to network profile: " + offering.getId());
}
-
+
return configs;
} finally {
s_logger.debug("Releasing lock for " + locked);
@@ -861,7 +797,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
return offerings;
}
- @Override @DB
+ @Override
+ @DB
public void allocate(VirtualMachineProfile vm, List> networks) throws InsufficientCapacityException, ConcurrentOperationException {
Transaction txn = Transaction.currentTxn();
txn.start();
@@ -882,11 +819,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
requested.setMode(config.getMode());
}
NicProfile profile = concierge.allocate(config, requested, vm);
-
+
if (vm != null && vm.getVirtualMachine().getType() == Type.User && config.isDefault()) {
profile.setDefaultNic(true);
}
-
+
if (profile == null) {
continue;
}
@@ -917,7 +854,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
deviceIds[devId] = true;
nics.add(vo);
- vm.addNic(new NicProfile(vo, network.first(), vo.getBroadcastUri(), vo.getIsolationUri()));
+
+ NetworkOffering no = _configMgr.getNetworkOffering(config.getNetworkOfferingId());
+ Integer networkRate = _configMgr.getNetworkRate(no.getId());
+ vm.addNic(new NicProfile(vo, network.first(), vo.getBroadcastUri(), vo.getIsolationUri(), networkRate));
}
if (nics.size() == 1) {
@@ -930,10 +870,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
protected Integer applyProfileToNic(NicVO vo, NicProfile profile, Integer deviceId) {
if (profile.getDeviceId() != null) {
vo.setDeviceId(profile.getDeviceId());
- } else if (deviceId != null ) {
+ } else if (deviceId != null) {
vo.setDeviceId(deviceId++);
}
-
+
vo.setReservationStrategy(profile.getReservationStrategy());
vo.setDefaultNic(profile.isDefaultNic());
@@ -990,6 +930,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
to.setDns2(profile.getDns2());
}
+ Integer networkRate = _configMgr.getNetworkRate(config.getNetworkOfferingId());
+ to.setNetworkRateMbps(networkRate);
+
return to;
}
@@ -1019,7 +962,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId());
network.setReservationId(context.getReservationId());
network.setState(Network.State.Implementing);
-
+
_networksDao.update(networkId, network);
Network result = guru.implement(network, offering, dest, context);
@@ -1037,7 +980,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
element.implement(network, offering, dest, context);
}
-
+
network.setState(Network.State.Implemented);
_networksDao.update(network.getId(), network);
implemented.set(guru, network);
@@ -1052,7 +995,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
_networksDao.releaseFromLockTable(networkId);
}
}
-
+
@DB
protected void updateNic(NicVO nic, long networkId, int count) {
Transaction txn = Transaction.currentTxn();
@@ -1069,9 +1012,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
Pair implemented = implementNetwork(nic.getNetworkId(), dest, context);
NetworkGuru concierge = implemented.first();
NetworkVO network = implemented.second();
+ NetworkOffering no = _configMgr.getNetworkOffering(network.getNetworkOfferingId());
+ Integer networkRate = _configMgr.getNetworkRate(no.getId());
NicProfile profile = null;
- if (nic.getReservationStrategy() == ReservationStrategy.Start) {
- nic.setState(Resource.State.Reserving);
+ if (nic.getReservationStrategy() == Nic.ReservationStrategy.Start) {
+ nic.setState(Nic.State.Reserving);
nic.setReservationId(context.getReservationId());
_nicDao.update(nic.getId(), nic);
URI broadcastUri = nic.getBroadcastUri();
@@ -1081,7 +1026,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
URI isolationUri = nic.getIsolationUri();
- profile = new NicProfile(nic, network, broadcastUri, isolationUri);
+ profile = new NicProfile(nic, network, broadcastUri, isolationUri, networkRate);
concierge.reserve(profile, network, vmProfile, dest, context);
nic.setIp4Address(profile.getIp4Address());
nic.setIp6Address(profile.getIp6Address());
@@ -1089,17 +1034,17 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
nic.setIsolationUri(profile.getIsolationUri());
nic.setBroadcastUri(profile.getBroadCastUri());
nic.setReserver(concierge.getName());
- nic.setState(Resource.State.Reserved);
+ nic.setState(Nic.State.Reserved);
nic.setNetmask(profile.getNetmask());
nic.setGateway(profile.getGateway());
nic.setAddressFormat(profile.getFormat());
updateNic(nic, network.getId(), 1);
} else {
- profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri());
+ profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate);
nic.setState(Nic.State.Reserved);
updateNic(nic, network.getId(), 1);
}
-
+
for (NetworkElement element : _networkElements) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Asking " + element.getName() + " to prepare for " + nic);
@@ -1110,19 +1055,20 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
vmProfile.addNic(profile);
}
}
-
+
@Override
public void prepareNicForMigration(VirtualMachineProfile vm, DeployDestination dest) {
List nics = _nicDao.listBy(vm.getId());
for (NicVO nic : nics) {
Network network = _networksDao.findById(nic.getNetworkId());
-
- NicProfile profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri());
-
+ NetworkOffering no = _configMgr.getNetworkOffering(network.getNetworkOfferingId());
+ Integer networkRate = _configMgr.getNetworkRate(no.getId());
+
+ NicProfile profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate);
+
vm.addNic(profile);
}
}
-
@Override
public void release(VirtualMachineProfile vmProfile, boolean forced) {
@@ -1131,13 +1077,13 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
NetworkVO network = _networksDao.findById(nic.getNetworkId());
if (nic.getState() == Nic.State.Reserved || nic.getState() == Nic.State.Reserving) {
Nic.State originalState = nic.getState();
- if (nic.getReservationStrategy() == ReservationStrategy.Start) {
+ if (nic.getReservationStrategy() == Nic.ReservationStrategy.Start) {
NetworkGuru concierge = _networkGurus.get(network.getGuruName());
- nic.setState(Resource.State.Releasing);
+ nic.setState(Nic.State.Releasing);
_nicDao.update(nic.getId(), nic);
- NicProfile profile = new NicProfile(nic, network, null, null);
+ NicProfile profile = new NicProfile(nic, network, null, null, null);
if (concierge.release(profile, vmProfile, nic.getReservationId())) {
- nic.setState(Resource.State.Allocated);
+ nic.setState(Nic.State.Allocated);
if (originalState == Nic.State.Reserved) {
updateNic(nic, network.getId(), -1);
} else {
@@ -1148,7 +1094,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
nic.setState(Nic.State.Allocated);
updateNic(nic, network.getId(), -1);
}
- }
+ }
}
}
@@ -1175,7 +1121,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
// Verify input parameters
Account accountByIp = findAccountByIpAddress(ipAddress);
- if(accountByIp == null) {
+ if (accountByIp == null) {
throw new InvalidParameterValueException("Unable to find account owner for ip " + ipAddress);
}
@@ -1208,8 +1154,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
// FIXME: is the user visible in the admin account's domain????
if (!BaseCmd.isAdmin(account.getType())) {
if (s_logger.isDebugEnabled()) {
- s_logger.debug("permission denied disassociating IP address " + ipAddress + "; acct: " + accountId + "; ip (acct / dc / dom / alloc): "
- + ipVO.getAllocatedToAccountId() + " / " + ipVO.getDataCenterId() + " / " + ipVO.getAllocatedInDomainId() + " / " + ipVO.getAllocatedTime());
+ s_logger.debug("permission denied disassociating IP address " + ipAddress + "; acct: " + accountId + "; ip (acct / dc / dom / alloc): " + ipVO.getAllocatedToAccountId() + " / " + ipVO.getDataCenterId() + " / "
+ + ipVO.getAllocatedInDomainId() + " / " + ipVO.getAllocatedTime());
}
throw new PermissionDeniedException("User/account does not own supplied address");
}
@@ -1228,16 +1174,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
throw new IllegalArgumentException("only ip addresses that belong to a virtual network may be disassociated.");
}
- //Check for account wide pool. It will have an entry for account_vlan_map.
- if (_accountVlanMapDao.findAccountVlanMap(accountId,ipVO.getVlanId()) != null){
+ // Check for account wide pool. It will have an entry for account_vlan_map.
+ if (_accountVlanMapDao.findAccountVlanMap(accountId, ipVO.getVlanId()) != null) {
throw new PermissionDeniedException(ipAddress + " belongs to Account wide IP pool and cannot be disassociated");
}
- boolean success = releasePublicIpAddress(ipAddress, accountId, userId);
- if (success) {
- _accountMgr.decrementResourceCount(accountId, ResourceType.public_ip);
- }
- return success;
+ return releasePublicIpAddress(ipAddress, accountId, userId);
} catch (PermissionDeniedException pde) {
throw pde;
@@ -1249,7 +1191,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
}
-
@Override
public List getAccountsUsingNetwork(long networkId) {
SearchCriteria sc = AccountsUsingNetworkSearch.create();
@@ -1282,27 +1223,28 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (mac == null) {
throw new InsufficientAddressCapacityException("Unable to create another mac address", Network.class, networkId);
}
-
+
return mac;
}
- @Override @DB
+ @Override
+ @DB
public Network getNetwork(long id) {
return _networksDao.findById(id);
}
-
+
@Override
public List getRemoteAccessVpnElements() {
List elements = new ArrayList();
for (NetworkElement element : _networkElements) {
if (element instanceof RemoteAccessVpnElement) {
- elements.add((RemoteAccessVpnElement)element);
+ elements.add((RemoteAccessVpnElement) element);
}
}
-
+
return elements;
}
-
+
@Override
public void cleanupNics(VirtualMachineProfile vm) {
List nics = _nicDao.listBy(vm.getId());
@@ -1310,17 +1252,23 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
nic.setState(Nic.State.Deallocating);
_nicDao.update(nic.getId(), nic);
NetworkVO network = _networksDao.findById(nic.getNetworkId());
- NicProfile profile = new NicProfile(nic, network, null, null);
+ NicProfile profile = new NicProfile(nic, network, null, null, null);
NetworkGuru guru = _networkGurus.get(network.getGuruName());
guru.deallocate(network, profile, vm);
_nicDao.remove(nic.getId());
}
}
-
- @Override @DB
- public Network createNetwork(CreateNetworkCmd cmd) throws InvalidParameterValueException, PermissionDeniedException{
- Account ctxAccount = UserContext.current().getCaller();
- Long userId = UserContext.current().getCallerUserId();
+
+ @Override
+ public void expungeNics(VirtualMachineProfile vm) {
+ List nics = _nicDao.listIncludingRemovedBy(vm.getId());
+ for (NicVO nic : nics) {
+ _nicDao.expunge(nic.getId());
+ }
+ }
+
+ @Override
+ public Network createNetwork(CreateNetworkCmd cmd) throws InvalidParameterValueException, PermissionDeniedException {
Long networkOfferingId = cmd.getNetworkOfferingId();
Long zoneId = cmd.getZoneId();
String gateway = cmd.getGateway();
@@ -1328,30 +1276,43 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
String endIP = cmd.getEndIp();
String netmask = cmd.getNetmask();
String networkDomain = cmd.getNetworkDomain();
- String cidr = null;
- Boolean isDefault = cmd.isDefault();
- if (gateway != null && netmask != null) {
- cidr = NetUtils.ipAndNetMaskToCidr(gateway, netmask);
- }
- String accountName = cmd.getAccountName();
- Long domainId = cmd.getDomainId();
String vlanId = cmd.getVlan();
String name = cmd.getNetworkName();
String displayText = cmd.getDisplayText();
Boolean isShared = cmd.getIsShared();
+ Boolean isDefault = cmd.isDefault();
- //if end ip is not specified, default it to startIp
+ //finalize owner for the network
+ Account ctxAccount = UserContext.current().getCaller();
+ String accountName = cmd.getAccountName();
+ Long domainId = cmd.getDomainId();
+
+ Account owner = _accountMgr.finalizeOwner(ctxAccount, accountName, domainId);
+
+ return createNetwork(networkOfferingId, name, displayText, isShared, isDefault, zoneId, gateway, startIP, endIP, netmask, vlanId, networkDomain, owner);
+ }
+
+ @Override @DB
+ public Network createNetwork(long networkOfferingId, String name, String displayText, Boolean isShared, Boolean isDefault, Long zoneId, String gateway, String startIP, String endIP, String netmask, String vlanId, String networkDomain, Account owner) throws InvalidParameterValueException, PermissionDeniedException {
+ Account ctxAccount = UserContext.current().getCaller();
+ Long userId = UserContext.current().getCallerUserId();
+ String cidr = null;
+ if (gateway != null && netmask != null) {
+ cidr = NetUtils.ipAndNetMaskToCidr(gateway, netmask);
+ }
+
+ // if end ip is not specified, default it to startIp
if (endIP == null && startIP != null) {
endIP = startIP;
}
-
- //Check if network offering exists
+
+ // Check if network offering exists
NetworkOfferingVO networkOffering = _networkOfferingDao.findById(networkOfferingId);
if (networkOffering == null || networkOffering.isSystemOnly()) {
throw new InvalidParameterValueException("Unable to find network offeirng by id " + networkOfferingId);
}
-
- //allow isDefault to be set only for Virtual network
+
+ // allow isDefault to be set only for Virtual network
if (networkOffering.getTrafficType() == TrafficType.Guest) {
if (isDefault != null) {
throw new InvalidParameterValueException("Can specify isDefault parameter only for Public network. ");
@@ -1363,128 +1324,111 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
isDefault = false;
}
}
-
- //If networkDomain is not specified, take it from the global configuration
+
+ // If networkDomain is not specified, take it from the global configuration
if (networkDomain == null) {
networkDomain = _networkDomain;
}
-
- //Check if zone exists
+
+ // Check if zone exists
if (zoneId == null || ((_dcDao.findById(zoneId)) == null)) {
throw new InvalidParameterValueException("Please specify a valid zone.");
- }
-
+ }
+
DataCenter zone = _dcDao.findById(zoneId);
if (zone.getNetworkType() == NetworkType.Basic) {
throw new InvalidParameterValueException("Network creation is not allowed in zone with network type " + NetworkType.Basic);
}
-
- Account owner = _accountMgr.finalizeOwner(ctxAccount, accountName, domainId);
-
- //Don't allow to create network with vlan that already exists in the system
+
+ // Don't allow to create network with vlan that already exists in the system
if (vlanId != null) {
- String uri ="vlan://" + vlanId;
+ String uri = "vlan://" + vlanId;
List networks = _networksDao.listBy(zoneId, uri);
if ((networks != null && !networks.isEmpty())) {
throw new InvalidParameterValueException("Network with vlan " + vlanId + " already exists in zone " + zoneId);
}
}
-
- //VlanId can be specified only when network offering supports it
+
+ // VlanId can be specified only when network offering supports it
if (ctxAccount.getType() == Account.ACCOUNT_TYPE_NORMAL && vlanId != null && !networkOffering.getSpecifyVlan()) {
throw new InvalidParameterValueException("Can't specify vlan because network offering doesn't support it");
}
-
- Transaction txn = Transaction.currentTxn();
- txn.start();
- try {
- //Create network
- DataCenterDeployment plan = new DataCenterDeployment(zoneId, null, null, null);
- NetworkVO userNetwork = new NetworkVO();
- userNetwork.setNetworkDomain(networkDomain);
-
- //cidr should be set only when the user is admin
- if (ctxAccount.getType() == Account.ACCOUNT_TYPE_ADMIN) {
- if (cidr != null && gateway != null) {
- userNetwork.setCidr(cidr);
- userNetwork.setGateway(gateway);
- if (vlanId != null) {
- userNetwork.setBroadcastUri(URI.create("vlan://" + vlanId));
- userNetwork.setBroadcastDomainType(BroadcastDomainType.Vlan);
- if (!vlanId.equalsIgnoreCase(Vlan.UNTAGGED)) {
- userNetwork.setBroadcastDomainType(BroadcastDomainType.Vlan);
- } else {
- userNetwork.setBroadcastDomainType(BroadcastDomainType.Native);
- }
- }
- }
- }
-
- List networks = setupNetwork(owner, networkOffering, userNetwork, plan, name, displayText, isShared, isDefault);
- Long networkId = null;
-
- Network network = null;
- if (networks == null || networks.isEmpty()) {
- txn.rollback();
- throw new CloudRuntimeException("Fail to create a network");
- } else {
- network = networks.get(0);
- networkId = networks.get(0).getId();
- if (network.getGuestType() == GuestIpType.Virtual) {
- s_logger.debug("Creating a source natp ip for " + network);
- PublicIp ip = assignSourceNatIpAddress(owner, network, userId);
- if (ip == null) {
- throw new InsufficientAddressCapacityException("Unable to assign source nat ip address to owner for this network", DataCenter.class, zoneId);
- }
- }
- }
-
- Long ownerId = owner.getId();
- //Don't pass owner to create vlan when network offering is of type Direct - done to prevent accountVlanMap entry creation when vlan is mapped to network
- if (network.getGuestType() == GuestIpType.Direct) {
- owner = null;
- }
-
- if (ctxAccount.getType() == Account.ACCOUNT_TYPE_ADMIN && network.getGuestType() == GuestIpType.Direct && startIP != null && endIP != null && gateway != null) {
- //Create vlan ip range
- Vlan vlan = _configMgr.createVlanAndPublicIpRange(userId, zoneId, null, startIP, endIP, gateway, netmask, false, vlanId, owner, networkId);
- if (vlan == null) {
- txn.rollback();
- throw new CloudRuntimeException("Failed to create a vlan");
- }
- }
- txn.commit();
-
- String eventMsg = "Successfully created network " + name + " (networkOfferingId=" + networkOfferingId + ", isShared=" + isShared + ", ownerId=" + ownerId + ", netmask=" + netmask + ", startIP=" + startIP + ", endIP=" + endIP + ", gateway=" + gateway + ", vlan=" + vlanId + ")";
- if (networks != null && !networks.isEmpty()) {
- _configMgr.saveConfigurationEvent(userId, ownerId, EventTypes.EVENT_NETWORK_CREATE, eventMsg,
- "dcId=" + zoneId,
- "networkOfferingId=" + networkOfferingId,
- "name=" + name,
- "isShared=" + isShared,
- "ownerId=" + ownerId,
- "networkGateway=" + gateway,
- "networkNetmask=" + netmask,
- "startIP=" + startIP,
- "endIP=" + endIP,
- "vlan=" + vlanId);
- }
-
- return networks.get(0);
- } catch (Exception ex) {
- s_logger.warn("Unexpected exception while creating network ", ex);
- txn.rollback();
- } finally {
- txn.close();
- }
- return null;
+
+ Transaction txn = Transaction.currentTxn();
+ txn.start();
+ try {
+ // Create network
+ DataCenterDeployment plan = new DataCenterDeployment(zoneId, null, null, null);
+ NetworkVO userNetwork = new NetworkVO();
+ userNetwork.setNetworkDomain(networkDomain);
+
+ // cidr should be set only when the user is admin
+ if (ctxAccount.getType() == Account.ACCOUNT_TYPE_ADMIN) {
+ if (cidr != null && gateway != null) {
+ userNetwork.setCidr(cidr);
+ userNetwork.setGateway(gateway);
+ if (vlanId != null) {
+ userNetwork.setBroadcastUri(URI.create("vlan://" + vlanId));
+ userNetwork.setBroadcastDomainType(BroadcastDomainType.Vlan);
+ if (!vlanId.equalsIgnoreCase(Vlan.UNTAGGED)) {
+ userNetwork.setBroadcastDomainType(BroadcastDomainType.Vlan);
+ } else {
+ userNetwork.setBroadcastDomainType(BroadcastDomainType.Native);
+ }
+ }
+ }
+ }
+
+ List networks = setupNetwork(owner, networkOffering, userNetwork, plan, name, displayText, isShared, isDefault);
+ Long networkId = null;
+
+ Network network = null;
+ if (networks == null || networks.isEmpty()) {
+ txn.rollback();
+ throw new CloudRuntimeException("Fail to create a network");
+ } else {
+ network = networks.get(0);
+ networkId = networks.get(0).getId();
+ if (network.getGuestType() == GuestIpType.Virtual) {
+ s_logger.debug("Creating a source natp ip for " + network);
+ PublicIp ip = assignSourceNatIpAddress(owner, network, userId);
+ if (ip == null) {
+ throw new InsufficientAddressCapacityException("Unable to assign source nat ip address to owner for this network", DataCenter.class, zoneId);
+ }
+ }
+ }
+
+ // Don't pass owner to create vlan when network offering is of type Direct - done to prevent accountVlanMap entry
+ // creation when vlan is mapped to network
+ if (network.getGuestType() == GuestIpType.Direct) {
+ owner = null;
+ }
+
+ if (ctxAccount.getType() == Account.ACCOUNT_TYPE_ADMIN && network.getGuestType() == GuestIpType.Direct && startIP != null && endIP != null && gateway != null) {
+ // Create vlan ip range
+ Vlan vlan = _configMgr.createVlanAndPublicIpRange(userId, zoneId, null, startIP, endIP, gateway, netmask, false, vlanId, owner, networkId);
+ if (vlan == null) {
+ txn.rollback();
+ throw new CloudRuntimeException("Failed to create a vlan");
+ }
+ }
+ txn.commit();
+
+ return networks.get(0);
+ } catch (Exception ex) {
+ s_logger.warn("Unexpected exception while creating network ", ex);
+ txn.rollback();
+ } finally {
+ txn.close();
+ }
+ return null;
}
-
+
@Override
- public List searchForNetworks(ListNetworksCmd cmd) {
- Object id = cmd.getId();
+ public List searchForNetworks(ListNetworksCmd cmd) {
+ Object id = cmd.getId();
Object keyword = cmd.getKeyword();
- Long zoneId= cmd.getZoneId();
+ Long zoneId = cmd.getZoneId();
Account account = UserContext.current().getCaller();
Long domainId = cmd.getDomainId();
String accountName = cmd.getAccountName();
@@ -1494,16 +1438,16 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
Boolean isShared = cmd.getIsShared();
Boolean isDefault = cmd.isDefault();
Long accountId = null;
-
+
if (isSystem == null) {
isSystem = false;
}
-
- //Account/domainId parameters and isSystem are mutually exclusive
+
+ // Account/domainId parameters and isSystem are mutually exclusive
if (isSystem && (accountName != null || domainId != null)) {
throw new InvalidParameterValueException("System network belongs to system, account and domainId parameters can't be specified");
}
-
+
if (_accountMgr.isAdmin(account.getType())) {
if (domainId != null) {
if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), domainId)) {
@@ -1525,83 +1469,84 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
domainId = account.getDomainId();
accountId = account.getId();
}
-
+
Filter searchFilter = new Filter(NetworkVO.class, "id", false, cmd.getStartIndex(), cmd.getPageSizeVal());
SearchBuilder sb = _networksDao.createSearchBuilder();
-
- //Don't display networks created of system network offerings
- SearchBuilder networkOfferingSearch = _networkOfferingDao.createSearchBuilder();
+
+ // Don't display networks created of system network offerings
+ SearchBuilder