api_refactor: refactor vmgroup apis

- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.

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

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;

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;

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;
 

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;
 

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;

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;
 

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

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;

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;

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;