api: Fix service and disk offering annotations Signed-off-by: Rohit Yadav <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6fa8c708 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6fa8c708 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6fa8c708 Branch: refs/heads/api_refactoring Commit: 6fa8c708eeed0b511780b900b7869385091cac1d Parents: 98d5719 Author: Rohit Yadav <[email protected]> Authored: Thu Jan 3 22:16:51 2013 -0800 Committer: Rohit Yadav <[email protected]> Committed: Thu Jan 3 22:32:46 2013 -0800 ---------------------------------------------------------------------- api/src/com/cloud/offering/ServiceOffering.java | 9 ++++----- .../admin/offering/DeleteDiskOfferingCmd.java | 4 ++-- .../admin/offering/DeleteServiceOfferingCmd.java | 4 ++-- .../admin/offering/UpdateDiskOfferingCmd.java | 2 +- .../admin/offering/UpdateServiceOfferingCmd.java | 3 +-- .../user/offering/ListServiceOfferingsCmd.java | 3 +-- 6 files changed, 11 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fa8c708/api/src/com/cloud/offering/ServiceOffering.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/offering/ServiceOffering.java b/api/src/com/cloud/offering/ServiceOffering.java index 84950c6..d9393be 100755 --- a/api/src/com/cloud/offering/ServiceOffering.java +++ b/api/src/com/cloud/offering/ServiceOffering.java @@ -16,12 +16,15 @@ // under the License. package com.cloud.offering; +import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; + import java.util.Date; /** * offered. */ -public interface ServiceOffering { +public interface ServiceOffering extends InternalIdentity, Identity { public static final String consoleProxyDefaultOffUniqueName = "Cloud.com-ConsoleProxy"; public static final String ssvmDefaultOffUniqueName = "Cloud.com-SecondaryStorage"; public static final String routerDefaultOffUniqueName = "Cloud.Com-SoftwareRouter"; @@ -32,10 +35,6 @@ public interface ServiceOffering { shared } - long getId(); - - String getUuid(); - String getDisplayText(); Date getCreated(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fa8c708/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java index 2126ada..85e034f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.admin.offering; -import com.cloud.offering.DiskOffering; +import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; @@ -36,7 +36,7 @@ public class DeleteDiskOfferingCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType=DiskOffering.class, + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType=DiskOfferingResponse.class, required=true, description="ID of the disk offering") private Long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fa8c708/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java index a8cab4e..d1ea4de 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java @@ -16,8 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.offering; -import com.cloud.offering.DiskOffering; import org.apache.cloudstack.api.*; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; @@ -33,7 +33,7 @@ public class DeleteServiceOfferingCmd extends BaseCmd{ //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType=DiskOffering.class, + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType=ServiceOfferingResponse.class, required=true, description="the ID of the service offering") private Long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fa8c708/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java index a9cd2ec..8db731d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java @@ -38,7 +38,7 @@ public class UpdateDiskOfferingCmd extends BaseCmd{ @Parameter(name=ApiConstants.DISPLAY_TEXT, type=CommandType.STRING, description="updates alternate display text of the disk offering with this value", length=4096) private String displayText; - @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType=DiskOffering.class, + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType=DiskOfferingResponse.class, required=true, description="ID of the disk offering") private Long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fa8c708/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java index d8f3d97..38220b9 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.api.command.admin.offering; -import com.cloud.offering.DiskOffering; import org.apache.cloudstack.api.*; import org.apache.log4j.Logger; @@ -33,7 +32,7 @@ public class UpdateServiceOfferingCmd extends BaseCmd { ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType= DiskOffering.class, + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType=ServiceOfferingResponse.class, required=true, description="the ID of the service offering to be updated") private Long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fa8c708/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java index b599aa5..9fad577 100644 --- a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java @@ -26,7 +26,6 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.DomainResponse; -import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.cloudstack.api.response.UserVmResponse; @@ -42,7 +41,7 @@ public class ListServiceOfferingsCmd extends BaseListCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = DiskOfferingResponse.class, + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = ServiceOfferingResponse.class, description="ID of the service offering") private Long id;
