From 46353e0916af32339887c1ad6035d024bd12d9a8 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 3 Dec 2012 23:35:30 -0800 Subject: [PATCH] api_refactor: refactor vmgroup apis - Fix refactored apis, fix mappings in commands*.in - Fix comments etc. Signed-off-by: Rohit Yadav --- api/src/com/cloud/server/ManagementService.java | 4 ++-- api/src/com/cloud/vm/UserVmService.java | 4 ++-- .../api/user/vmgroup/command}/CreateVMGroupCmd.java | 2 +- .../api/user/vmgroup/command}/DeleteVMGroupCmd.java | 2 +- .../api/user/vmgroup/command}/ListVMGroupsCmd.java | 2 +- .../api/user/vmgroup/command}/UpdateVMGroupCmd.java | 2 +- client/tomcatconf/commands.properties.in | 8 ++++---- server/src/com/cloud/server/ManagementServerImpl.java | 4 ++-- server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++-- server/test/com/cloud/vm/MockUserVmManagerImpl.java | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/vmgroup/command}/CreateVMGroupCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/vmgroup/command}/DeleteVMGroupCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/vmgroup/command}/ListVMGroupsCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/vmgroup/command}/UpdateVMGroupCmd.java (98%) diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index 2b06d75e5c8..e773372d304 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -50,7 +50,7 @@ import com.cloud.api.commands.ListSSHKeyPairsCmd; import com.cloud.api.commands.ListServiceOfferingsCmd; import com.cloud.api.commands.ListStoragePoolsCmd; import com.cloud.api.commands.ListSystemVMsCmd; -import com.cloud.api.commands.ListVMGroupsCmd; +import org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd; import com.cloud.api.commands.ListVlanIpRangesCmd; import com.cloud.api.commands.ListZonesByCmd; import com.cloud.api.commands.RebootSystemVmCmd; @@ -59,7 +59,7 @@ import com.cloud.api.commands.StopSystemVmCmd; import com.cloud.api.commands.UpdateDomainCmd; import com.cloud.api.commands.UpdateHostPasswordCmd; import org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd; -import com.cloud.api.commands.UpdateVMGroupCmd; +import org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroupCmd; import com.cloud.api.commands.UpgradeSystemVMCmd; import com.cloud.api.commands.UploadCustomCertificateCmd; import com.cloud.async.AsyncJob; diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java index 6c9afd21075..8c897d3f241 100755 --- a/api/src/com/cloud/vm/UserVmService.java +++ b/api/src/com/cloud/vm/UserVmService.java @@ -24,8 +24,8 @@ import javax.naming.InsufficientResourcesException; import org.apache.cloudstack.api.admin.vm.command.AssignVMCmd; import com.cloud.api.commands.AttachVolumeCmd; import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; -import com.cloud.api.commands.CreateVMGroupCmd; -import com.cloud.api.commands.DeleteVMGroupCmd; +import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd; +import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd; import com.cloud.api.commands.DetachVolumeCmd; diff --git a/api/src/com/cloud/api/commands/CreateVMGroupCmd.java b/api/src/org/apache/cloudstack/api/user/vmgroup/command/CreateVMGroupCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/CreateVMGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/vmgroup/command/CreateVMGroupCmd.java index 45d67bcdc4d..15b506f49dc 100644 --- a/api/src/com/cloud/api/commands/CreateVMGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/vmgroup/command/CreateVMGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.vmgroup.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteVMGroupCmd.java b/api/src/org/apache/cloudstack/api/user/vmgroup/command/DeleteVMGroupCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteVMGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/vmgroup/command/DeleteVMGroupCmd.java index f9159e26eb9..43761d2dcef 100644 --- a/api/src/com/cloud/api/commands/DeleteVMGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/vmgroup/command/DeleteVMGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.vmgroup.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ListVMGroupsCmd.java b/api/src/org/apache/cloudstack/api/user/vmgroup/command/ListVMGroupsCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListVMGroupsCmd.java rename to api/src/org/apache/cloudstack/api/user/vmgroup/command/ListVMGroupsCmd.java index 45648da2105..94a7d152d97 100644 --- a/api/src/com/cloud/api/commands/ListVMGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/user/vmgroup/command/ListVMGroupsCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.vmgroup.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdateVMGroupCmd.java b/api/src/org/apache/cloudstack/api/user/vmgroup/command/UpdateVMGroupCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateVMGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/vmgroup/command/UpdateVMGroupCmd.java index 7f88701b0c9..33d29a064e8 100644 --- a/api/src/com/cloud/api/commands/UpdateVMGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/vmgroup/command/UpdateVMGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.vmgroup.command; import org.apache.log4j.Logger; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 2a13d320930..378e4716e7b 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -282,10 +282,10 @@ revokeSecurityGroupEgress=org.apache.cloudstack.api.user.sg.command.RevokeSecuri listSecurityGroups=org.apache.cloudstack.api.user.sg.command.ListSecurityGroupsCmd;15 #### vm group commands -createInstanceGroup=com.cloud.api.commands.CreateVMGroupCmd;15 -deleteInstanceGroup=com.cloud.api.commands.DeleteVMGroupCmd;15 -updateInstanceGroup=com.cloud.api.commands.UpdateVMGroupCmd;15 -listInstanceGroups=com.cloud.api.commands.ListVMGroupsCmd;15 +createInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd;15 +deleteInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd;15 +updateInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroupCmd;15 +listInstanceGroups=org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd;15 ### Certificate commands uploadCustomCertificate=com.cloud.api.commands.UploadCustomCertificateCmd;1 diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index c43dbd350d9..96d3997f029 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -45,6 +45,7 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.cloudstack.api.user.iso.command.ListIsosCmd; import org.apache.cloudstack.api.user.template.command.ListTemplatesCmd; import org.apache.cloudstack.api.user.template.command.UpdateTemplateCmd; +import org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; @@ -84,7 +85,6 @@ import com.cloud.api.commands.ListSSHKeyPairsCmd; import com.cloud.api.commands.ListServiceOfferingsCmd; import com.cloud.api.commands.ListStoragePoolsCmd; import com.cloud.api.commands.ListSystemVMsCmd; -import com.cloud.api.commands.ListVMGroupsCmd; import com.cloud.api.commands.ListVlanIpRangesCmd; import com.cloud.api.commands.ListZonesByCmd; import com.cloud.api.commands.RebootSystemVmCmd; @@ -94,7 +94,7 @@ import com.cloud.api.commands.UpdateDomainCmd; import com.cloud.api.commands.UpdateHostPasswordCmd; import org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd; import com.cloud.api.commands.UpdateTemplateOrIsoCmd; -import com.cloud.api.commands.UpdateVMGroupCmd; +import org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroupCmd; import com.cloud.api.commands.UpgradeSystemVMCmd; import com.cloud.api.commands.UploadCustomCertificateCmd; import com.cloud.api.response.ExtractResponse; diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 2c7c7fbb493..c8c6b516d03 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -32,6 +32,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; +import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; @@ -61,8 +62,7 @@ import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.admin.vm.command.AssignVMCmd; import com.cloud.api.commands.AttachVolumeCmd; -import com.cloud.api.commands.CreateVMGroupCmd; -import com.cloud.api.commands.DeleteVMGroupCmd; +import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd; import com.cloud.api.commands.DetachVolumeCmd; diff --git a/server/test/com/cloud/vm/MockUserVmManagerImpl.java b/server/test/com/cloud/vm/MockUserVmManagerImpl.java index 39900a6d179..4573948bc7f 100644 --- a/server/test/com/cloud/vm/MockUserVmManagerImpl.java +++ b/server/test/com/cloud/vm/MockUserVmManagerImpl.java @@ -31,8 +31,8 @@ import com.cloud.agent.manager.Commands; import org.apache.cloudstack.api.admin.vm.command.AssignVMCmd; import com.cloud.api.commands.AttachVolumeCmd; import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; -import com.cloud.api.commands.CreateVMGroupCmd; -import com.cloud.api.commands.DeleteVMGroupCmd; +import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd; +import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd; import com.cloud.api.commands.DetachVolumeCmd;