cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [47/93] [abbrv] [partial] merge master
Date Mon, 13 May 2013 15:54:07 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java b/api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java
deleted file mode 100644
index 972a1c2..0000000
--- a/api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java
+++ /dev/null
@@ -1,25 +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 SetupGuestNetworkAnswer extends Answer{
-    public SetupGuestNetworkAnswer() {}
-
-    public SetupGuestNetworkAnswer(SetupGuestNetworkCommand cmd, boolean success, String result) {
-        super(cmd, success, result);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
deleted file mode 100644
index 2cf5bf8..0000000
--- a/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
+++ /dev/null
@@ -1,72 +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;
-import com.cloud.agent.api.to.NicTO;
-
-public class SetupGuestNetworkCommand extends NetworkElementCommand{
-    String dhcpRange;
-    String networkDomain;
-    String defaultDns1 = null;
-    String defaultDns2 = null;
-    boolean isRedundant = false;
-    Integer priority;
-    boolean add = true;
-    NicTO nic;
-
-    public NicTO getNic() {
-        return nic;
-    }
-
-    public String getDefaultDns1() {
-        return defaultDns1;
-    }
-
-    public String getDefaultDns2() {
-        return defaultDns2;
-    }
-
-    public String getNetworkDomain() {
-        return networkDomain;
-    }
-
-    public boolean isAdd() {
-       return add;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-    protected SetupGuestNetworkCommand() {
-    }
-
-
-    public SetupGuestNetworkCommand(String dhcpRange, String networkDomain, boolean isRedundant, Integer priority,
-            String defaultDns1, String defaultDns2, boolean add, NicTO nic) {
-        this.dhcpRange = dhcpRange;
-        this.networkDomain = networkDomain;
-        this.defaultDns1 = defaultDns1;
-        this.defaultDns2 = defaultDns2;
-        this.isRedundant = isRedundant;
-        this.priority = priority;
-        this.add = add;
-        this.nic = nic;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ShutdownCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ShutdownCommand.java b/api/src/com/cloud/agent/api/ShutdownCommand.java
deleted file mode 100644
index 5412f35..0000000
--- a/api/src/com/cloud/agent/api/ShutdownCommand.java
+++ /dev/null
@@ -1,56 +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 ShutdownCommand extends Command {
-    public static final String Requested = "sig.kill";
-    public static final String Update = "update";
-    public static final String Unknown = "unknown";
-    public static final String DeleteHost = "deleteHost";
-
-    private String reason;
-    private String detail;
-
-    protected ShutdownCommand() {
-        super();
-    }
-
-    public ShutdownCommand(String reason, String detail) {
-        super();
-        this.reason = reason;
-        this.detail = detail;
-    }
-
-    /**
-     * @return return the reason the agent shutdown.  If Unknown, call getDetail() for any details.
-     */
-    public String getReason() {
-        return reason;
-    }
-
-    public String getDetail() {
-        return detail;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/SnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SnapshotCommand.java b/api/src/com/cloud/agent/api/SnapshotCommand.java
deleted file mode 100644
index d8abeb6..0000000
--- a/api/src/com/cloud/agent/api/SnapshotCommand.java
+++ /dev/null
@@ -1,126 +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;
-
-/**
- * This currently assumes that both primary and secondary storage are mounted on
- * the XenServer.
- */
-public class SnapshotCommand extends Command {
-    protected String primaryStoragePoolNameLabel;
-    StorageFilerTO primaryPool;
-    private String snapshotUuid;
-    private String snapshotName;
-    private String secondaryStorageUrl;
-    private Long dcId;
-    private Long accountId;
-    private Long volumeId;
-    private String volumePath;
-
-    protected SnapshotCommand() {
-
-    }
-
-    /**
-     * @param primaryStoragePoolNameLabel
-     *            The primary storage Pool
-     * @param snapshotUuid
-     *            The UUID of the snapshot which is going to be backed up
-     * @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.
-     */
-    public SnapshotCommand(StoragePool pool,
-            String secondaryStorageUrl, String snapshotUuid,
-            String snapshotName, Long dcId, Long accountId, Long volumeId) {
-        this.primaryStoragePoolNameLabel = pool.getUuid();
-        this.primaryPool = new StorageFilerTO(pool);
-        this.snapshotUuid = snapshotUuid;
-        this.secondaryStorageUrl = secondaryStorageUrl;
-        this.dcId = dcId;
-        this.accountId = accountId;
-        this.volumeId = volumeId;
-        this.snapshotName = snapshotName;
-    }
-
-    /**
-     * @return the primaryStoragePoolNameLabel
-     */
-    public String getPrimaryStoragePoolNameLabel() {
-        return primaryStoragePoolNameLabel;
-    }
-
-    /**
-     * @return the primaryPool
-     */
-    public StorageFilerTO getPool() {
-        return primaryPool;
-    }
-
-    /**
-     * @return the snapshotUuid
-     */
-    public String getSnapshotUuid() {
-        return snapshotUuid;
-    }
-
-    public String getSnapshotName() {
-        return snapshotName;
-    }
-
-    /**
-     * @return the secondaryStoragePoolURL
-     */
-    public String getSecondaryStorageUrl() {
-        return secondaryStorageUrl;
-    }
-
-    public Long getDataCenterId() {
-        return dcId;
-    }
-
-    public Long getAccountId() {
-        return accountId;
-    }
-
-    public Long getVolumeId() {
-        return volumeId;
-    }
-
-    public String getVolumePath() {
-        return volumePath;
-    }
-
-    public void setVolumePath(String path) {
-        volumePath = path;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartAnswer.java b/api/src/com/cloud/agent/api/StartAnswer.java
deleted file mode 100644
index 922d060..0000000
--- a/api/src/com/cloud/agent/api/StartAnswer.java
+++ /dev/null
@@ -1,57 +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.VirtualMachineTO;
-
-public class StartAnswer extends Answer {
-    VirtualMachineTO vm;
-    String host_guid;
-
-    protected StartAnswer() {
-    }
-
-    public StartAnswer(StartCommand cmd, String msg) {
-        super(cmd, false, msg);
-        this.vm  = cmd.getVirtualMachine();
-    }
-
-    public StartAnswer(StartCommand cmd, Exception e) {
-        super(cmd, false, e.getMessage());
-        this.vm  = cmd.getVirtualMachine();
-    }
-
-    public StartAnswer(StartCommand cmd) {
-        super(cmd, true, null);
-        this.vm  = cmd.getVirtualMachine();
-        this.host_guid = null;
-    }
-
-    public StartAnswer(StartCommand cmd, String msg, String guid) {
-        super(cmd, true, msg);
-        this.vm  = cmd.getVirtualMachine();
-        this.host_guid = guid;
-    }
-
-    public VirtualMachineTO getVirtualMachine() {
-        return vm;
-    }
-
-    public String getHost_guid() {
-        return host_guid;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartCommand.java b/api/src/com/cloud/agent/api/StartCommand.java
deleted file mode 100644
index ec707d6..0000000
--- a/api/src/com/cloud/agent/api/StartCommand.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.agent.api.to.VirtualMachineTO;
-import com.cloud.host.Host;
-
-/**
- */
-public class StartCommand extends Command {
-    VirtualMachineTO vm;
-    String hostIp;
-
-    public VirtualMachineTO getVirtualMachine() {
-        return vm;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-    protected StartCommand() {
-    }
-
-    public StartCommand(VirtualMachineTO vm) {
-        this.vm = vm;
-    }
-
-    public StartCommand(VirtualMachineTO vm, Host host) {
-        this.vm = vm;
-        this.hostIp = host.getPrivateIpAddress();
-    }
-
-    public String getHostIp() {
-        return this.hostIp;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupAnswer.java b/api/src/com/cloud/agent/api/StartupAnswer.java
deleted file mode 100755
index c0925cb..0000000
--- a/api/src/com/cloud/agent/api/StartupAnswer.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 StartupAnswer extends Answer {
-    long hostId;
-    int pingInterval;
-
-    protected StartupAnswer() {
-    }
-
-    public StartupAnswer(StartupCommand cmd, long hostId, int pingInterval) {
-        super(cmd);
-        this.hostId = hostId;
-        this.pingInterval = pingInterval;
-    }
-
-    public StartupAnswer(StartupCommand cmd, String details) {
-        super(cmd, false, details);
-    }
-
-    public long getHostId() {
-        return hostId;
-    }
-
-    public int getPingInterval() {
-        return pingInterval;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupCommand.java b/api/src/com/cloud/agent/api/StartupCommand.java
deleted file mode 100755
index dd2d390..0000000
--- a/api/src/com/cloud/agent/api/StartupCommand.java
+++ /dev/null
@@ -1,286 +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.Host;
-
-public class StartupCommand extends Command {
-    Host.Type type;
-    String dataCenter;
-    String pod;
-    String cluster;
-    String guid;
-    String name;
-    Long id;
-    String version;
-    String iqn;
-    String publicIpAddress;
-    String publicNetmask;
-    String publicMacAddress;
-    String privateIpAddress;
-    String privateMacAddress;
-    String privateNetmask;
-    String storageIpAddress;
-    String storageNetmask;
-    String storageMacAddress;
-    String storageIpAddressDeux;
-    String storageMacAddressDeux;
-    String storageNetmaskDeux;
-    String agentTag;
-    String resourceName;
-    String gatewayIpAddress;
-
-    public StartupCommand(Host.Type type) {
-        this.type = type;
-    }
-
-    public StartupCommand(Long id, Host.Type type, String name, String dataCenter, String pod, String guid, String version) {
-        super();
-        this.id = id;
-        this.dataCenter = dataCenter;
-        this.pod = pod;
-        this.guid = guid;
-        this.name = name;
-        this.version = version;
-        this.type = type;
-    }
-
-    public StartupCommand(Long id, Host.Type type, String name, String dataCenter, String pod, String guid, String version, String gatewayIpAddress) {
-		this(id, type, name, dataCenter, pod, guid, version);
-		this.gatewayIpAddress = gatewayIpAddress;
-    }
-
-    public Host.Type getHostType() {
-        return type;
-    }
-
-    public void setHostType(Host.Type type) {
-    	this.type = type;
-    }
-
-    public String getIqn() {
-        return iqn;
-    }
-
-    public void setCluster(String cluster) {
-        this.cluster = cluster;
-    }
-
-    public String getCluster() {
-        return cluster;
-    }
-
-    public void setIqn(String iqn) {
-        this.iqn = iqn;
-    }
-
-    public String getDataCenter() {
-        return dataCenter;
-    }
-
-    public String getPod() {
-        return pod;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public String getStorageIpAddressDeux() {
-		return storageIpAddressDeux;
-	}
-
-	public void setStorageIpAddressDeux(String storageIpAddressDeux) {
-		this.storageIpAddressDeux = storageIpAddressDeux;
-	}
-
-	public String getStorageMacAddressDeux() {
-		return storageMacAddressDeux;
-	}
-
-	public void setStorageMacAddressDeux(String storageMacAddressDeux) {
-		this.storageMacAddressDeux = storageMacAddressDeux;
-	}
-
-	public String getStorageNetmaskDeux() {
-		return storageNetmaskDeux;
-	}
-
-	public void setStorageNetmaskDeux(String storageNetmaskDeux) {
-		this.storageNetmaskDeux = storageNetmaskDeux;
-	}
-
-	public String getGuid() {
-        return guid;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setDataCenter(String dataCenter) {
-        this.dataCenter = dataCenter;
-    }
-
-    public void setPod(String pod) {
-        this.pod = pod;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid;
-    }
-
-    public void setGuid(String guid, String resourceName) {
-    	this.resourceName = resourceName;
-    	this.guid = guid + "-" + resourceName;
-    }
-
-    public String getPublicNetmask() {
-        return publicNetmask;
-    }
-
-    public void setPublicNetmask(String publicNetmask) {
-        this.publicNetmask = publicNetmask;
-    }
-
-    public String getPublicMacAddress() {
-        return publicMacAddress;
-    }
-
-    public void setPublicMacAddress(String publicMacAddress) {
-        this.publicMacAddress = publicMacAddress;
-    }
-
-    public String getPrivateIpAddress() {
-        return privateIpAddress;
-    }
-
-    public void setPrivateIpAddress(String privateIpAddress) {
-        this.privateIpAddress = privateIpAddress;
-    }
-
-    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 getStorageIpAddress() {
-        return storageIpAddress;
-    }
-
-    public void setStorageIpAddress(String storageIpAddress) {
-        this.storageIpAddress = storageIpAddress;
-    }
-
-    public String getStorageNetmask() {
-        return storageNetmask;
-    }
-
-    public void setStorageNetmask(String storageNetmask) {
-        this.storageNetmask = storageNetmask;
-    }
-
-    public String getStorageMacAddress() {
-        return storageMacAddress;
-    }
-
-    public void setStorageMacAddress(String storageMacAddress) {
-        this.storageMacAddress = storageMacAddress;
-    }
-
-    public String getPublicIpAddress() {
-        return publicIpAddress;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public void setPublicIpAddress(String publicIpAddress) {
-        this.publicIpAddress = publicIpAddress;
-    }
-
-    public String getAgentTag() {
-    	return agentTag;
-    }
-
-    public void setAgentTag(String tag) {
-    	agentTag = tag;
-    }
-
-    public void setResourceName(String resourceName) {
-    	this.resourceName = resourceName;
-    }
-
-    public String getGuidWithoutResource() {
-    	if (resourceName == null) {
-            return guid;
-        } else {
-    	  int hyph = guid.lastIndexOf('-');
-    	  if (hyph == -1) {
-    		  return guid;
-    	  }
-    	  String tmpResource = guid.substring(hyph+1, guid.length());
-    	  if (resourceName.equals(tmpResource)){
-    		  return guid.substring(0, hyph);
-    	  } else {
-    		  return guid;
-    	  }
-    	}
-    }
-
-    public String getResourceName() {
-    	return resourceName;
-    }
-
-    public String getGatewayIpAddress() {
-        return gatewayIpAddress;
-    }
-
-    public void setGatewayIpAddress(String gatewayIpAddress) {
-        this.gatewayIpAddress = gatewayIpAddress;
-    }
-
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupExternalDhcpCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupExternalDhcpCommand.java b/api/src/com/cloud/agent/api/StartupExternalDhcpCommand.java
deleted file mode 100644
index b71f635..0000000
--- a/api/src/com/cloud/agent/api/StartupExternalDhcpCommand.java
+++ /dev/null
@@ -1,25 +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.Host;
-
-public class StartupExternalDhcpCommand extends StartupCommand {
-	public StartupExternalDhcpCommand() {
-		super(Host.Type.ExternalDhcp);
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java b/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
deleted file mode 100644
index c4ed107..0000000
--- a/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.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;
-
-import com.cloud.host.Host;
-
-public class StartupExternalFirewallCommand extends StartupCommand {
-
-    public StartupExternalFirewallCommand() {
-        super(Host.Type.ExternalFirewall);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java b/api/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java
deleted file mode 100644
index 1e7a5f1..0000000
--- a/api/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.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;
-
-import com.cloud.host.Host;
-
-public class StartupExternalLoadBalancerCommand extends StartupCommand {
-    public StartupExternalLoadBalancerCommand() {
-        super(Host.Type.ExternalLoadBalancer);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupProxyCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupProxyCommand.java b/api/src/com/cloud/agent/api/StartupProxyCommand.java
deleted file mode 100644
index 25cd769..0000000
--- a/api/src/com/cloud/agent/api/StartupProxyCommand.java
+++ /dev/null
@@ -1,49 +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.Host;
-
-public class StartupProxyCommand extends StartupCommand {
-    private int proxyPort;
-	private long proxyVmId;
-
-	public StartupProxyCommand() {
-        super(Host.Type.ConsoleProxy);
-        setIqn("NoIqn");
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-    public int getProxyPort() {
-        return proxyPort;
-    }
-
-    public void setProxyPort(int proxyPort) {
-        this.proxyPort = proxyPort;
-    }
-
-    public long getProxyVmId() {
-		return proxyVmId;
-	}
-	public void setProxyVmId(long proxyVmId) {
-		this.proxyVmId = proxyVmId;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupPxeServerCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupPxeServerCommand.java b/api/src/com/cloud/agent/api/StartupPxeServerCommand.java
deleted file mode 100644
index dff5c53..0000000
--- a/api/src/com/cloud/agent/api/StartupPxeServerCommand.java
+++ /dev/null
@@ -1,25 +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.Host;
-
-public class StartupPxeServerCommand extends StartupCommand {
-	public StartupPxeServerCommand() {
-		super(Host.Type.PxeServer);
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupRoutingCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupRoutingCommand.java b/api/src/com/cloud/agent/api/StartupRoutingCommand.java
deleted file mode 100755
index 5961ab0..0000000
--- a/api/src/com/cloud/agent/api/StartupRoutingCommand.java
+++ /dev/null
@@ -1,224 +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;
-
-import com.cloud.host.Host;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.Networks.RouterPrivateIpStrategy;
-import com.cloud.utils.Pair;
-import com.cloud.vm.VirtualMachine.State;
-
-public class StartupRoutingCommand extends StartupCommand {
-    public static class VmState {
-        State state;
-        String host;
-        public VmState() {
-        }
-        public VmState(State state, String host) {
-            this.state = state;
-            this.host = host;
-        }
-        public State getState() {
-            return state;
-        }
-        public String getHost() {
-            return host;
-        }
-    }
-    int cpus;
-    long speed;
-    long memory;
-    long dom0MinMemory;
-    boolean poolSync;
-    Map<String, VmState> vms;
-    HashMap<String, Pair<String, State>> _clusterVMStates;
-    String caps;
-    String pool;
-    HypervisorType hypervisorType;
-    Map<String, String> hostDetails; //stuff like host os, cpu capabilities
-    String hypervisorVersion;
-
-    public StartupRoutingCommand() {
-        super(Host.Type.Routing);
-        hostDetails = new HashMap<String, String>();
-        getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), RouterPrivateIpStrategy.DcGlobal.toString());
-
-    }
-
-    public StartupRoutingCommand(int cpus,
-                                   long speed,
-                                   long memory,
-                                   long dom0MinMemory,
-                                   String caps,
-                                   HypervisorType hypervisorType,
-                                   RouterPrivateIpStrategy privIpStrategy,
-                                   Map<String, VmState> vms) {
-        this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType, vms);
-        getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStrategy.toString());
-    }
-
-    public StartupRoutingCommand(int cpus,
-            long speed,
-            long memory,
-            long dom0MinMemory,
-            String caps,
-            HypervisorType hypervisorType,
-            RouterPrivateIpStrategy privIpStrategy) {
-this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType, new HashMap<String,String>(), new HashMap<String, VmState>());
-getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStrategy.toString());
-}
-
-    public StartupRoutingCommand(int cpus,
-            long speed,
-            long memory,
-            long dom0MinMemory,
-            final String caps,
-            final HypervisorType hypervisorType,
-            final Map<String, String> hostDetails,
-            Map<String, VmState> vms) {
-        super(Host.Type.Routing);
-        this.cpus = cpus;
-        this.speed = speed;
-        this.memory = memory;
-        this.dom0MinMemory = dom0MinMemory;
-        this.vms = vms;
-        this.hypervisorType = hypervisorType;
-        this.hostDetails = hostDetails;
-        this.caps = caps;
-        this.poolSync = false;
-    }
-
-    public StartupRoutingCommand(int cpus2, long speed2, long memory2,
-            long dom0MinMemory2, String caps2, HypervisorType hypervisorType2,
-            Map<String, VmState> vms2) {
-        this(cpus2, speed2, memory2, dom0MinMemory2, caps2, hypervisorType2, new HashMap<String,String>(), vms2);
-    }
-
-    public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, final String caps, final HypervisorType hypervisorType, final Map<String, String> hostDetails, Map<String, VmState> vms, String hypervisorVersion) {
-        this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType, hostDetails, vms);
-        this.hypervisorVersion = hypervisorVersion;
-    }
-
-    public void setChanges(Map<String, VmState> vms) {
-        this.vms = vms;
-    }
-
-    public void setStateChanges(Map<String, State> vms) {
-        for( String vm_name : vms.keySet() ) {
-            if( this.vms == null ) {
-                this.vms = new HashMap<String, VmState>();
-            }
-            this.vms.put(vm_name, new VmState(vms.get(vm_name), null));
-        }
-    }
-
-    public void setClusterVMStateChanges(HashMap<String, Pair<String, State>> allStates){
-    	_clusterVMStates = allStates;
-    }
-
-    public int getCpus() {
-        return cpus;
-    }
-
-    public String getCapabilities() {
-        return caps;
-    }
-
-    public long getSpeed() {
-        return speed;
-    }
-
-    public long getMemory() {
-        return memory;
-    }
-
-    public long getDom0MinMemory() {
-        return dom0MinMemory;
-    }
-
-    public Map<String, VmState> getVmStates() {
-        return vms;
-    }
-
-    public HashMap<String, Pair<String, State>> getClusterVMStateChanges() {
-        return _clusterVMStates;
-    }
-
-    public void setSpeed(long speed) {
-        this.speed = speed;
-    }
-
-    public void setCpus(int cpus) {
-        this.cpus = cpus;
-    }
-
-    public void setMemory(long memory) {
-        this.memory = memory;
-    }
-
-    public void setDom0MinMemory(long dom0MinMemory) {
-        this.dom0MinMemory = dom0MinMemory;
-    }
-
-    public void setCaps(String caps) {
-        this.caps = caps;
-    }
-
-    public String getPool() {
-        return pool;
-    }
-
-    public void setPool(String pool) {
-        this.pool = pool;
-    }
-
-    public boolean isPoolSync() {
-        return poolSync;
-    }
-
-    public void setPoolSync(boolean poolSync) {
-        this.poolSync = poolSync;
-    }
-
-    public HypervisorType getHypervisorType() {
-        return hypervisorType;
-    }
-
-    public void setHypervisorType(HypervisorType hypervisorType) {
-        this.hypervisorType = hypervisorType;
-    }
-
-    public Map<String, String> getHostDetails() {
-        return hostDetails;
-    }
-
-    public void setHostDetails(Map<String, String> hostDetails) {
-        this.hostDetails = hostDetails;
-    }
-
-    public String getHypervisorVersion() {
-        return hypervisorVersion;
-    }
-
-    public void setHypervisorVersion(String hypervisorVersion) {
-        this.hypervisorVersion = hypervisorVersion;
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java b/api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
deleted file mode 100644
index c19ea99..0000000
--- a/api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
+++ /dev/null
@@ -1,32 +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.Host;
-
-public class StartupSecondaryStorageCommand extends StartupCommand {
-
-	public StartupSecondaryStorageCommand() {
-        super(Host.Type.SecondaryStorage);
-        setIqn("NoIqn");
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupStorageCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupStorageCommand.java b/api/src/com/cloud/agent/api/StartupStorageCommand.java
deleted file mode 100755
index 3c3b058..0000000
--- a/api/src/com/cloud/agent/api/StartupStorageCommand.java
+++ /dev/null
@@ -1,110 +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;
-
-import com.cloud.host.Host;
-import com.cloud.storage.Storage;
-import com.cloud.storage.Storage.StoragePoolType;
-import com.cloud.storage.template.TemplateInfo;
-
-
-public class StartupStorageCommand extends StartupCommand {
-
-	String parent;
-    Map<String, TemplateInfo> templateInfo;
-    long totalSize;
-    StoragePoolInfo poolInfo;
-    Storage.StorageResourceType resourceType;
-    StoragePoolType fsType;
-    Map<String, String> hostDetails = new HashMap<String, String>();
-    String nfsShare;
-
-    public StartupStorageCommand() {
-        super(Host.Type.Storage);
-    }
-
-    public StartupStorageCommand(String parent, StoragePoolType fsType, long totalSize, Map<String, TemplateInfo> info) {
-        super(Host.Type.Storage);
-        this.parent = parent;
-        this.totalSize = totalSize;
-        this.templateInfo = info;
-        this.poolInfo = null;
-        this.fsType = fsType;
-    }
-
-
-    public StartupStorageCommand(String parent, StoragePoolType fsType, Map<String, TemplateInfo> templateInfo, StoragePoolInfo poolInfo) {
-		super(Host.Type.Storage);
-		this.parent = parent;
-		this.templateInfo = templateInfo;
-		this.totalSize = poolInfo.capacityBytes;
-		this.poolInfo = poolInfo;
-		this.fsType = fsType;
-	}
-
-	public String getParent() {
-        return parent;
-    }
-
-	public void setParent(String parent) {
-        this.parent = parent;
-    }
-
-    public void setNfsShare(String nfsShare) {
-	    this.nfsShare = nfsShare;
-	}
-
-	public String getNfsShare() {
-	    return nfsShare;
-	}
-
-    public long getTotalSize() {
-        return totalSize;
-    }
-
-	public Map<String, TemplateInfo> getTemplateInfo() {
-		return templateInfo;
-	}
-
-	public void setTemplateInfo(Map<String, TemplateInfo> templateInfo) {
-		this.templateInfo = templateInfo;
-	}
-
-	public StoragePoolInfo getPoolInfo() {
-		return poolInfo;
-	}
-
-	public void setPoolInfo(StoragePoolInfo poolInfo) {
-		this.poolInfo = poolInfo;
-	}
-
-	public Storage.StorageResourceType getResourceType() {
-		return resourceType;
-	}
-
-	public void setResourceType(Storage.StorageResourceType resourceType) {
-		this.resourceType = resourceType;
-	}
-
-	/*For secondary storage*/
-	public Map<String, String> getHostDetails() {
-		return hostDetails;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java b/api/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java
deleted file mode 100644
index bb8f3d7..0000000
--- a/api/src/com/cloud/agent/api/StartupTrafficMonitorCommand.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;
-
-import com.cloud.host.Host;
-
-public class StartupTrafficMonitorCommand extends StartupCommand {
-    public StartupTrafficMonitorCommand() {
-        super(Host.Type.TrafficMonitor);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StopAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StopAnswer.java b/api/src/com/cloud/agent/api/StopAnswer.java
deleted file mode 100755
index 1111fed..0000000
--- a/api/src/com/cloud/agent/api/StopAnswer.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 StopAnswer extends RebootAnswer {
-    Integer vncPort;
-
-    protected StopAnswer() {
-    }
-
-    public StopAnswer(StopCommand cmd, String details, Integer vncPort, boolean success) {
-        super(cmd,  details, success);
-        this.vncPort = vncPort;
-    }
-
-    public StopAnswer(StopCommand cmd, String details, boolean success) {
-        super(cmd, details, success);
-        vncPort = null;
-
-    }
-
-    public StopAnswer(StopCommand cmd, Exception e) {
-        super(cmd, e);
-    }
-
-    @Override
-    public Integer getVncPort() {
-        return vncPort;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/StopCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StopCommand.java b/api/src/com/cloud/agent/api/StopCommand.java
deleted file mode 100755
index 1c67f38..0000000
--- a/api/src/com/cloud/agent/api/StopCommand.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 com.cloud.vm.VirtualMachine;
-
-public class StopCommand extends RebootCommand {
-    String vnet;
-    private boolean isProxy=false;
-    private String urlPort=null;
-    private String publicConsoleProxyIpAddress=null;
-
-    protected StopCommand() {
-    }
-
-    public StopCommand(VirtualMachine vm, boolean isProxy, String urlPort, String publicConsoleProxyIpAddress) {
-    	super(vm);
-    	this.isProxy = isProxy;
-    	this.urlPort = urlPort;
-    	this.publicConsoleProxyIpAddress = publicConsoleProxyIpAddress;
-    }
-
-    public StopCommand(VirtualMachine vm, String vnet) {
-        super(vm);
-        this.vnet = vnet;
-    }
-    
-    public StopCommand(VirtualMachine vm) {
-        super(vm);
-    }
-
-    public StopCommand(String vmName) {
-        super(vmName);
-    }
-
-    public String getVnet() {
-        return vnet;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-	public boolean isProxy() {
-		return this.isProxy;
-	}
-
-	public String getURLPort() {
-		return this.urlPort;
-	}
-
-	public String getPublicConsoleProxyIpAddress() {
-		return this.publicConsoleProxyIpAddress;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/TransferAgentCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/TransferAgentCommand.java b/api/src/com/cloud/agent/api/TransferAgentCommand.java
deleted file mode 100644
index 0dfde7e..0000000
--- a/api/src/com/cloud/agent/api/TransferAgentCommand.java
+++ /dev/null
@@ -1,57 +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 TransferAgentCommand extends Command {
-    protected long agentId;
-    protected long futureOwner;
-    protected long currentOwner;
-    Event event;
-
-    protected TransferAgentCommand() {
-    }
-
-    public TransferAgentCommand(long agentId, long currentOwner, long futureOwner, Event event) {
-        this.agentId = agentId;
-        this.currentOwner = currentOwner;
-        this.futureOwner = futureOwner;
-        this.event = event;
-    }
-
-    public long getAgentId() {
-        return agentId;
-    }
-
-    public long getFutureOwner() {
-        return futureOwner;
-    }
-
-    public Event getEvent() {
-        return event;
-    }
-
-    public long getCurrentOwner() {
-        return currentOwner;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/UnPlugNicAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UnPlugNicAnswer.java b/api/src/com/cloud/agent/api/UnPlugNicAnswer.java
deleted file mode 100644
index 232afef..0000000
--- a/api/src/com/cloud/agent/api/UnPlugNicAnswer.java
+++ /dev/null
@@ -1,25 +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 UnPlugNicAnswer extends Answer{
-    public UnPlugNicAnswer() {}
-
-    public UnPlugNicAnswer(UnPlugNicCommand cmd, boolean success, String result) {
-        super(cmd, success, result);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/UnPlugNicCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UnPlugNicCommand.java b/api/src/com/cloud/agent/api/UnPlugNicCommand.java
deleted file mode 100644
index b6cab88..0000000
--- a/api/src/com/cloud/agent/api/UnPlugNicCommand.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.agent.api.to.NicTO;
-
-public class UnPlugNicCommand extends Command{
-    NicTO nic;
-    String instanceName;
-
-    public NicTO getNic() {
-        return nic;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-    protected UnPlugNicCommand() {
-    }
-
-    public UnPlugNicCommand(NicTO nic, String instanceName) {
-        this.nic = nic;
-        this.instanceName = instanceName;
-    }
-
-    public String getInstanceName() {
-        return instanceName;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/UnregisterVMCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UnregisterVMCommand.java b/api/src/com/cloud/agent/api/UnregisterVMCommand.java
deleted file mode 100644
index 428ffea..0000000
--- a/api/src/com/cloud/agent/api/UnregisterVMCommand.java
+++ /dev/null
@@ -1,34 +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 UnregisterVMCommand extends Command {
-    String vmName;
-
-    public UnregisterVMCommand(String vmName){
-        this.vmName = vmName;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-    public String getVmName() {
-        return vmName;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/UpdateHostPasswordCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UpdateHostPasswordCommand.java b/api/src/com/cloud/agent/api/UpdateHostPasswordCommand.java
deleted file mode 100644
index 27cfd19..0000000
--- a/api/src/com/cloud/agent/api/UpdateHostPasswordCommand.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;
-
-import com.cloud.agent.api.LogLevel.Log4jLevel;
-
-
-public class UpdateHostPasswordCommand extends Command {
-    @LogLevel(Log4jLevel.Off)
-    protected String _username;
-    @LogLevel(Log4jLevel.Off)
-    protected String _new_password;
-
-    protected UpdateHostPasswordCommand() {
-    }
-
-    public UpdateHostPasswordCommand(String username, String new_password) {
-        this._username = username;
-        this._new_password = new_password;
-    }
-
-    public String getNewPassword() {
-        return _new_password;
-    }
-
-    public String getUsername() {
-        return _username;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/UpgradeAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UpgradeAnswer.java b/api/src/com/cloud/agent/api/UpgradeAnswer.java
deleted file mode 100644
index 00b0f25..0000000
--- a/api/src/com/cloud/agent/api/UpgradeAnswer.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 UpgradeAnswer extends Answer {
-    protected UpgradeAnswer() {
-    }
-
-    public UpgradeAnswer(UpgradeCommand cmd, String failure) {
-        super(cmd, false, failure);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/UpgradeCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UpgradeCommand.java b/api/src/com/cloud/agent/api/UpgradeCommand.java
deleted file mode 100644
index 0e1b6d2..0000000
--- a/api/src/com/cloud/agent/api/UpgradeCommand.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;
-
-/**
- * UpgradeCommand is sent when the agent should update.
- */
-public class UpgradeCommand extends Command {
-
-    String url;
-
-    protected UpgradeCommand() {
-    }
-
-    public UpgradeCommand(String url) {
-        this.url = url;
-    }
-
-    public String getUpgradeUrl() {
-        return url;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java b/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
deleted file mode 100644
index f00f490..0000000
--- a/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
+++ /dev/null
@@ -1,64 +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 UpgradeSnapshotCommand extends SnapshotCommand {
-    private String version;
-    private Long templateId;
-    private Long tmpltAccountId;
-
-    protected UpgradeSnapshotCommand() {
-
-    }
-
-    /**
-     * @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 upgraded
-     * @param _version          version for this snapshot
-     */
-    public UpgradeSnapshotCommand(StoragePool pool,
-                                 String secondaryStoragePoolURL,
-                                 Long   dcId,
-                                 Long   accountId,
-                                 Long   volumeId,
-                                 Long   templateId,
-                                 Long   tmpltAccountId,
-                                 String volumePath,
-                                 String snapshotUuid,
-                                 String snapshotName,
-                                 String version)
-    {
-        super(pool, secondaryStoragePoolURL, snapshotUuid, snapshotName, dcId, accountId, volumeId);
-        this.version = version;
-        this.templateId = templateId;
-        this.tmpltAccountId = tmpltAccountId;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public Long getTemplateId() {
-        return templateId;
-    }
-
-    public Long getTmpltAccountId() {
-        return tmpltAccountId;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/UploadTemplateToS3FromSecondaryStorageCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UploadTemplateToS3FromSecondaryStorageCommand.java b/api/src/com/cloud/agent/api/UploadTemplateToS3FromSecondaryStorageCommand.java
deleted file mode 100644
index 1807cd5..0000000
--- a/api/src/com/cloud/agent/api/UploadTemplateToS3FromSecondaryStorageCommand.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.to.S3TO;
-
-public class UploadTemplateToS3FromSecondaryStorageCommand extends Command {
-
-    private final S3TO s3;
-    private final String storagePath;
-    private final Long dataCenterId;
-    private final Long accountId;
-    private final Long templateId;
-
-    public UploadTemplateToS3FromSecondaryStorageCommand(final S3TO s3,
-        final String storagePath, final Long dataCenterId, final Long accountId,
-        final Long templateId) {
-
-        super();
-
-        this.s3 = s3;
-        this.storagePath = storagePath;
-        this.dataCenterId = dataCenterId;
-        this.accountId = accountId;
-        this.templateId = templateId;
-
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-    @Override
-    public boolean equals(final Object thatObject) {
-
-        if (this == thatObject) {
-            return true;
-        }
-
-        if (thatObject == null || getClass() != thatObject.getClass()) {
-            return false;
-        }
-
-        final UploadTemplateToS3FromSecondaryStorageCommand thatCommand =
-                (UploadTemplateToS3FromSecondaryStorageCommand) thatObject;
-
-        if (this.accountId != null ? !this.accountId.equals(thatCommand
-                .accountId) : thatCommand.accountId != null) {
-            return false;
-        }
-
-        if (this.dataCenterId != null ? !this.dataCenterId.equals(thatCommand
-                .dataCenterId) : thatCommand.dataCenterId != null) {
-            return false;
-        }
-
-        if (this.s3 != null ? !this.s3.equals(thatCommand.s3) : thatCommand.s3 != null) {
-            return false;
-        }
-
-        if (this.storagePath != null ? !this.storagePath.equals(thatCommand
-                .storagePath) : thatCommand.storagePath != null) {
-            return false;
-        }
-
-        if (this.templateId != null ? !this.templateId.equals(thatCommand.templateId) :
-                thatCommand.templateId != null) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = this.s3 != null ? this.s3.hashCode() : 0;
-        result = 31 * result + (this.storagePath != null ? this.storagePath.hashCode() : 0);
-        result = 31 * result + (this.dataCenterId != null ? this.dataCenterId.hashCode() : 0);
-        result = 31 * result + (this.accountId != null ? this.accountId.hashCode() : 0);
-        result = 31 * result + (this.templateId != null ? this.templateId.hashCode() : 0);
-        return result;
-    }
-
-    public S3TO getS3() {
-        return this.s3;
-    }
-
-    public String getStoragePath() {
-        return this.storagePath;
-    }
-
-    public Long getDataCenterId() {
-        return this.dataCenterId;
-    }
-
-    public Long getAccountId() {
-        return this.accountId;
-    }
-
-    public Long getTemplateId() {
-        return this.templateId;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/VMSnapshotBaseCommand.java b/api/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
deleted file mode 100644
index 2120f2f..0000000
--- a/api/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
+++ /dev/null
@@ -1,74 +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 VMSnapshotBaseCommand extends Command{
-    protected List<VolumeTO> volumeTOs;
-    protected VMSnapshotTO target;
-    protected String vmName;
-    protected String guestOSType;
-    
-    
-    public VMSnapshotBaseCommand(String vmName, VMSnapshotTO snapshot, List<VolumeTO> volumeTOs, String guestOSType) {
-        this.vmName = vmName;
-        this.target = snapshot;
-        this.volumeTOs = volumeTOs;
-        this.guestOSType = guestOSType;
-    }
-    
-    public List<VolumeTO> getVolumeTOs() {
-        return volumeTOs;
-    }
-
-    public void setVolumeTOs(List<VolumeTO> volumeTOs) {
-        this.volumeTOs = volumeTOs;
-    }
-
-    public VMSnapshotTO getTarget() {
-        return target;
-    }
-
-    public void setTarget(VMSnapshotTO target) {
-        this.target = target;
-    }
-
-    public String getVmName() {
-        return vmName;
-    }
-
-    public void setVmName(String vmName) {
-        this.vmName = vmName;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-    public String getGuestOSType() {
-        return guestOSType;
-    }
-
-    public void setGuestOSType(String guestOSType) {
-        this.guestOSType = guestOSType;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/VMSnapshotTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/VMSnapshotTO.java b/api/src/com/cloud/agent/api/VMSnapshotTO.java
deleted file mode 100644
index c7b42d2..0000000
--- a/api/src/com/cloud/agent/api/VMSnapshotTO.java
+++ /dev/null
@@ -1,90 +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.snapshot.VMSnapshot;
-
-public class VMSnapshotTO {
-	private Long id;
-    private String snapshotName;
-    private VMSnapshot.Type type;
-    private Long createTime;
-    private Boolean current;
-    private String description;
-    private VMSnapshotTO parent;
-    
-    public Long getId() {
-		return id;
-	}
-	public void setId(Long id) {
-		this.id = id;
-	}
-	public VMSnapshotTO(Long id, String snapshotName, 
-	        VMSnapshot.Type type, Long createTime, 
-			String description, Boolean current, VMSnapshotTO parent) {
-		super();
-		this.id = id;
-		this.snapshotName = snapshotName;
-		this.type = type;
-		this.createTime = createTime;
-		this.current = current;
-		this.description = description;
-		this.parent = parent;
-	}
-	public VMSnapshotTO() {
-	    
-	}
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	public Boolean getCurrent() {
-        return current;
-    }
-    public void setCurrent(Boolean current) {
-        this.current = current;
-    }
-    public Long getCreateTime() {
-        return createTime;
-    }
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
- 
-    public VMSnapshot.Type getType() {
-        return type;
-    }
-    public void setType(VMSnapshot.Type type) {
-        this.type = type;
-    }
-
-    public String getSnapshotName() {
-        return snapshotName;
-    }
-    public void setSnapshotName(String snapshotName) {
-        this.snapshotName = snapshotName;
-    }
-    public VMSnapshotTO getParent() {
-        return parent;
-    }
-    public void setParent(VMSnapshotTO parent) {
-        this.parent = parent;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java b/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
deleted file mode 100644
index f5bb544..0000000
--- a/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
+++ /dev/null
@@ -1,53 +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 ValidateSnapshotAnswer extends Answer {
-    private String expectedSnapshotBackupUuid;
-    private String actualSnapshotBackupUuid;
-    private String actualSnapshotUuid;
-
-    protected ValidateSnapshotAnswer() {
-
-    }
-
-    public ValidateSnapshotAnswer(ValidateSnapshotCommand cmd, boolean success, String result, String expectedSnapshotBackupUuid, String actualSnapshotBackupUuid, String actualSnapshotUuid) {
-        super(cmd, success, result);
-        this.expectedSnapshotBackupUuid = expectedSnapshotBackupUuid;
-        this.actualSnapshotBackupUuid = actualSnapshotBackupUuid;
-        this.actualSnapshotUuid = actualSnapshotUuid;
-    }
-
-    /**
-     * @return the expectedSnapshotBackupUuid
-     */
-    public String getExpectedSnapshotBackupUuid() {
-        return expectedSnapshotBackupUuid;
-    }
-
-    /**
-     * @return the actualSnapshotBackupUuid
-     */
-    public String getActualSnapshotBackupUuid() {
-        return actualSnapshotBackupUuid;
-    }
-
-    public String getActualSnapshotUuid() {
-        return actualSnapshotUuid;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java b/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java
deleted file mode 100644
index 9ffbf29..0000000
--- a/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java
+++ /dev/null
@@ -1,84 +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 ValidateSnapshotCommand extends Command {
-    private String primaryStoragePoolNameLabel;
-    private String volumeUuid;
-    private String firstBackupUuid;
-    private String previousSnapshotUuid;
-    private String templateUuid;
-
-    protected ValidateSnapshotCommand() {
-
-    }
-
-    /**
-     * @param primaryStoragePoolNameLabel   The primary storage Pool Name Label
-     * @param volumeUuid        The UUID of the volume for which the snapshot was taken
-     * @param firstBackupUuid   This UUID of the first snapshot that was ever taken for this volume, even it was deleted.
-     * @param previousSnapshotUuid The UUID of the previous snapshot on the primary.
-     * @param templateUuid      If this is a root volume and no snapshot has been taken for it,
-     *                          this is the UUID of the template VDI.
-     */
-    public ValidateSnapshotCommand(String primaryStoragePoolNameLabel,
-                                                 String volumeUuid,
-                                                 String firstBackupUuid,
-                                                 String previousSnapshotUuid,
-                                                 String templateUuid)
-    {
-        this.primaryStoragePoolNameLabel = primaryStoragePoolNameLabel;
-        this.volumeUuid                  = volumeUuid;
-        this.firstBackupUuid             = firstBackupUuid;
-        this.previousSnapshotUuid        = previousSnapshotUuid;
-        this.templateUuid                = templateUuid;
-    }
-
-    public String getPrimaryStoragePoolNameLabel() {
-        return primaryStoragePoolNameLabel;
-    }
-
-    /**
-     * @return the volumeUuid
-     */
-    public String getVolumeUuid() {
-        return volumeUuid;
-    }
-
-    /**
-     * @return the firstBackupUuid
-     */
-    public String getFirstBackupUuid() {
-        return firstBackupUuid;
-    }
-
-    public String getPreviousSnapshotUuid() {
-        return previousSnapshotUuid;
-    }
-
-    /**
-     * @return the templateUuid
-     */
-    public String getTemplateUuid() {
-        return templateUuid;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/VmStatsEntry.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/VmStatsEntry.java b/api/src/com/cloud/agent/api/VmStatsEntry.java
deleted file mode 100755
index 8828e91..0000000
--- a/api/src/com/cloud/agent/api/VmStatsEntry.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.vm.VmStats;
-
-public class VmStatsEntry implements VmStats {
-
-	double cpuUtilization;
-	double networkReadKBs;
-	double networkWriteKBs;
-	int numCPUs;
-	String entityType;
-
-    public VmStatsEntry() {
-    }
-
-    public VmStatsEntry(double cpuUtilization, double networkReadKBs, double networkWriteKBs, int numCPUs, String entityType)
-    {
-        this.cpuUtilization = cpuUtilization;
-        this.networkReadKBs = networkReadKBs;
-        this.networkWriteKBs = networkWriteKBs;
-        this.numCPUs = numCPUs;
-        this.entityType = entityType;
-    }
-
-    public double getCPUUtilization() {
-    	return cpuUtilization;
-    }
-
-    public void setCPUUtilization(double cpuUtilization) {
-    	this.cpuUtilization = cpuUtilization;
-    }
-
-    public double getNetworkReadKBs() {
-    	return networkReadKBs;
-    }
-
-    public void setNetworkReadKBs(double networkReadKBs) {
-    	this.networkReadKBs = networkReadKBs;
-    }
-
-    public double getNetworkWriteKBs() {
-    	return networkWriteKBs;
-    }
-
-    public void setNetworkWriteKBs(double networkWriteKBs) {
-    	this.networkWriteKBs = networkWriteKBs;
-    }
-
-    public int getNumCPUs() {
-    	return numCPUs;
-    }
-
-    public void setNumCPUs(int numCPUs) {
-    	this.numCPUs = numCPUs;
-    }
-
-    public String getEntityType(){
-    	return this.entityType;
-    }
-
-    public void setEntityType(String entityType){
-    	this.entityType = entityType;
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java b/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
deleted file mode 100644
index fdd1fe9..0000000
--- a/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
+++ /dev/null
@@ -1,43 +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.baremetal;
-
-import com.cloud.agent.api.Command;
-
-public class IpmISetBootDevCommand extends Command {
-	public enum BootDev {
-		pxe(),
-		disk(),
-		cdrom(),
-	}
-
-	BootDev bootDev;
-
-	public BootDev getBootDev() {
-		return bootDev;
-	}
-
-	public IpmISetBootDevCommand(BootDev dev) {
-		bootDev = dev;
-	}
-
-	@Override
-	public boolean executeInSequence() {
-		return true;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java b/api/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java
deleted file mode 100644
index 4f8dcaf..0000000
--- a/api/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java
+++ /dev/null
@@ -1,28 +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.baremetal;
-
-import com.cloud.agent.api.Command;
-
-public class IpmiBootorResetCommand extends Command {
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-}


Mime
View raw message