Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 51CF311EB3 for ; Mon, 13 May 2013 17:51:03 +0000 (UTC) Received: (qmail 27493 invoked by uid 500); 13 May 2013 15:53:26 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 27385 invoked by uid 500); 13 May 2013 15:53:26 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 25685 invoked by uid 99); 13 May 2013 15:53:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 May 2013 15:53:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AE1DB88F7BD; Mon, 13 May 2013 15:53:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Date: Mon, 13 May 2013 15:54:09 -0000 Message-Id: In-Reply-To: <3dd7f1ce499f4ed180dff4676f352f9b@git.apache.org> References: <3dd7f1ce499f4ed180dff4676f352f9b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [49/93] [abbrv] [partial] merge master http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java b/api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java deleted file mode 100644 index ed3bc62..0000000 --- a/api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java +++ /dev/null @@ -1,54 +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.VolumeTO; - -public class CreateVolumeFromVMSnapshotAnswer extends Answer { - private String path; - private VolumeTO volumeTo; - - public VolumeTO getVolumeTo() { - return volumeTo; - } - - public CreateVolumeFromVMSnapshotAnswer( - CreateVolumeFromVMSnapshotCommand cmd, VolumeTO volumeTo) { - super(cmd, true, ""); - this.volumeTo = volumeTo; - } - - public String getPath() { - return path; - } - - protected CreateVolumeFromVMSnapshotAnswer() { - - } - - public CreateVolumeFromVMSnapshotAnswer( - CreateVolumeFromVMSnapshotCommand cmd, String path) { - super(cmd, true, ""); - this.path = path; - } - - public CreateVolumeFromVMSnapshotAnswer( - CreateVolumeFromVMSnapshotCommand cmd, boolean result, String string) { - super(cmd, result, string); - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java b/api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java deleted file mode 100644 index 634e15c..0000000 --- a/api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.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; - -import com.cloud.agent.api.to.StorageFilerTO; -import com.cloud.vm.DiskProfile; - -public class CreateVolumeFromVMSnapshotCommand extends Command { - - protected String path; - protected String name; - protected Boolean fullClone; - protected String storagePoolUuid; - private StorageFilerTO pool; - private DiskProfile diskProfile; - private Long volumeId; - - public DiskProfile getDskch() { - return diskProfile; - } - - public String getPath() { - return path; - } - - public Long getVolumeId() { - return volumeId; - } - - protected CreateVolumeFromVMSnapshotCommand() { - - } - - public CreateVolumeFromVMSnapshotCommand(String path, String name, - Boolean fullClone, String storagePoolUuid) { - this.path = path; - this.name = name; - this.fullClone = fullClone; - this.storagePoolUuid = storagePoolUuid; - } - - public CreateVolumeFromVMSnapshotCommand(String path, String name, - Boolean fullClone, String storagePoolUuid, StorageFilerTO pool, - DiskProfile diskProfile, Long volumeId) { - this.path = path; - this.name = name; - this.fullClone = fullClone; - this.storagePoolUuid = storagePoolUuid; - this.pool = pool; - this.diskProfile = diskProfile; - this.volumeId = volumeId; - } - - @Override - public boolean executeInSequence() { - return false; - } - - public String getName() { - return name; - } - - public Boolean getFullClone() { - return fullClone; - } - - public String getStoragePoolUuid() { - return storagePoolUuid; - } - - public StorageFilerTO getPool() { - return pool; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/CronCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/CronCommand.java b/api/src/com/cloud/agent/api/CronCommand.java deleted file mode 100755 index c43237c..0000000 --- a/api/src/com/cloud/agent/api/CronCommand.java +++ /dev/null @@ -1,24 +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 interface CronCommand { - /** - * @return interval at which to run the command in seconds. - */ - public int getInterval(); -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java b/api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java deleted file mode 100644 index 3d62c50..0000000 --- a/api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java +++ /dev/null @@ -1,61 +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.SwiftTO; - -/** - * - * - */ - -public class DeleteObjectFromSwiftCommand extends Command { - @LogLevel(Log4jLevel.Off) - private SwiftTO swift; - private String container; - private String object; - - protected DeleteObjectFromSwiftCommand() { - - } - - public DeleteObjectFromSwiftCommand(SwiftTO swift, String container, String object) { - this.swift = swift; - this.container = container; - this.object = object; - } - - public SwiftTO getSwift() { - return this.swift; - } - - public String getContainer() { - return container; - } - - public String getObject() { - return object; - } - - @Override - public boolean executeInSequence() { - // TODO Auto-generated method stub - return true; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java b/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java deleted file mode 100644 index 9a895d8..0000000 --- a/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.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; - - -public class DeleteSnapshotBackupAnswer extends Answer { - - protected DeleteSnapshotBackupAnswer() { - - } - - public DeleteSnapshotBackupAnswer(DeleteSnapshotBackupCommand cmd, boolean success, String details) { - super(cmd, success, details); - } - - - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java b/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java deleted file mode 100644 index 128df84..0000000 --- a/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java +++ /dev/null @@ -1,96 +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.SwiftTO; -import com.cloud.storage.StoragePool; - -/** - * This command encapsulates a primitive operation which enables coalescing the backed up VHD snapshots on the secondary server - * This currently assumes that the secondary storage are mounted on the XenServer. - */ -public class DeleteSnapshotBackupCommand extends SnapshotCommand { - @LogLevel(Log4jLevel.Off) - private SwiftTO swift; - private S3TO s3; - private Boolean all; - - public SwiftTO getSwift() { - return swift; - } - - public Boolean isAll() { - return all; - } - - public void setAll(Boolean all) { - this.all = all; - } - - public void setSwift(SwiftTO swift) { - this.swift = swift; - } - - public S3TO getS3() { - return s3; - } - - protected DeleteSnapshotBackupCommand() { - } - - /** - * Given 2 VHD files on the secondary storage which are linked in a parent chain as follows: - * backupUUID = parent(childUUID) - * It gets another VHD - * previousBackupVHD = parent(backupUUID) - * - * And - * 1) it coalesces backupUuid into its parent. - * 2) It deletes the VHD file corresponding to backupUuid - * 3) It sets the parent VHD of childUUID to that of previousBackupUuid - * - * It takes care of the cases when - * 1) childUUID is null. - Step 3 is not done. - * 2) previousBackupUUID is null - * - Merge childUUID into its parent backupUUID - * - Set the UUID of the resultant VHD to childUUID - * - Essentially we are deleting the oldest VHD file and setting the current oldest VHD to childUUID - * - * @param volumeName The name of the volume whose snapshot was taken (something like i-3-SV-ROOT) - * @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 backupUUID The VHD which has to be deleted - * @param childUUID The child VHD file of the backup whose parent is reset to its grandparent. - */ - public DeleteSnapshotBackupCommand(StoragePool pool, - SwiftTO swift, - S3TO s3, - String secondaryStoragePoolURL, - Long dcId, - Long accountId, - Long volumeId, - String backupUUID, Boolean all) - { - super(pool, secondaryStoragePoolURL, backupUUID, null, dcId, accountId, volumeId); - setSwift(swift); - this.s3 = s3; - setAll(all); - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java b/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java deleted file mode 100644 index e2071d7..0000000 --- a/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java +++ /dev/null @@ -1,63 +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; - -/** - * This command encapsulates a primitive operation which enables coalescing the backed up VHD snapshots on the secondary server - * This currently assumes that the secondary storage are mounted on the XenServer. - */ -public class DeleteSnapshotsDirCommand extends Command { - String secondaryStorageUrl; - Long dcId; - Long accountId; - Long volumeId; - - protected DeleteSnapshotsDirCommand() { - - } - - public DeleteSnapshotsDirCommand(String secondaryStorageUrl, - Long dcId, Long accountId, Long volumeId) - { - this.secondaryStorageUrl = secondaryStorageUrl; - this.dcId = dcId; - this.accountId = accountId; - this.volumeId = volumeId; - } - - @Override - public boolean executeInSequence() { - return true; - } - - public String getSecondaryStorageUrl() { - return secondaryStorageUrl; - } - - public Long getDcId() { - return dcId; - } - - public Long getAccountId() { - return accountId; - } - - public Long getVolumeId() { - return volumeId; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java b/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java deleted file mode 100644 index 4618d59..0000000 --- a/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java +++ /dev/null @@ -1,61 +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.io.File; -import java.util.UUID; - -import com.cloud.agent.api.to.StorageFilerTO; -import com.cloud.storage.StoragePool; - -public class DeleteStoragePoolCommand extends Command { - - StorageFilerTO pool; - public static final String LOCAL_PATH_PREFIX="/mnt/"; - String localPath; - - public DeleteStoragePoolCommand() { - - } - - public DeleteStoragePoolCommand(StoragePool pool, String localPath) { - this.pool = new StorageFilerTO(pool); - this.localPath = localPath; - } - - public DeleteStoragePoolCommand(StoragePool pool) { - this(pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes())); - } - - public StorageFilerTO getPool() { - return pool; - } - - public void setPool(StoragePool pool) { - this.pool = new StorageFilerTO(pool); - } - - @Override - public boolean executeInSequence() { - return false; - } - - public String getLocalPath() { - return localPath; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/DeleteTemplateFromS3Command.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/DeleteTemplateFromS3Command.java b/api/src/com/cloud/agent/api/DeleteTemplateFromS3Command.java deleted file mode 100644 index 278669b..0000000 --- a/api/src/com/cloud/agent/api/DeleteTemplateFromS3Command.java +++ /dev/null @@ -1,106 +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 DeleteTemplateFromS3Command extends Command { - - private S3TO s3; - private Long templateId; - private Long accountId; - - protected DeleteTemplateFromS3Command() { - super(); - } - - public DeleteTemplateFromS3Command(final S3TO s3, final Long accountId, - final Long templateId) { - - super(); - - this.s3 = s3; - this.accountId = accountId; - this.templateId = templateId; - - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((accountId == null) ? 0 : accountId.hashCode()); - result = prime * result + ((s3 == null) ? 0 : s3.hashCode()); - result = prime * result - + ((templateId == null) ? 0 : templateId.hashCode()); - return result; - } - - @Override - public boolean equals(Object thatObject) { - - if (this == thatObject) { - return true; - } - - if (thatObject == null) { - return false; - } - - if (getClass() != thatObject.getClass()) { - return false; - } - - final DeleteTemplateFromS3Command thatCommand = (DeleteTemplateFromS3Command) thatObject; - - if (!(accountId == thatCommand.accountId) - || (this.accountId != null && this.accountId - .equals(thatCommand.accountId))) { - return false; - } - - if (!(templateId == thatCommand.templateId) - || (this.templateId != null && this.templateId - .equals(thatCommand.templateId))) { - return false; - } - - return true; - - } - - public S3TO getS3() { - return s3; - } - - public Long getTemplateId() { - return templateId; - } - - public Long getAccountId() { - return accountId; - } - - @Override - public boolean executeInSequence() { - return true; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java b/api/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java deleted file mode 100644 index 8f4ecad..0000000 --- a/api/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.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 java.util.List; - -import com.cloud.agent.api.to.VolumeTO; - -public class DeleteVMSnapshotAnswer extends Answer { - private List volumeTOs; - - public DeleteVMSnapshotAnswer() { - } - - public DeleteVMSnapshotAnswer(DeleteVMSnapshotCommand cmd, boolean result, - String message) { - super(cmd, result, message); - } - - public DeleteVMSnapshotAnswer(DeleteVMSnapshotCommand cmd, - List volumeTOs) { - super(cmd, true, ""); - this.volumeTOs = volumeTOs; - } - - public List getVolumeTOs() { - return volumeTOs; - } - - public void setVolumeTOs(List volumeTOs) { - this.volumeTOs = volumeTOs; - } - - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java b/api/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java deleted file mode 100644 index c213448..0000000 --- a/api/src/com/cloud/agent/api/DeleteVMSnapshotCommand.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; - -import java.util.List; - -import com.cloud.agent.api.to.VolumeTO; - - -public class DeleteVMSnapshotCommand extends VMSnapshotBaseCommand { - public DeleteVMSnapshotCommand(String vmName, VMSnapshotTO snapshot, List volumeTOs, String guestOSType) { - super( vmName, snapshot, volumeTOs, guestOSType); - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/DownloadSnapshotFromS3Command.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/DownloadSnapshotFromS3Command.java b/api/src/com/cloud/agent/api/DownloadSnapshotFromS3Command.java deleted file mode 100644 index edf683a..0000000 --- a/api/src/com/cloud/agent/api/DownloadSnapshotFromS3Command.java +++ /dev/null @@ -1,61 +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 DownloadSnapshotFromS3Command extends SnapshotCommand { - - private S3TO s3; - private String parent; - - protected DownloadSnapshotFromS3Command() { - super(); - } - - public DownloadSnapshotFromS3Command(S3TO s3, String parent, - String secondaryStorageUrl, Long dcId, Long accountId, - Long volumeId, String backupUuid, int wait) { - - super(null, secondaryStorageUrl, backupUuid, "", dcId, accountId, - volumeId); - - this.s3 = s3; - this.parent = parent; - setWait(wait); - - } - - public S3TO getS3() { - return s3; - } - - public void setS3(S3TO s3) { - this.s3 = s3; - } - - public String getParent() { - return parent; - } - - public void setParent(String parent) { - this.parent = parent; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/DownloadTemplateFromS3ToSecondaryStorageCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/DownloadTemplateFromS3ToSecondaryStorageCommand.java b/api/src/com/cloud/agent/api/DownloadTemplateFromS3ToSecondaryStorageCommand.java deleted file mode 100644 index af61228..0000000 --- a/api/src/com/cloud/agent/api/DownloadTemplateFromS3ToSecondaryStorageCommand.java +++ /dev/null @@ -1,66 +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 final class DownloadTemplateFromS3ToSecondaryStorageCommand extends Command { - - private final S3TO s3; - private final Long accountId; - private final Long templateId; - private final String storagePath; - - public DownloadTemplateFromS3ToSecondaryStorageCommand(final S3TO s3, - final Long accountId, final Long templateId, - final String storagePath, final int wait) { - - super(); - - this.s3 = s3; - this.accountId = accountId; - this.templateId = templateId; - this.storagePath = storagePath; - - setWait(wait); - - } - - public S3TO getS3() { - return this.s3; - } - - public Long getAccountId() { - return this.accountId; - } - - public Long getTemplateId() { - return this.templateId; - } - - public String getStoragePath() { - return this.storagePath; - } - - @Override - public boolean executeInSequence() { - return true; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/FenceAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/FenceAnswer.java b/api/src/com/cloud/agent/api/FenceAnswer.java deleted file mode 100644 index 7af18f5..0000000 --- a/api/src/com/cloud/agent/api/FenceAnswer.java +++ /dev/null @@ -1,36 +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 FenceAnswer extends Answer { - public FenceAnswer() { - super(); - } - - public FenceAnswer(FenceCommand cmd) { - super(cmd, true, null); - } - - public FenceAnswer(FenceCommand cmd, String details) { - super(cmd, true, details); - } - - public FenceAnswer(FenceCommand cmd, boolean result, String details) { - super(cmd, result, details); - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/FenceCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/FenceCommand.java b/api/src/com/cloud/agent/api/FenceCommand.java deleted file mode 100644 index a891944..0000000 --- a/api/src/com/cloud/agent/api/FenceCommand.java +++ /dev/null @@ -1,61 +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; -import com.cloud.vm.VirtualMachine; - -public class FenceCommand extends Command { - - public FenceCommand() { - super(); - } - - String vmName; - String hostGuid; - String hostIp; - boolean inSeq; - - public FenceCommand(VirtualMachine vm, Host host) { - super(); - vmName = vm.getInstanceName(); - hostGuid = host.getGuid(); - hostIp = host.getPrivateIpAddress(); - inSeq = false; - } - - public void setSeq(boolean inseq) { - inSeq = inseq; - } - - public String getVmName() { - return vmName; - } - - public String getHostGuid() { - return hostGuid; - } - - public String getHostIp() { - return hostIp; - } - - @Override - public boolean executeInSequence() { - return inSeq; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetDomRVersionAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetDomRVersionAnswer.java b/api/src/com/cloud/agent/api/GetDomRVersionAnswer.java deleted file mode 100644 index 7487b57..0000000 --- a/api/src/com/cloud/agent/api/GetDomRVersionAnswer.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 GetDomRVersionAnswer extends Answer { - public static final String ROUTER_NAME = "router.name"; - public static final String ROUTER_IP = "router.ip"; - String templateVersion; - String scriptsVersion; - - protected GetDomRVersionAnswer() { - } - - public GetDomRVersionAnswer(GetDomRVersionCmd cmd, String details, String templateVersion, String scriptsVersion) { - super(cmd, true, details); - this.templateVersion = templateVersion; - this.scriptsVersion = scriptsVersion; - } - - public GetDomRVersionAnswer(GetDomRVersionCmd cmd, String details) { - super(cmd, false, details); - } - - public String getTemplateVersion() { - return this.templateVersion; - } - - public String getScriptsVersion() { - return this.scriptsVersion; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetDomRVersionCmd.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetDomRVersionCmd.java b/api/src/com/cloud/agent/api/GetDomRVersionCmd.java deleted file mode 100644 index 577c386..0000000 --- a/api/src/com/cloud/agent/api/GetDomRVersionCmd.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 GetDomRVersionCmd extends NetworkElementCommand { - @Override - public boolean executeInSequence() { - return false; - } - - public GetDomRVersionCmd() { - super(); - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetFileStatsAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetFileStatsAnswer.java b/api/src/com/cloud/agent/api/GetFileStatsAnswer.java deleted file mode 100755 index f93070e..0000000 --- a/api/src/com/cloud/agent/api/GetFileStatsAnswer.java +++ /dev/null @@ -1,37 +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.storage.VolumeStats; - -@LogLevel(Log4jLevel.Trace) -public class GetFileStatsAnswer extends Answer implements VolumeStats { - long size; - protected GetFileStatsAnswer() { - } - - public GetFileStatsAnswer(GetFileStatsCommand cmd, long value) { - super(cmd); - size = value; - } - - @Override - public long getBytesUsed() { - return size; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetFileStatsCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetFileStatsCommand.java b/api/src/com/cloud/agent/api/GetFileStatsCommand.java deleted file mode 100755 index c6dc213..0000000 --- a/api/src/com/cloud/agent/api/GetFileStatsCommand.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; - -import com.cloud.agent.api.LogLevel.Log4jLevel; -import com.cloud.storage.Volume; - -@LogLevel(Log4jLevel.Trace) -public class GetFileStatsCommand extends Command { - protected GetFileStatsCommand() { - } - - String paths; - - public GetFileStatsCommand(Volume volume) { - paths = volume.getPath(); - } - - public String getPaths() { - return paths; - } - - @Override - public boolean executeInSequence() { - return false; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetHostStatsAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetHostStatsAnswer.java b/api/src/com/cloud/agent/api/GetHostStatsAnswer.java deleted file mode 100755 index 897d7f9..0000000 --- a/api/src/com/cloud/agent/api/GetHostStatsAnswer.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; - -import com.cloud.agent.api.LogLevel.Log4jLevel; -import com.cloud.host.HostStats; - -@LogLevel(Log4jLevel.Trace) -public class GetHostStatsAnswer extends Answer implements HostStats { - - HostStatsEntry hostStats; - - protected GetHostStatsAnswer() { - hostStats = new HostStatsEntry(); - } - - public GetHostStatsAnswer(GetHostStatsCommand cmd, HostStatsEntry hostStatistics) { - super(cmd); - this.hostStats = hostStatistics; - } - - public GetHostStatsAnswer(GetHostStatsCommand cmd, double cpuUtilization, double freeMemoryKBs, double totalMemoryKBs, double networkReadKBs, - double networkWriteKBs, String entityType) { - super(cmd); - hostStats = new HostStatsEntry(); - - hostStats.setCpuUtilization(cpuUtilization); - hostStats.setFreeMemoryKBs(freeMemoryKBs); - hostStats.setTotalMemoryKBs(totalMemoryKBs); - hostStats.setNetworkReadKBs(networkReadKBs); - hostStats.setNetworkWriteKBs(networkWriteKBs); - hostStats.setEntityType(entityType); - } - - @Override - public double getUsedMemory() { - return hostStats.getUsedMemory(); - } - - @Override - public double getFreeMemoryKBs() { - return hostStats.getFreeMemoryKBs(); - } - - @Override - public double getTotalMemoryKBs() { - return hostStats.getTotalMemoryKBs(); - } - - @Override - public double getCpuUtilization() { - return hostStats.getCpuUtilization(); - } - - @Override - public double getNetworkReadKBs() { - return hostStats.getNetworkReadKBs(); - } - - @Override - public double getNetworkWriteKBs() { - return hostStats.getNetworkWriteKBs(); - } - - @Override - public String getEntityType() { - return hostStats.getEntityType(); - } - - @Override - public HostStats getHostStats() { - return hostStats; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetHostStatsCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetHostStatsCommand.java b/api/src/com/cloud/agent/api/GetHostStatsCommand.java deleted file mode 100755 index f10a9cd..0000000 --- a/api/src/com/cloud/agent/api/GetHostStatsCommand.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; - -import com.cloud.agent.api.LogLevel.Log4jLevel; - -@LogLevel(Log4jLevel.Trace) -public class GetHostStatsCommand extends Command -{ - String hostGuid; - String hostName; - long hostId; - - protected GetHostStatsCommand() { - } - - public GetHostStatsCommand(String hostGuid, String hostName, long hostId) { - this.hostGuid = hostGuid; - this.hostName = hostName; - this.hostId = hostId; - } - - public String getHostGuid(){ - return this.hostGuid; - } - - public String getHostName(){ - return this.hostName; - } - - public long getHostId(){ - return this.hostId; - } - - @Override - public boolean executeInSequence() { - return false; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetStorageStatsAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetStorageStatsAnswer.java b/api/src/com/cloud/agent/api/GetStorageStatsAnswer.java deleted file mode 100755 index 2443e8e..0000000 --- a/api/src/com/cloud/agent/api/GetStorageStatsAnswer.java +++ /dev/null @@ -1,51 +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.storage.StorageStats; - -@LogLevel(Log4jLevel.Trace) -public class GetStorageStatsAnswer extends Answer implements StorageStats { - protected GetStorageStatsAnswer() { - } - - protected long used; - - protected long capacity; - - @Override - public long getByteUsed() { - return used; - } - - @Override - public long getCapacityBytes() { - return capacity; - } - - - public GetStorageStatsAnswer(GetStorageStatsCommand cmd, long capacity, long used) { - super(cmd, true, null); - this.capacity = capacity; - this.used = used; - } - - public GetStorageStatsAnswer(GetStorageStatsCommand cmd, String details) { - super(cmd, false, details); - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetStorageStatsCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetStorageStatsCommand.java b/api/src/com/cloud/agent/api/GetStorageStatsCommand.java deleted file mode 100755 index f7ebd51..0000000 --- a/api/src/com/cloud/agent/api/GetStorageStatsCommand.java +++ /dev/null @@ -1,76 +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.storage.Storage.StoragePoolType; - -@LogLevel(Log4jLevel.Trace) -public class GetStorageStatsCommand extends Command { - private String id; - private String localPath; - private StoragePoolType pooltype; - private String secUrl; - - - public String getSecUrl() { - return secUrl; - } - - public void setSecUrl(String secUrl) { - this.secUrl = secUrl; - } - - public GetStorageStatsCommand() { - } - - public StoragePoolType getPooltype() { - return pooltype; - } - - public void setPooltype(StoragePoolType pooltype) { - this.pooltype = pooltype; - } - - public GetStorageStatsCommand(String secUrl) { - this.secUrl = secUrl; - } - - public GetStorageStatsCommand(String id, StoragePoolType pooltype) { - this.id = id; - this.pooltype = pooltype; - } - - public GetStorageStatsCommand(String id, StoragePoolType pooltype, String localPath) { - this.id = id; - this.pooltype = pooltype; - this.localPath = localPath; - } - - public String getStorageId() { - return this.id; - } - - public String getLocalPath() { - return this.localPath; - } - - @Override - public boolean executeInSequence() { - return false; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetVmStatsAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetVmStatsAnswer.java b/api/src/com/cloud/agent/api/GetVmStatsAnswer.java deleted file mode 100755 index c02eb9a..0000000 --- a/api/src/com/cloud/agent/api/GetVmStatsAnswer.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 java.util.HashMap; - -import com.cloud.agent.api.LogLevel.Log4jLevel; - -@LogLevel(Log4jLevel.Trace) -public class GetVmStatsAnswer extends Answer { - - HashMap vmStatsMap; - - public GetVmStatsAnswer(GetVmStatsCommand cmd, HashMap vmStatsMap) { - super(cmd); - this.vmStatsMap = vmStatsMap; - } - - public HashMap getVmStatsMap() { - return vmStatsMap; - } - - protected GetVmStatsAnswer() { - //no-args constructor for json serialization-deserialization - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetVmStatsCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetVmStatsCommand.java b/api/src/com/cloud/agent/api/GetVmStatsCommand.java deleted file mode 100755 index 41b0f98..0000000 --- a/api/src/com/cloud/agent/api/GetVmStatsCommand.java +++ /dev/null @@ -1,54 +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.LogLevel.Log4jLevel; - -@LogLevel(Log4jLevel.Trace) -public class GetVmStatsCommand extends Command { - List vmNames; - String hostGuid; - String hostName; - - protected GetVmStatsCommand() { - } - - public GetVmStatsCommand(List vmNames, String hostGuid, String hostName) { - this.vmNames = vmNames; - this.hostGuid = hostGuid; - this.hostName = hostName; - } - - public List getVmNames() { - return vmNames; - } - - public String getHostGuid(){ - return this.hostGuid; - } - - public String getHostName(){ - return this.hostName; - } - - @Override - public boolean executeInSequence() { - return false; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetVncPortAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetVncPortAnswer.java b/api/src/com/cloud/agent/api/GetVncPortAnswer.java deleted file mode 100644 index 5e94a18..0000000 --- a/api/src/com/cloud/agent/api/GetVncPortAnswer.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 GetVncPortAnswer extends Answer { - String address; - int port; - - protected GetVncPortAnswer() { - } - - public GetVncPortAnswer(GetVncPortCommand cmd, int port) { - super(cmd, true, null); - this.port = port; - } - - public GetVncPortAnswer(GetVncPortCommand cmd, String address, int port) { - super(cmd, true, null); - this.address = address; - this.port = port; - } - - public GetVncPortAnswer(GetVncPortCommand cmd, String details) { - super(cmd, false, details); - } - - public String getAddress() { - return address; - } - - public int getPort() { - return port; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/GetVncPortCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/GetVncPortCommand.java b/api/src/com/cloud/agent/api/GetVncPortCommand.java deleted file mode 100644 index 06165dc..0000000 --- a/api/src/com/cloud/agent/api/GetVncPortCommand.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; - -public class GetVncPortCommand extends Command { - long id; - String name; - - public GetVncPortCommand() { - } - - public GetVncPortCommand(long id, String name) { - this.id = id; - this.name = name; - } - - @Override - public boolean executeInSequence() { - return false; - } - - public String getName() { - return name; - } - - public long getId() { - return id; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/HostStatsEntry.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/HostStatsEntry.java b/api/src/com/cloud/agent/api/HostStatsEntry.java deleted file mode 100644 index 0d8cfb2..0000000 --- a/api/src/com/cloud/agent/api/HostStatsEntry.java +++ /dev/null @@ -1,113 +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.HostStats; - -public class HostStatsEntry implements HostStats { - - long hostId; - String entityType; - double cpuUtilization; - double networkReadKBs; - double networkWriteKBs; - double totalMemoryKBs; - double freeMemoryKBs; - - public HostStatsEntry() { - } - - public HostStatsEntry(long hostId,double cpuUtilization, double networkReadKBs, double networkWriteKBs, String entityType, - double totalMemoryKBs, double freeMemoryKBs, double xapiMemoryUsageKBs, double averageLoad) - { - this.hostId = hostId; - this.entityType = entityType; - this.cpuUtilization = cpuUtilization; - this.networkReadKBs = networkReadKBs; - this.networkWriteKBs = networkWriteKBs; - this.totalMemoryKBs = totalMemoryKBs; - this.freeMemoryKBs = freeMemoryKBs; - } - - @Override - public double getNetworkReadKBs() { - return networkReadKBs; - } - - public void setNetworkReadKBs(double networkReadKBs) { - this.networkReadKBs = networkReadKBs; - } - - @Override - public double getNetworkWriteKBs() { - return networkWriteKBs; - } - - public void setNetworkWriteKBs(double networkWriteKBs) { - this.networkWriteKBs = networkWriteKBs; - } - - @Override - public String getEntityType(){ - return this.entityType; - } - - public void setEntityType(String entityType){ - this.entityType = entityType; - } - - @Override - public double getTotalMemoryKBs(){ - return this.totalMemoryKBs; - } - - public void setTotalMemoryKBs(double totalMemoryKBs){ - this.totalMemoryKBs = totalMemoryKBs; - } - - @Override - public double getFreeMemoryKBs(){ - return this.freeMemoryKBs; - } - - public void setFreeMemoryKBs(double freeMemoryKBs){ - this.freeMemoryKBs = freeMemoryKBs; - } - - @Override - public double getCpuUtilization() { - return this.cpuUtilization; - } - - public void setCpuUtilization(double cpuUtilization) { - this.cpuUtilization = cpuUtilization; - } - - @Override - public double getUsedMemory() { - return (totalMemoryKBs-freeMemoryKBs); - } - - @Override - public HostStats getHostStats() { - return this; - } - - public void setHostId(long hostId) { - this.hostId = hostId; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/MaintainAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/MaintainAnswer.java b/api/src/com/cloud/agent/api/MaintainAnswer.java deleted file mode 100644 index dcfdab3..0000000 --- a/api/src/com/cloud/agent/api/MaintainAnswer.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; - -public class MaintainAnswer extends Answer { - boolean willMigrate; - - public MaintainAnswer() { - } - - public MaintainAnswer(MaintainCommand cmd) { - this(cmd, true, null); - } - - public MaintainAnswer(MaintainCommand cmd, boolean willMigrate) { - this(cmd, true, null); - this.willMigrate = willMigrate; - } - - public MaintainAnswer(MaintainCommand cmd, String details) { - this(cmd, true, details); - } - - public MaintainAnswer(MaintainCommand cmd, boolean result, String details) { - super(cmd, result, details); - this.willMigrate = true; - } - - public boolean getMigrate() { - return this.willMigrate; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/MaintainCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/MaintainCommand.java b/api/src/com/cloud/agent/api/MaintainCommand.java deleted file mode 100644 index 2a9b9a5..0000000 --- a/api/src/com/cloud/agent/api/MaintainCommand.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; - -public class MaintainCommand extends Command { - - public MaintainCommand() { - } - - @Override - public boolean executeInSequence() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ManageSnapshotAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/ManageSnapshotAnswer.java b/api/src/com/cloud/agent/api/ManageSnapshotAnswer.java deleted file mode 100644 index e490bdf..0000000 --- a/api/src/com/cloud/agent/api/ManageSnapshotAnswer.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 ManageSnapshotAnswer extends Answer { - // For create Snapshot - private String _snapshotPath; - - public ManageSnapshotAnswer() {} - - public ManageSnapshotAnswer(Command cmd, boolean success, String result) { - super(cmd, success, result); - } - - // For XenServer - public ManageSnapshotAnswer(ManageSnapshotCommand cmd, long snapshotId, String snapshotPath, boolean success, String result) { - super(cmd, success, result); - _snapshotPath = snapshotPath; - } - - public String getSnapshotPath() { - return _snapshotPath; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/ManageSnapshotCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/ManageSnapshotCommand.java b/api/src/com/cloud/agent/api/ManageSnapshotCommand.java deleted file mode 100644 index 5effc54..0000000 --- a/api/src/com/cloud/agent/api/ManageSnapshotCommand.java +++ /dev/null @@ -1,92 +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 ManageSnapshotCommand extends Command { - // XXX: Should be an enum - // XXX: Anyway there is something called inheritance in Java - public static String CREATE_SNAPSHOT = "-c"; - public static String DESTROY_SNAPSHOT = "-d"; - - private String _commandSwitch; - - // Information about the volume that the snapshot is based on - private String _volumePath = null; - StorageFilerTO _pool; - - // Information about the snapshot - private String _snapshotPath = null; - private String _snapshotName = null; - private long _snapshotId; - private String _vmName = null; - - public ManageSnapshotCommand() {} - - public ManageSnapshotCommand(long snapshotId, String volumePath, StoragePool pool, String preSnapshotPath ,String snapshotName, String vmName) { - _commandSwitch = ManageSnapshotCommand.CREATE_SNAPSHOT; - _volumePath = volumePath; - _pool = new StorageFilerTO(pool); - _snapshotPath = preSnapshotPath; - _snapshotName = snapshotName; - _snapshotId = snapshotId; - _vmName = vmName; - } - - public ManageSnapshotCommand(long snapshotId, String snapshotPath) { - _commandSwitch = ManageSnapshotCommand.DESTROY_SNAPSHOT; - _snapshotPath = snapshotPath; - } - - - @Override - public boolean executeInSequence() { - return false; - } - - public String getCommandSwitch() { - return _commandSwitch; - } - - public String getVolumePath() { - return _volumePath; - } - - public StorageFilerTO getPool() { - return _pool; - } - - public String getSnapshotPath() { - return _snapshotPath; - } - - public String getSnapshotName() { - return _snapshotName; - } - - public long getSnapshotId() { - return _snapshotId; - } - - public String getVmName() { - return _vmName; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/MigrateAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/MigrateAnswer.java b/api/src/com/cloud/agent/api/MigrateAnswer.java deleted file mode 100644 index 19d690a..0000000 --- a/api/src/com/cloud/agent/api/MigrateAnswer.java +++ /dev/null @@ -1,33 +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 MigrateAnswer extends Answer { - Integer vncPort = null; - - protected MigrateAnswer() { - } - - public MigrateAnswer(MigrateCommand cmd, boolean result, String detail, Integer vncPort) { - super(cmd, result, detail); - this.vncPort = vncPort; - } - - public Integer getVncPort() { - return vncPort; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/MigrateCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/MigrateCommand.java b/api/src/com/cloud/agent/api/MigrateCommand.java deleted file mode 100644 index 5042b8c..0000000 --- a/api/src/com/cloud/agent/api/MigrateCommand.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 MigrateCommand extends Command { - String vmName; - String destIp; - String hostGuid; - boolean isWindows; - - - protected MigrateCommand() { - } - - public MigrateCommand(String vmName, String destIp, boolean isWindows) { - this.vmName = vmName; - this.destIp = destIp; - this.isWindows = isWindows; - } - - public boolean isWindows() { - return isWindows; - } - - public String getDestinationIp() { - return destIp; - } - - public String getVmName() { - return vmName; - } - - public void setHostGuid(String guid) { - this.hostGuid = guid; - } - - public String getHostGuid() { - return this.hostGuid; - } - - @Override - public boolean executeInSequence() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/MigrateWithStorageAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageAnswer.java b/api/src/com/cloud/agent/api/MigrateWithStorageAnswer.java deleted file mode 100644 index 06aff32..0000000 --- a/api/src/com/cloud/agent/api/MigrateWithStorageAnswer.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.to.VolumeTO; - -public class MigrateWithStorageAnswer extends Answer { - - List volumeTos; - - public MigrateWithStorageAnswer(MigrateWithStorageCommand cmd, Exception ex) { - super(cmd, ex); - volumeTos = null; - } - - public MigrateWithStorageAnswer(MigrateWithStorageCommand cmd, List volumeTos) { - super(cmd, true, null); - this.volumeTos = volumeTos; - } - - public List getVolumeTos() { - return volumeTos; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/MigrateWithStorageCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageCommand.java b/api/src/com/cloud/agent/api/MigrateWithStorageCommand.java deleted file mode 100644 index 058aa15..0000000 --- a/api/src/com/cloud/agent/api/MigrateWithStorageCommand.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 java.util.Map; -import com.cloud.agent.api.to.VirtualMachineTO; -import com.cloud.agent.api.to.VolumeTO; -import com.cloud.agent.api.to.StorageFilerTO; - -public class MigrateWithStorageCommand extends Command { - VirtualMachineTO vm; - Map volumeToFiler; - - public MigrateWithStorageCommand(VirtualMachineTO vm, Map volumeToFiler) { - this.vm = vm; - this.volumeToFiler = volumeToFiler; - } - - public VirtualMachineTO getVirtualMachine() { - return vm; - } - - public Map getVolumeToFiler() { - return volumeToFiler; - } - - @Override - public boolean executeInSequence() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java b/api/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java deleted file mode 100644 index 920cf48..0000000 --- a/api/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.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; - -import java.util.List; -import com.cloud.agent.api.to.VolumeTO; - -public class MigrateWithStorageCompleteAnswer extends Answer { - List volumeTos; - - public MigrateWithStorageCompleteAnswer(MigrateWithStorageCompleteCommand cmd, Exception ex) { - super(cmd, ex); - volumeTos = null; - } - - public MigrateWithStorageCompleteAnswer(MigrateWithStorageCompleteCommand cmd, List volumeTos) { - super(cmd, true, null); - this.volumeTos = volumeTos; - } - - public List getVolumeTos() { - return volumeTos; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java b/api/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java deleted file mode 100644 index 1303c07..0000000 --- a/api/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java +++ /dev/null @@ -1,36 +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 MigrateWithStorageCompleteCommand extends Command { - VirtualMachineTO vm; - - public MigrateWithStorageCompleteCommand(VirtualMachineTO vm) { - this.vm = vm; - } - - public VirtualMachineTO getVirtualMachine() { - return vm; - } - - @Override - public boolean executeInSequence() { - return false; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java b/api/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java deleted file mode 100644 index 3bf521c..0000000 --- a/api/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.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.Map; -import com.cloud.agent.api.to.VolumeTO; -import com.cloud.agent.api.to.NicTO; - -public class MigrateWithStorageReceiveAnswer extends Answer { - - Map volumeToSr; - Map nicToNetwork; - Map token; - - public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Exception ex) { - super(cmd, ex); - volumeToSr = null; - nicToNetwork = null; - token = null; - } - - public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Map volumeToSr, - Map nicToNetwork, Map token) { - super(cmd, true, null); - this.volumeToSr = volumeToSr; - this.nicToNetwork = nicToNetwork; - this.token = token; - } - - public Map getVolumeToSr() { - return volumeToSr; - } - - public Map getNicToNetwork() { - return nicToNetwork; - } - - public Map getToken() { - return token; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java b/api/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java deleted file mode 100644 index df67405..0000000 --- a/api/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.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 java.util.Map; -import com.cloud.agent.api.to.VirtualMachineTO; -import com.cloud.agent.api.to.VolumeTO; -import com.cloud.agent.api.to.StorageFilerTO; - -public class MigrateWithStorageReceiveCommand extends Command { - VirtualMachineTO vm; - Map volumeToFiler; - - public MigrateWithStorageReceiveCommand(VirtualMachineTO vm, Map volumeToFiler) { - this.vm = vm; - this.volumeToFiler = volumeToFiler; - } - - public VirtualMachineTO getVirtualMachine() { - return vm; - } - - public Map getVolumeToFiler() { - return volumeToFiler; - } - - @Override - public boolean executeInSequence() { - return true; - } -}