incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/2] git commit: refs/heads/master - CLOUDSTACK-1272: Fix incorrect annotation for service offering id
Date Thu, 14 Feb 2013 11:00:38 GMT
CLOUDSTACK-1272: Fix incorrect annotation for service offering id

Fixes param annotation in:
   api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
   api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
   api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/afbc9506
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/afbc9506
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/afbc9506

Branch: refs/heads/master
Commit: afbc950652d5c0aa6cd5415a296a6581f04af5a5
Parents: ec8d204
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Thu Feb 14 16:26:18 2013 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Thu Feb 14 16:30:23 2013 +0530

----------------------------------------------------------------------
 .../api/command/admin/router/UpgradeRouterCmd.java |    4 ++--
 .../command/admin/systemvm/UpgradeSystemVMCmd.java |    4 ++--
 .../autoscale/CreateAutoScaleVmProfileCmd.java     |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/afbc9506/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
index c2cde16..b049f66 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
@@ -22,8 +22,8 @@ import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.response.DiskOfferingResponse;
 import org.apache.cloudstack.api.response.DomainRouterResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import org.apache.log4j.Logger;
 
 import com.cloud.network.router.VirtualRouter;
@@ -42,7 +42,7 @@ public class UpgradeRouterCmd extends BaseCmd {
             required=true, description="The ID of the router")
     private Long id;
 
-    @Parameter(name=ApiConstants.SERVICE_OFFERING_ID, type=CommandType.UUID, entityType =
DiskOfferingResponse.class,
+    @Parameter(name=ApiConstants.SERVICE_OFFERING_ID, type=CommandType.UUID, entityType =
ServiceOfferingResponse.class,
             required=true, description="the service offering ID to apply to the domain router")
     private Long serviceOfferingId;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/afbc9506/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
index a70d927..e91d005 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
@@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
-import org.apache.cloudstack.api.response.DiskOfferingResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import org.apache.cloudstack.api.response.SystemVmResponse;
 import org.apache.log4j.Logger;
 
@@ -48,7 +48,7 @@ public class UpgradeSystemVMCmd extends BaseCmd {
             required=true, description="The ID of the system vm")
     private Long id;
 
-    @Parameter(name=ApiConstants.SERVICE_OFFERING_ID, type=CommandType.UUID, entityType=DiskOfferingResponse.class,
+    @Parameter(name=ApiConstants.SERVICE_OFFERING_ID, type=CommandType.UUID, entityType=ServiceOfferingResponse.class,
             required=true, description="the service offering ID to apply to the system vm")
     private Long serviceOfferingId;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/afbc9506/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
index ecfd8df..87d4466 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
@@ -26,7 +26,7 @@ import org.apache.cloudstack.api.BaseAsyncCreateCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
-import org.apache.cloudstack.api.response.DiskOfferingResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import org.apache.cloudstack.api.response.TemplateResponse;
 import org.apache.cloudstack.api.response.UserResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
@@ -56,7 +56,7 @@ public class CreateAutoScaleVmProfileCmd extends BaseAsyncCreateCmd {
             required = true, description = "availability zone for the auto deployed virtual
machine")
     private Long zoneId;
 
-    @Parameter(name = ApiConstants.SERVICE_OFFERING_ID, type = CommandType.UUID, entityType
= DiskOfferingResponse.class,
+    @Parameter(name = ApiConstants.SERVICE_OFFERING_ID, type = CommandType.UUID, entityType
= ServiceOfferingResponse.class,
             required = true, description = "the service offering of the auto deployed virtual
machine")
     private Long serviceOfferingId;
 


Mime
View raw message