cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject [50/57] [abbrv] [partial] merge master
Date Mon, 13 May 2013 12:26:20 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f418628..016554a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,10 +18,7 @@
 build/replace.properties
 build/build.number
 bin/
-cloudstack-proprietary/
-premium/
 .lock-wscript
-artifacts/
 .waf-*
 waf-*
 target/
@@ -37,7 +34,7 @@ cloud-*.tar.bz2
 *.egg-info/
 *.prefs
 build.number
-api.log.*.gz
+*.log.*.gz
 cloud.log.*.*
 unittest
 deps/cloud.userlibraries
@@ -59,6 +56,7 @@ tools/cli/build/
 *.iso
 *.tar.gz
 *.tgz
+.*
 target-eclipse
 awsapi/modules/*
 !.gitignore

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/agent/conf/agent.properties
----------------------------------------------------------------------
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index e49afbf..7dc4ba8 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -78,7 +78,7 @@ domr.scripts.dir=scripts/network/domr/kvm
 # a sensible default will be selected based on the network.bridge.type but can
 # be overridden here.
 # native = com.cloud.hypervisor.kvm.resource.BridgeVifDriver
-# openvswitch = com.cloud.hypervisor.kvm.resource.OvsBridgeDriver
+# openvswitch = com.cloud.hypervisor.kvm.resource.OvsVifDriver
 #libvirt.vif.driver=com.cloud.hypervisor.kvm.resource.BridgeVifDriver
 
 # set the hypervisor type, values are: kvm, lxc

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/AgentControlAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/AgentControlAnswer.java b/api/src/com/cloud/agent/api/AgentControlAnswer.java
deleted file mode 100644
index 7dbf7b5..0000000
--- a/api/src/com/cloud/agent/api/AgentControlAnswer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class AgentControlAnswer extends Answer {
-	public AgentControlAnswer() {
-	}
-
-    public AgentControlAnswer(Command command) {
-        super(command);
-    }
-
-    public AgentControlAnswer(Command command, boolean success, String details) {
-    	super(command, success, details);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/AgentControlCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/AgentControlCommand.java b/api/src/com/cloud/agent/api/AgentControlCommand.java
deleted file mode 100644
index da187ac..0000000
--- a/api/src/com/cloud/agent/api/AgentControlCommand.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class AgentControlCommand extends Command {
-
-	public AgentControlCommand() {
-	}
-
-    public boolean executeInSequence() {
-    	return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/AttachIsoCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/AttachIsoCommand.java b/api/src/com/cloud/agent/api/AttachIsoCommand.java
deleted file mode 100644
index c6f0b61..0000000
--- a/api/src/com/cloud/agent/api/AttachIsoCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class AttachIsoCommand extends Command {
-
-	private String vmName;
-	private String storeUrl;
-	private String isoPath;
-	private boolean attach;
-
-	protected AttachIsoCommand() {
-	}
-
-	public AttachIsoCommand(String vmName, String isoPath, boolean attach) {
-		this.vmName = vmName;
-		this.isoPath = isoPath;
-		this.attach = attach;
-	}
-
-	@Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-	public String getVmName() {
-		return vmName;
-	}
-
-	public String getIsoPath() {
-		return isoPath;
-	}
-
-	public boolean isAttach() {
-	    return attach;
-	}
-
-	public String getStoreUrl() {
-		return storeUrl;
-	}
-
-	public void setStoreUrl(String url) {
-		storeUrl = url;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/AttachVolumeAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/AttachVolumeAnswer.java b/api/src/com/cloud/agent/api/AttachVolumeAnswer.java
deleted file mode 100644
index b377b7c..0000000
--- a/api/src/com/cloud/agent/api/AttachVolumeAnswer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-
-public class AttachVolumeAnswer extends Answer {
-    private Long deviceId;
-    private String chainInfo;
-
-    protected AttachVolumeAnswer() {
-
-    }
-
-    public AttachVolumeAnswer(AttachVolumeCommand cmd, String result) {
-        super(cmd, false, result);
-        this.deviceId = null;
-    }
-
-    public AttachVolumeAnswer(AttachVolumeCommand cmd, Long deviceId) {
-        super(cmd);
-        this.deviceId = deviceId;
-    }
-
-
-    public AttachVolumeAnswer(AttachVolumeCommand cmd) {
-        super(cmd);
-        this.deviceId = null;
-    }
-
-    /**
-     * @return the deviceId
-     */
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setChainInfo(String chainInfo) {
-    	this.chainInfo = chainInfo;
-    }
-
-    public String getChainInfo() {
-    	return chainInfo;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/AttachVolumeCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/AttachVolumeCommand.java b/api/src/com/cloud/agent/api/AttachVolumeCommand.java
deleted file mode 100644
index 302b8f8..0000000
--- a/api/src/com/cloud/agent/api/AttachVolumeCommand.java
+++ /dev/null
@@ -1,99 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.storage.Storage.StoragePoolType;
-
-public class AttachVolumeCommand extends Command {
-
-	boolean attach;
-	String vmName;
-	StoragePoolType pooltype;
-	String poolUuid;
-	String volumeFolder;
-	String volumePath;
-	String volumeName;
-	Long deviceId;
-	String chainInfo;
-
-	protected AttachVolumeCommand() {
-	}
-
-	public AttachVolumeCommand(boolean attach, String vmName, StoragePoolType pooltype, String volumeFolder, String volumePath, String volumeName, Long deviceId, String chainInfo) {
-		this.attach = attach;
-		this.vmName = vmName;
-		this.pooltype = pooltype;
-		this.volumeFolder = volumeFolder;
-		this.volumePath = volumePath;
-		this.volumeName = volumeName;
-		this.deviceId = deviceId;
-		this.chainInfo = chainInfo;
-	}
-
-	@Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-	public boolean getAttach() {
-		return attach;
-	}
-
-	public String getVmName() {
-		return vmName;
-	}
-
-	public StoragePoolType getPooltype() {
-        return pooltype;
-    }
-
-    public void setPooltype(StoragePoolType pooltype) {
-        this.pooltype = pooltype;
-    }
-
-    public String getVolumeFolder() {
-		return volumeFolder;
-	}
-
-	public String getVolumePath() {
-		return volumePath;
-	}
-
-	public String getVolumeName() {
-		return volumeName;
-	}
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public String getPoolUuid() {
-    	return poolUuid;
-    }
-
-    public void setPoolUuid(String poolUuid) {
-    	this.poolUuid = poolUuid;
-    }
-
-    public String getChainInfo() {
-    	return chainInfo;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java b/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java
deleted file mode 100644
index 9e35db6..0000000
--- a/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-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, boolean full) {
-        super(cmd, success, result);
-        this.backupSnapshotName = backupSnapshotName;
-        this.full = full;
-    }
-
-    /**
-     * @return the backupSnapshotName
-     */
-    public String getBackupSnapshotName() {
-        return backupSnapshotName;
-    }
-
-    public boolean isFull() {
-        return full;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/BackupSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/BackupSnapshotCommand.java b/api/src/com/cloud/agent/api/BackupSnapshotCommand.java
deleted file mode 100644
index cac686d..0000000
--- a/api/src/com/cloud/agent/api/BackupSnapshotCommand.java
+++ /dev/null
@@ -1,121 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.agent.api.LogLevel.Log4jLevel;
-import com.cloud.agent.api.to.S3TO;
-import com.cloud.agent.api.to.StorageFilerTO;
-import com.cloud.agent.api.to.SwiftTO;
-import com.cloud.storage.StoragePool;
-
-/**
- * This currently assumes that both primary and secondary storage are mounted on the XenServer.
- */
-public class BackupSnapshotCommand extends SnapshotCommand {
-    private String prevSnapshotUuid;
-    private String prevBackupUuid;
-    private boolean isVolumeInactive;
-    private String vmName;
-    private Long snapshotId;
-    @LogLevel(Log4jLevel.Off)
-    private SwiftTO swift;
-    private S3TO s3;
-    StorageFilerTO pool;
-    private Long secHostId;
-
-    protected BackupSnapshotCommand() {
-
-    }
-
-    /**
-     * @param primaryStoragePoolNameLabel   The UUID of the primary storage Pool
-     * @param secondaryStoragePoolURL  This is what shows up in the UI when you click on Secondary storage.
-     * @param snapshotUuid             The UUID of the snapshot which is going to be backed up
-     * @param prevSnapshotUuid         The UUID of the previous snapshot for this volume. This will be destroyed on the primary storage.
-     * @param prevBackupUuid           This is the UUID of the vhd file which was last backed up on secondary storage.
-     * @param firstBackupUuid          This is the backup of the first ever snapshot taken by the volume.
-     * @param isFirstSnapshotOfRootVolume true if this is the first snapshot of a root volume. Set the parent of the backup to null.
-     * @param isVolumeInactive         True if the volume belongs to a VM that is not running or is detached.
-     * @param secHostId                This is the Id of the secondary storage.
-     */
-    public BackupSnapshotCommand(String secondaryStoragePoolURL,
-                                 Long   dcId,
-                                 Long   accountId,
-                                 Long   volumeId,
-                                 Long   snapshotId,
-                                 Long   secHostId,
-                                 String volumePath,
-                                 StoragePool pool,
-                                 String snapshotUuid,
-                                 String snapshotName,
-                                 String prevSnapshotUuid,
-                                 String prevBackupUuid,
-                                 boolean isVolumeInactive,
-                                 String vmName,
-                                 int wait)
-    {
-        super(pool, secondaryStoragePoolURL, snapshotUuid, snapshotName, dcId, accountId, volumeId);
-        this.snapshotId = snapshotId;
-        this.prevSnapshotUuid = prevSnapshotUuid;
-        this.prevBackupUuid = prevBackupUuid;
-        this.isVolumeInactive = isVolumeInactive;
-        this.vmName = vmName;
-        this.secHostId = secHostId;
-        setVolumePath(volumePath);
-        setWait(wait);
-    }
-
-    public String getPrevSnapshotUuid() {
-        return prevSnapshotUuid;
-    }
-
-    public String getPrevBackupUuid() {
-        return prevBackupUuid;
-    }
-
-    public boolean isVolumeInactive() {
-        return isVolumeInactive;
-    }
-
-    public String getVmName() {
-        return vmName;
-    }
-
-    public SwiftTO getSwift() {
-        return swift;
-    }
-
-    public void setSwift(SwiftTO swift) {
-        this.swift = swift;
-    }
-
-    public S3TO getS3() {
-        return s3;
-    }
-
-    public void setS3(S3TO s3) {
-        this.s3 = s3;
-    }
-
-    public Long getSnapshotId() {
-        return snapshotId;
-    }
-
-    public Long getSecHostId() {
-        return secHostId;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/BumpUpPriorityCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/BumpUpPriorityCommand.java b/api/src/com/cloud/agent/api/BumpUpPriorityCommand.java
deleted file mode 100644
index 5d3f10f..0000000
--- a/api/src/com/cloud/agent/api/BumpUpPriorityCommand.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.agent.api.routing.NetworkElementCommand;
-
-public class BumpUpPriorityCommand extends NetworkElementCommand {
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-    public BumpUpPriorityCommand() {
-        super();
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CancelCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CancelCommand.java b/api/src/com/cloud/agent/api/CancelCommand.java
deleted file mode 100644
index 0692055..0000000
--- a/api/src/com/cloud/agent/api/CancelCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-
-
-public class CancelCommand extends Command {
-    protected long sequence;
-    protected String reason;
-
-    protected CancelCommand() {
-    }
-
-    public CancelCommand(long sequence, String reason) {
-        this.sequence = sequence;
-        this.reason = reason;
-    }
-
-    public long getSequence() {
-        return sequence;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ChangeAgentAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ChangeAgentAnswer.java b/api/src/com/cloud/agent/api/ChangeAgentAnswer.java
deleted file mode 100644
index 537eabe..0000000
--- a/api/src/com/cloud/agent/api/ChangeAgentAnswer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class ChangeAgentAnswer extends Answer {
-	protected ChangeAgentAnswer() {
-	}
-
-	public ChangeAgentAnswer(ChangeAgentCommand cmd, boolean result) {
-		super(cmd, result, null);
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ChangeAgentCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ChangeAgentCommand.java b/api/src/com/cloud/agent/api/ChangeAgentCommand.java
deleted file mode 100644
index abdb60a..0000000
--- a/api/src/com/cloud/agent/api/ChangeAgentCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.host.Status.Event;
-
-public class ChangeAgentCommand extends Command {
-	long agentId;
-	Event event;
-
-	protected ChangeAgentCommand() {
-	}
-
-	public ChangeAgentCommand(long agentId, Event event) {
-		this.agentId = agentId;
-		this.event = event;
-	}
-
-	public long getAgentId() {
-		return agentId;
-	}
-
-	public Event getEvent() {
-		return event;
-	}
-
-	@Override
-	public boolean executeInSequence() {
-		return false;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckHealthAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckHealthAnswer.java b/api/src/com/cloud/agent/api/CheckHealthAnswer.java
deleted file mode 100644
index f9f723a..0000000
--- a/api/src/com/cloud/agent/api/CheckHealthAnswer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class CheckHealthAnswer extends Answer {
-
-    public CheckHealthAnswer() {}
-
-    public CheckHealthAnswer(CheckHealthCommand cmd, boolean alive) {
-        super(cmd, alive, "resource is " + (alive? "alive" : "not alive"));
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckHealthCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckHealthCommand.java b/api/src/com/cloud/agent/api/CheckHealthCommand.java
deleted file mode 100644
index ff42276..0000000
--- a/api/src/com/cloud/agent/api/CheckHealthCommand.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class CheckHealthCommand extends Command {
-
-    public CheckHealthCommand() {
-        setWait(50);
-    }
-
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckNetworkAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckNetworkAnswer.java b/api/src/com/cloud/agent/api/CheckNetworkAnswer.java
deleted file mode 100644
index 52825fd..0000000
--- a/api/src/com/cloud/agent/api/CheckNetworkAnswer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class CheckNetworkAnswer extends Answer {
-    // indicate if agent reconnect is needed after setupNetworkNames command
-    private boolean _reconnect;
-    public CheckNetworkAnswer() {}
-
-
-    public CheckNetworkAnswer(CheckNetworkCommand cmd, boolean result, String details, boolean reconnect) {
-        super(cmd, result, details);
-        _reconnect = reconnect;
-    }
-
-    public CheckNetworkAnswer(CheckNetworkCommand cmd, boolean result, String details) {
-        this(cmd, result, details, false);
-    }
-
-    public boolean needReconnect() {
-        return _reconnect;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckNetworkCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckNetworkCommand.java b/api/src/com/cloud/agent/api/CheckNetworkCommand.java
deleted file mode 100644
index 8e1be56..0000000
--- a/api/src/com/cloud/agent/api/CheckNetworkCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import java.util.List;
-
-import com.cloud.network.PhysicalNetworkSetupInfo;
-
-public class CheckNetworkCommand extends Command {
-
-    List<PhysicalNetworkSetupInfo> networkInfoList;
-
-    public CheckNetworkCommand(List<PhysicalNetworkSetupInfo> networkInfoList) {
-        this.networkInfoList = networkInfoList;
-    }
-
-    public List<PhysicalNetworkSetupInfo> getPhysicalNetworkInfoList() {
-        return networkInfoList;
-    }
-
-    protected CheckNetworkCommand() {
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckOnHostAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckOnHostAnswer.java b/api/src/com/cloud/agent/api/CheckOnHostAnswer.java
deleted file mode 100644
index e5325e3..0000000
--- a/api/src/com/cloud/agent/api/CheckOnHostAnswer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class CheckOnHostAnswer extends Answer {
-    boolean determined;
-    boolean alive;
-
-    protected CheckOnHostAnswer() {
-    }
-
-    public CheckOnHostAnswer(CheckOnHostCommand cmd, Boolean alive, String details) {
-        super(cmd, true, details);
-        if (alive == null) {
-            determined = false;
-        } else {
-            determined = true;
-            this.alive = alive;
-        }
-    }
-
-    public CheckOnHostAnswer(CheckOnHostCommand cmd, String details) {
-        super(cmd, false, details);
-    }
-
-    public boolean isDetermined() {
-        return determined;
-    }
-
-    public boolean isAlive() {
-        return alive;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckOnHostCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckOnHostCommand.java b/api/src/com/cloud/agent/api/CheckOnHostCommand.java
deleted file mode 100644
index 596a532..0000000
--- a/api/src/com/cloud/agent/api/CheckOnHostCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.agent.api.to.HostTO;
-import com.cloud.host.Host;
-
-public class CheckOnHostCommand extends Command {
-    HostTO host;
-
-    protected CheckOnHostCommand() {
-    }
-
-
-    public CheckOnHostCommand(Host host) {
-        this.host = new HostTO(host);
-        setWait(20);
-    }
-
-    public HostTO getHost() {
-        return host;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckRouterAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckRouterAnswer.java b/api/src/com/cloud/agent/api/CheckRouterAnswer.java
deleted file mode 100644
index da8189f..0000000
--- a/api/src/com/cloud/agent/api/CheckRouterAnswer.java
+++ /dev/null
@@ -1,81 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.network.router.VirtualRouter.RedundantState;
-
-public class CheckRouterAnswer extends Answer {
-    public static final String ROUTER_NAME = "router.name";
-    public static final String ROUTER_IP = "router.ip";
-    RedundantState state;
-    boolean isBumped;
-
-    protected CheckRouterAnswer() {
-    }
-
-    public CheckRouterAnswer(CheckRouterCommand cmd, String details, boolean parse) {
-        super(cmd, true, details);
-        if (parse) {
-            if (!parseDetails(details)) {
-                this.result = false;
-            }
-        }
-	}
-
-    public CheckRouterAnswer(CheckRouterCommand cmd, String details) {
-        super(cmd, false, details);
-    }
-
-    protected boolean parseDetails(String details) {
-        String[] lines = details.split("&");
-        if (lines.length != 2) {
-            return false;
-        }
-        if (lines[0].startsWith("Status: MASTER")) {
-            state = RedundantState.MASTER;
-        } else if (lines[0].startsWith("Status: BACKUP")) {
-            state = RedundantState.BACKUP;
-        } else if (lines[0].startsWith("Status: FAULT")) {
-            state = RedundantState.FAULT;
-        } else {
-            state = RedundantState.UNKNOWN;
-        }
-        if (lines[1].startsWith("Bumped: YES")) {
-            isBumped = true;
-        } else {
-            isBumped = false;
-        }
-        return true;
-    }
-
-    public void setState(RedundantState state) {
-        this.state = state;
-	}
-
-    public RedundantState getState() {
-        return state;
-	}
-
-    public boolean isBumped() {
-        return isBumped;
-    }
-
-    public void setIsBumped(boolean isBumped) {
-        this.isBumped = isBumped;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckRouterCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckRouterCommand.java b/api/src/com/cloud/agent/api/CheckRouterCommand.java
deleted file mode 100644
index 6215fc3..0000000
--- a/api/src/com/cloud/agent/api/CheckRouterCommand.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.agent.api.routing.NetworkElementCommand;
-
-public class CheckRouterCommand extends NetworkElementCommand {
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-    public CheckRouterCommand() {
-        super();
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
deleted file mode 100644
index 0e9db96..0000000
--- a/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class CheckS2SVpnConnectionsAnswer extends Answer {
-    Map<String, Boolean> ipToConnected;
-    Map<String, String> ipToDetail;
-    String details;
-
-    protected CheckS2SVpnConnectionsAnswer() {
-        ipToConnected = new HashMap<String, Boolean>();
-        ipToDetail = new HashMap<String, String>();
-    }
-
-    public CheckS2SVpnConnectionsAnswer(CheckS2SVpnConnectionsCommand cmd, boolean result, String details) {
-        super(cmd, result, details);
-        ipToConnected = new HashMap<String, Boolean>();
-        ipToDetail = new HashMap<String, String>();
-        this.details = details;
-        if (result) {
-            parseDetails(details);
-        }
-    }
-
-    protected void parseDetails(String details) {
-        String[] lines = details.split("&");
-        for (String line : lines) {
-            String[] words = line.split(":");
-            if (words.length != 3) {
-                //Not something we can parse
-                return;
-            }
-            String ip = words[0];
-            boolean connected = words[1].equals("0");
-            String detail = words[2];
-            ipToConnected.put(ip, connected);
-            ipToDetail.put(ip, detail);
-        }
-    }
-
-    public boolean isConnected(String ip) {
-        if (this.getResult()) {
-            return ipToConnected.get(ip);
-        }
-        return false;
-    }
-
-    public String getDetail(String ip) {
-        if (this.getResult()) {
-            return ipToDetail.get(ip);
-        }
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java b/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
deleted file mode 100644
index 9cfb53b..0000000
--- a/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import java.util.List;
-
-import com.cloud.agent.api.routing.NetworkElementCommand;
-
-public class CheckS2SVpnConnectionsCommand extends NetworkElementCommand {
-    List<String> vpnIps;
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-    public CheckS2SVpnConnectionsCommand(List<String> vpnIps) {
-        super();
-        this.vpnIps = vpnIps;
-    }
-
-    public List<String> getVpnIps() {
-        return vpnIps;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckStateAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckStateAnswer.java b/api/src/com/cloud/agent/api/CheckStateAnswer.java
deleted file mode 100755
index bf8ae0f..0000000
--- a/api/src/com/cloud/agent/api/CheckStateAnswer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.vm.VirtualMachine.State;
-
-/**
- */
-public class CheckStateAnswer extends Answer {
-    State state;
-
-    public CheckStateAnswer() {}
-
-    public CheckStateAnswer(CheckStateCommand cmd, State state) {
-        this(cmd, state, null);
-    }
-
-    public CheckStateAnswer(CheckStateCommand cmd, String details) {
-        super(cmd, false, details);
-        this.state = null;
-    }
-
-    public CheckStateAnswer(CheckStateCommand cmd, State state, String details) {
-        super(cmd, true, details);
-        this.state = state;
-    }
-
-    public State getState() {
-        return state;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckStateCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckStateCommand.java b/api/src/com/cloud/agent/api/CheckStateCommand.java
deleted file mode 100755
index 89fc773..0000000
--- a/api/src/com/cloud/agent/api/CheckStateCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-/**
- *
- *
- */
-public class CheckStateCommand extends Command {
-    String vmName;
-
-    public CheckStateCommand() {}
-
-    public CheckStateCommand(String vmName) {
-        this.vmName = vmName;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-    public String getVmName() {
-        return vmName;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java b/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
deleted file mode 100644
index 3f0ffdb..0000000
--- a/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.vm.VirtualMachine.State;
-
-public class CheckVirtualMachineAnswer extends Answer {
-
-    Integer vncPort;
-    State state;
-
-
-    protected CheckVirtualMachineAnswer() {
-    }
-
-    public CheckVirtualMachineAnswer(CheckVirtualMachineCommand cmd, State state, Integer vncPort, String detail) {
-        super(cmd, true, detail);
-        this.state = state;
-        this.vncPort = vncPort;
-    }
-
-    public CheckVirtualMachineAnswer(CheckVirtualMachineCommand cmd, State state, Integer vncPort) {
-        this(cmd, state, vncPort, null);
-    }
-
-    public CheckVirtualMachineAnswer(CheckVirtualMachineCommand cmd, String detail) {
-        super(cmd, false, detail);
-    }
-
-
-    public Integer getVncPort() {
-        return vncPort;
-    }
-
-    public State getState() {
-        return state;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java b/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
deleted file mode 100644
index 62f4420..0000000
--- a/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class CheckVirtualMachineCommand extends Command {
-
-    private String vmName;
-
-    protected CheckVirtualMachineCommand() {
-
-    }
-
-    public CheckVirtualMachineCommand(String vmName) {
-        this.vmName = vmName;
-        setWait(20);
-    }
-
-    public String getVmName() {
-        return vmName;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java b/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
deleted file mode 100644
index 8b5172d..0000000
--- a/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-
-public class CleanupNetworkRulesCmd extends Command implements CronCommand {
-
-    private int interval = 10*60;
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-
-
-
-    public CleanupNetworkRulesCmd(int intervalSecs) {
-        super();
-        interval = intervalSecs;
-    }
-
-    public CleanupNetworkRulesCmd() {
-
-    }
-
-
-    @Override
-    public int getInterval() {
-        return interval;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java b/api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java
deleted file mode 100644
index ae65a52..0000000
--- a/api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java
+++ /dev/null
@@ -1,75 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import java.util.List;
-
-public class CleanupSnapshotBackupCommand extends Command {
-        private String secondaryStoragePoolURL;
-        private Long   dcId;
-        private Long   accountId;
-        private Long   volumeId;
-        private List<String> validBackupUUIDs;
-
-    protected CleanupSnapshotBackupCommand() {
-
-    }
-
-     /*
-     * @param secondaryStoragePoolURL    This is what shows up in the UI when you click on Secondary storage.
-     *                                    In the code, it is present as: In the vmops.host_details table, there is a field mount.parent. This is the value of that field
-     *                                    If you have better ideas on how to get it, you are welcome.
-     * @param validBackupUUID             The VHD which are valid
-     */
-    public CleanupSnapshotBackupCommand(String secondaryStoragePoolURL,
-                                       Long   dcId,
-                                       Long   accountId,
-                                       Long   volumeId,
-                                       List<String> validBackupUUIDs)
-    {
-        this.secondaryStoragePoolURL = secondaryStoragePoolURL;
-        this.dcId = dcId;
-        this.accountId = accountId;
-        this.volumeId = volumeId;
-        this.validBackupUUIDs = validBackupUUIDs;
-    }
-
-    public String getSecondaryStoragePoolURL() {
-        return secondaryStoragePoolURL;
-    }
-
-    public Long getDcId() {
-        return dcId;
-    }
-
-    public Long getAccountId() {
-        return accountId;
-    }
-
-    public Long getVolumeId() {
-        return volumeId;
-    }
-
-    public List<String> getValidBackupUUIDs() {
-        return validBackupUUIDs;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ClusterSyncAnswer.java b/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
deleted file mode 100644
index 99fee2a..0000000
--- a/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import java.util.HashMap;
-
-import com.cloud.utils.Pair;
-import com.cloud.vm.VirtualMachine.State;
-
-public class ClusterSyncAnswer extends Answer {
-    private long _clusterId;
-    private HashMap<String, Pair<String, State>> _newStates;
-    private boolean _isExecuted=false;
-
-    // this is here because a cron command answer is being sent twice
-    //  AgentAttache.processAnswers
-    //  AgentManagerImpl.notifyAnswersToMonitors
-    public boolean isExceuted(){
-        return _isExecuted;
-    }
-
-    public void setExecuted(){
-        _isExecuted = true;
-    }
-
-
-    public ClusterSyncAnswer(long clusterId, HashMap<String, Pair<String, State>> newStates){
-        _clusterId = clusterId;
-        _newStates = newStates;
-        result = true;
-    }
-
-    public long getClusterId() {
-        return _clusterId;
-    }
-
-    public HashMap<String, Pair<String, State>> getNewStates() {
-        return _newStates;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ClusterSyncCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ClusterSyncCommand.java b/api/src/com/cloud/agent/api/ClusterSyncCommand.java
deleted file mode 100644
index 17dbbd8..0000000
--- a/api/src/com/cloud/agent/api/ClusterSyncCommand.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-
-public class ClusterSyncCommand extends Command implements CronCommand {
-    int _interval;
-
-    long _clusterId;
-
-    public ClusterSyncCommand() {
-    }
-
-    public ClusterSyncCommand(int interval, long clusterId){
-        _interval = interval;
-        _clusterId = clusterId;
-    }
-
-    @Override
-    public int getInterval() {
-        return _interval;
-    }
-
-    public long getClusterId() {
-        return _clusterId;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ComputeChecksumCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ComputeChecksumCommand.java b/api/src/com/cloud/agent/api/ComputeChecksumCommand.java
deleted file mode 100755
index a2c88c4..0000000
--- a/api/src/com/cloud/agent/api/ComputeChecksumCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.agent.api.storage.ssCommand;
-
-
-public class ComputeChecksumCommand extends ssCommand {
-
-
-    private String templatePath;
-    public ComputeChecksumCommand() {
-        super();
-    }
-
-    public ComputeChecksumCommand(String secUrl, String templatePath) {
-        super(secUrl);
-        this.templatePath = templatePath;
-    }
-
-    public String getTemplatePath() {
-        return templatePath;
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java b/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
deleted file mode 100644
index 9f50a2f..0000000
--- a/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class ConsoleAccessAuthenticationAnswer extends AgentControlAnswer {
-
-	private boolean _success;
-
-	private boolean _isReauthenticating;
-	private String _host;
-	private int _port;
-
-	private String _tunnelUrl;
-	private String _tunnelSession;
-
-	public ConsoleAccessAuthenticationAnswer() {
-		_success = false;
-		_isReauthenticating = false;
-		_port = 0;
-	}
-
-	public ConsoleAccessAuthenticationAnswer(Command cmd, boolean success) {
-		super(cmd);
-		_success = success;
-	}
-
-	public boolean succeeded() {
-		return _success;
-	}
-
-	public void setSuccess(boolean value) {
-		_success = value;
-	}
-
-	public boolean isReauthenticating() {
-		return _isReauthenticating;
-	}
-
-	public void setReauthenticating(boolean value) {
-		_isReauthenticating = value;
-	}
-
-	public String getHost() {
-		return _host;
-	}
-
-	public void setHost(String host) {
-		_host = host;
-	}
-
-	public int getPort() {
-		return _port;
-	}
-
-	public void setPort(int port) {
-		_port = port;
-	}
-
-	public String getTunnelUrl() {
-		return _tunnelUrl;
-	}
-
-	public void setTunnelUrl(String tunnelUrl) {
-		_tunnelUrl = tunnelUrl;
-	}
-
-	public String getTunnelSession() {
-		return _tunnelSession;
-	}
-
-	public void setTunnelSession(String tunnelSession) {
-		_tunnelSession = tunnelSession;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java b/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
deleted file mode 100644
index bd8093c..0000000
--- a/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
+++ /dev/null
@@ -1,68 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class ConsoleAccessAuthenticationCommand extends AgentControlCommand {
-
-	private String _host;
-	private String _port;
-	private String _vmId;
-	private String _sid;
-	private String _ticket;
-
-	private boolean _isReauthenticating;
-
-	public ConsoleAccessAuthenticationCommand() {
-		_isReauthenticating = false;
-	}
-
-	public ConsoleAccessAuthenticationCommand(String host, String port, String vmId, String sid, String ticket) {
-		_host = host;
-		_port = port;
-		_vmId = vmId;
-		_sid = sid;
-		_ticket = ticket;
-	}
-
-	public String getHost() {
-		return _host;
-	}
-
-	public String getPort() {
-		return _port;
-	}
-
-	public String getVmId() {
-		return _vmId;
-	}
-
-	public String getSid() {
-		return _sid;
-	}
-
-	public String getTicket() {
-		return _ticket;
-	}
-
-	public boolean isReauthenticating() {
-		return _isReauthenticating;
-	}
-
-	public void setReauthenticating(boolean value) {
-		_isReauthenticating = value;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java b/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
deleted file mode 100644
index ebb06b6..0000000
--- a/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class ConsoleProxyLoadReportCommand extends AgentControlCommand {
-
-	private long _proxyVmId;
-	private String _loadInfo;
-
-	public ConsoleProxyLoadReportCommand() {
-	}
-
-	public ConsoleProxyLoadReportCommand(long proxyVmId, String loadInfo) {
-		_proxyVmId = proxyVmId;
-		_loadInfo = loadInfo;
-	}
-
-	public long getProxyVmId() {
-		return _proxyVmId;
-	}
-
-	public String getLoadInfo() {
-		return _loadInfo;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java b/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
deleted file mode 100644
index 9e2680e..0000000
--- a/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
+++ /dev/null
@@ -1,82 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.storage.StoragePool;
-
-/**
- * This currently assumes that both primary and secondary storage are mounted on the XenServer.
- */
-public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand {
-    private String origTemplateInstallPath;
-    private Long   newTemplateId;
-    private String templateName;
-
-    protected CreatePrivateTemplateFromSnapshotCommand() {
-
-    }
-
-    /**
-     * Given the UUID of a backed up snapshot VHD file on the secondary storage, the execute of this command does
-     * 1) Get the parent chain of this VHD all the way up to the root, say VHDList
-     * 2) Copy all the files in the VHDlist to some temp location
-     * 3) Coalesce all the VHDs to one VHD which contains all the data of the volume. This invokes the DeletePreviousBackupCommand for each VHD
-     * 4) Rename the UUID of this VHD
-     * @param secondaryStoragePoolURL  This is what shows up in the UI when you click on Secondary storage.
-     *                                 In the code, it is present as: In the vmops.host_details table, there is a field mount.parent. This is the value of that field
-     *                                 If you have better ideas on how to get it, you are welcome.
-     *                                 It may not be the UUID of the base copy of the snapshot, if no data was written since last snapshot.
-     * @param origTemplateInstallPath  The install path of the original template VHD on the secondary
-     */
-
-    public CreatePrivateTemplateFromSnapshotCommand(StoragePool pool,
-                                                    String secondaryStoragePoolURL,
-                                                    Long   dcId,
-                                                    Long   accountId,
-                                                    Long   volumeId,
-                                                    String backedUpSnapshotUuid,
-                                                    String backedUpSnapshotName,
-                                                    String origTemplateInstallPath,
-                                                    Long   newTemplateId,
-                                                    String templateName,
-                                                    int wait)
-    {
-        super(pool, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId);
-        this.origTemplateInstallPath = origTemplateInstallPath;
-        this.newTemplateId = newTemplateId;
-        this.templateName = templateName;
-        setWait(wait);
-    }
-
-    /**
-     * @return the origTemplateInstallPath
-     */
-    public String getOrigTemplateInstallPath() {
-        return origTemplateInstallPath;
-    }
-
-    public Long getNewTemplateId() {
-        return newTemplateId;
-    }
-
-    /**
-     * @return templateName
-     */
-    public String getTemplateName() {
-        return templateName;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java b/api/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
deleted file mode 100644
index 4e0bf32..0000000
--- a/api/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
+++ /dev/null
@@ -1,93 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.agent.api.to.StorageFilerTO;
-import com.cloud.storage.StoragePool;
-
-public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand {
-    private String _vmName;
-    private String _volumePath;
-    private String _userSpecifiedName;
-    private String _uniqueName;
-    private long _templateId;
-    private long _accountId;
-    StorageFilerTO _primaryPool;
-    // For XenServer
-    private String _secondaryStorageUrl;
-
-    public CreatePrivateTemplateFromVolumeCommand() {
-    }
-
-    public CreatePrivateTemplateFromVolumeCommand(StoragePool pool, String secondaryStorageUrl, long templateId, long accountId, String userSpecifiedName, String uniqueName, String volumePath, String vmName, int wait) {
-        _secondaryStorageUrl = secondaryStorageUrl;
-        _templateId = templateId;
-        _accountId = accountId;
-        _userSpecifiedName = userSpecifiedName;
-        _uniqueName = uniqueName;
-        _volumePath = volumePath;
-        _vmName = vmName;
-        primaryStoragePoolNameLabel = pool.getUuid();
-        _primaryPool = new StorageFilerTO(pool);
-        setWait(wait);
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-    public StorageFilerTO getPool() {
-        return _primaryPool;
-    }
-
-    public String getSecondaryStorageUrl() {
-        return _secondaryStorageUrl;
-    }
-
-    public String getTemplateName() {
-        return _userSpecifiedName;
-    }
-
-    public String getUniqueName() {
-        return _uniqueName;
-    }
-
-    public long getTemplateId() {
-        return _templateId;
-    }
-
-    public String getVmName() {
-        return _vmName;
-    }
-
-    public void setVolumePath(String _volumePath) {
-        this._volumePath = _volumePath;
-    }
-
-    public String getVolumePath() {
-        return _volumePath;
-    }
-
-    public Long getAccountId() {
-        return _accountId;
-    }
-
-    public void setTemplateId(long templateId) {
-        _templateId = templateId;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CreateStoragePoolCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreateStoragePoolCommand.java b/api/src/com/cloud/agent/api/CreateStoragePoolCommand.java
deleted file mode 100644
index 7a4d768..0000000
--- a/api/src/com/cloud/agent/api/CreateStoragePoolCommand.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.storage.StoragePool;
-
-public class CreateStoragePoolCommand extends ModifyStoragePoolCommand {
-
-
-	public CreateStoragePoolCommand() {
-	}
-
-    public CreateStoragePoolCommand(boolean add, StoragePool pool) {
-        super(add, pool);
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java b/api/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
deleted file mode 100644
index f9fb164..0000000
--- a/api/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package com.cloud.agent.api;
-
-import java.util.List;
-
-import com.cloud.agent.api.to.VolumeTO;
-
-public class CreateVMSnapshotAnswer extends Answer {
-
-    private List<VolumeTO> volumeTOs;
-    private VMSnapshotTO vmSnapshotTo;
-    
- 
-	public List<VolumeTO> getVolumeTOs() {
-        return volumeTOs;
-    }
-
-    public void setVolumeTOs(List<VolumeTO> volumeTOs) {
-        this.volumeTOs = volumeTOs;
-    }
-
-    public VMSnapshotTO getVmSnapshotTo() {
-        return vmSnapshotTo;
-    }
-
-    public void setVmSnapshotTo(VMSnapshotTO vmSnapshotTo) {
-        this.vmSnapshotTo = vmSnapshotTo;
-    }
-
-    public CreateVMSnapshotAnswer() {
-
-    }
-
-    public CreateVMSnapshotAnswer(CreateVMSnapshotCommand cmd, boolean success,
-            String result) {
-        super(cmd, success, result);
-    }
-
-    public CreateVMSnapshotAnswer(CreateVMSnapshotCommand cmd,
-    		VMSnapshotTO vmSnapshotTo, List<VolumeTO> volumeTOs) {
-        super(cmd, true, "");
-        this.vmSnapshotTo = vmSnapshotTo;
-        this.volumeTOs = volumeTOs;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreateVMSnapshotCommand.java b/api/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
deleted file mode 100644
index 478987d..0000000
--- a/api/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import java.util.List;
-
-import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.vm.VirtualMachine;
-
-public class CreateVMSnapshotCommand extends VMSnapshotBaseCommand {
-
-    public CreateVMSnapshotCommand(String vmName, VMSnapshotTO snapshot, List<VolumeTO> volumeTOs, String guestOSType, VirtualMachine.State vmState) {
-        super(vmName, snapshot, volumeTOs, guestOSType);
-        this.vmState  = vmState;
-    }
-
-    private VirtualMachine.State vmState;
-   
-
-    public VirtualMachine.State getVmState() {
-        return vmState;
-    }
-
-    public void setVmState(VirtualMachine.State vmState) {
-        this.vmState = vmState;
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java b/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
deleted file mode 100644
index 2f7cd94..0000000
--- a/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-
-public class CreateVolumeFromSnapshotAnswer extends Answer {
-    private String vdiUUID;
-
-    protected CreateVolumeFromSnapshotAnswer() {
-
-    }
-
-    public CreateVolumeFromSnapshotAnswer(CreateVolumeFromSnapshotCommand cmd, boolean success, String result, String vdiUUID) {
-        super(cmd, success, result);
-        this.vdiUUID = vdiUUID;
-    }
-
-    /**
-     * @return the vdi
-     */
-    public String getVdi() {
-        return vdiUUID;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java b/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
deleted file mode 100644
index fbf6121..0000000
--- a/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-import com.cloud.storage.StoragePool;
-
-
-/**
- * This currently assumes that both primary and secondary storage are mounted on the XenServer.
- */
-public class CreateVolumeFromSnapshotCommand extends SnapshotCommand {
-
-    protected CreateVolumeFromSnapshotCommand() {
-
-    }
-
-    /**
-     * Given the UUID of a backed up snapshot VHD file on the secondary storage, the execute of this command does
-     * 1) Get the parent chain of this VHD all the way up to the root, say VHDList
-     * 2) Copy all the files in the VHDlist to some temp location
-     * 3) Coalesce all the VHDs to one VHD which contains all the data of the volume. This invokes the DeletePreviousBackupCommand for each VHD
-     * 4) Rename the UUID of this VHD
-     * 5) Move this VHD to primary storage
-     * @param primaryStoragePoolNameLabel   The primary storage Pool
-     * @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
-     *                                 In the code, it is present as: In the vmops.host_details table, there is a field mount.parent. This is the value of that field
-     *                                 If you have better ideas on how to get it, you are welcome.
-     *                                 It may not be the UUID of the base copy of the snapshot, if no data was written since last snapshot.
-     * @param templatePath             The install path of the template VHD on the secondary, if this a root volume
-     */
-
-    public CreateVolumeFromSnapshotCommand(StoragePool pool,
-                                           String secondaryStoragePoolURL,
-                                           Long   dcId,
-                                           Long   accountId,
-                                           Long   volumeId,
-                                           String backedUpSnapshotUuid,
-                                           String backedUpSnapshotName,
-                                           int wait)
-    {
-        super(pool, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId);
-        setWait(wait);
-    }
-}


Mime
View raw message