cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/master to ea2ee15
Date Thu, 20 Mar 2014 23:50:46 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master a1831bc86 -> ea2ee1521


Add newly separated admin cmd class in ManagementServerImpl.getCommands.


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

Branch: refs/heads/master
Commit: ea2ee15214e690719900300c58ce036123c89c23
Parents: a1831bc
Author: Min Chen <min.chen@citrix.com>
Authored: Thu Mar 20 15:46:06 2014 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Thu Mar 20 16:42:31 2014 -0700

----------------------------------------------------------------------
 .../command/admin/iso/CopyIsoCmdByAdmin.java    | 12 +++
 .../api/command/user/iso/CopyIsoCmd.java        |  3 +-
 .../com/cloud/server/ManagementServerImpl.java  | 95 +++++++++++++++++++-
 3 files changed, 108 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea2ee152/api/src/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java
new file mode 100644
index 0000000..0475b37
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java
@@ -0,0 +1,12 @@
+package org.apache.cloudstack.api.command.admin.iso;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.iso.CopyIsoCmd;
+import org.apache.cloudstack.api.response.TemplateResponse;
+
+@APICommand(name = "copyIso", description = "Copies an iso from one zone to another.", responseObject
= TemplateResponse.class, responseView = ResponseView.Full,
+        requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
+public class CopyIsoCmdByAdmin extends CopyIsoCmd {
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea2ee152/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
index 21196bc..9002624 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
@@ -19,10 +19,11 @@ package org.apache.cloudstack.api.command.user.iso;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;
 import org.apache.cloudstack.api.response.TemplateResponse;
 
-@APICommand(name = "copyIso", description = "Copies an iso from one zone to another.", responseObject
= TemplateResponse.class,
+@APICommand(name = "copyIso", description = "Copies an iso from one zone to another.", responseObject
= TemplateResponse.class, responseView = ResponseView.Restricted,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class CopyIsoCmd extends CopyTemplateCmd {
     public static final Logger s_logger = Logger.getLogger(CopyIsoCmd.class.getName());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea2ee152/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 073cf47..7431891 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -51,8 +51,12 @@ import org.apache.cloudstack.api.command.admin.account.CreateAccountCmd;
 import org.apache.cloudstack.api.command.admin.account.DeleteAccountCmd;
 import org.apache.cloudstack.api.command.admin.account.DisableAccountCmd;
 import org.apache.cloudstack.api.command.admin.account.EnableAccountCmd;
+import org.apache.cloudstack.api.command.admin.account.ListAccountsCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.account.LockAccountCmd;
 import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
+import org.apache.cloudstack.api.command.admin.address.AssociateIPAddrCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.address.ListPublicIpAddressesCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.affinitygroup.UpdateVMAffinityGroupCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.alert.GenerateAlertCmd;
 import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd;
 import org.apache.cloudstack.api.command.admin.autoscale.DeleteCounterCmd;
@@ -94,8 +98,16 @@ import org.apache.cloudstack.api.command.admin.internallb.ListInternalLBVMsCmd;
 import org.apache.cloudstack.api.command.admin.internallb.ListInternalLoadBalancerElementsCmd;
 import org.apache.cloudstack.api.command.admin.internallb.StartInternalLBVMCmd;
 import org.apache.cloudstack.api.command.admin.internallb.StopInternalLBVMCmd;
+import org.apache.cloudstack.api.command.admin.iso.AttachIsoCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.iso.CopyIsoCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.iso.DetachIsoCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.iso.ListIsoPermissionsCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.iso.ListIsosCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.iso.RegisterIsoCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.loadbalancer.ListLoadBalancerRuleInstancesCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.network.AddNetworkDeviceCmd;
 import org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd;
+import org.apache.cloudstack.api.command.admin.network.CreateNetworkCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
 import org.apache.cloudstack.api.command.admin.network.CreatePhysicalNetworkCmd;
 import org.apache.cloudstack.api.command.admin.network.CreateStorageNetworkIpRangeCmd;
@@ -109,10 +121,12 @@ import org.apache.cloudstack.api.command.admin.network.ListDedicatedGuestVlanRan
 import org.apache.cloudstack.api.command.admin.network.ListNetworkDeviceCmd;
 import org.apache.cloudstack.api.command.admin.network.ListNetworkIsolationMethodsCmd;
 import org.apache.cloudstack.api.command.admin.network.ListNetworkServiceProvidersCmd;
+import org.apache.cloudstack.api.command.admin.network.ListNetworksCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.network.ListPhysicalNetworksCmd;
 import org.apache.cloudstack.api.command.admin.network.ListStorageNetworkIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.network.ListSupportedNetworkServicesCmd;
 import org.apache.cloudstack.api.command.admin.network.ReleaseDedicatedGuestVlanRangeCmd;
+import org.apache.cloudstack.api.command.admin.network.UpdateNetworkCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
 import org.apache.cloudstack.api.command.admin.network.UpdateNetworkServiceProviderCmd;
 import org.apache.cloudstack.api.command.admin.network.UpdatePhysicalNetworkCmd;
@@ -178,7 +192,12 @@ import org.apache.cloudstack.api.command.admin.systemvm.ScaleSystemVMCmd;
 import org.apache.cloudstack.api.command.admin.systemvm.StartSystemVMCmd;
 import org.apache.cloudstack.api.command.admin.systemvm.StopSystemVmCmd;
 import org.apache.cloudstack.api.command.admin.systemvm.UpgradeSystemVMCmd;
+import org.apache.cloudstack.api.command.admin.template.CopyTemplateCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.template.CreateTemplateCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.template.ListTemplatePermissionsCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.template.ListTemplatesCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.template.PrepareTemplateCmd;
+import org.apache.cloudstack.api.command.admin.template.RegisterTemplateCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.usage.AddTrafficMonitorCmd;
 import org.apache.cloudstack.api.command.admin.usage.AddTrafficTypeCmd;
 import org.apache.cloudstack.api.command.admin.usage.DeleteTrafficMonitorCmd;
@@ -204,20 +223,47 @@ import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.vlan.ListVlanIpRangesCmd;
 import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.vm.AddNicToVMCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
+import org.apache.cloudstack.api.command.admin.vm.DeployVMCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vm.DestroyVMCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.vm.ExpungeVMCmd;
 import org.apache.cloudstack.api.command.admin.vm.GetVMUserDataCmd;
 import org.apache.cloudstack.api.command.admin.vm.ListVMsCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd;
 import org.apache.cloudstack.api.command.admin.vm.MigrateVirtualMachineWithVolumeCmd;
+import org.apache.cloudstack.api.command.admin.vm.RebootVMCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;
+import org.apache.cloudstack.api.command.admin.vm.RemoveNicFromVMCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vm.ResetVMPasswordCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vm.ResetVMSSHKeyCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vm.RestoreVMCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vm.ScaleVMCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vm.StartVMCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vm.StopVMCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vm.UpdateDefaultNicForVMCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vm.UpdateVMCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vm.UpgradeVMCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vmsnapshot.RevertToVMSnapshotCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.volume.AttachVolumeCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.volume.CreateVolumeCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.volume.DetachVolumeCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.volume.ListVolumesCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.volume.MigrateVolumeCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.volume.ResizeVolumeCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.volume.UpdateVolumeCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.volume.UploadVolumeCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.vpc.CreatePrivateGatewayCmd;
+import org.apache.cloudstack.api.command.admin.vpc.CreateVPCCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.vpc.CreateVPCOfferingCmd;
 import org.apache.cloudstack.api.command.admin.vpc.DeletePrivateGatewayCmd;
 import org.apache.cloudstack.api.command.admin.vpc.DeleteVPCOfferingCmd;
+import org.apache.cloudstack.api.command.admin.vpc.ListVPCsCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.vpc.UpdateVPCCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.vpc.UpdateVPCOfferingCmd;
 import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;
 import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;
+import org.apache.cloudstack.api.command.admin.zone.ListZonesCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.zone.MarkDefaultZoneForAccountCmd;
 import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;
 import org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd;
@@ -2770,7 +2816,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         cmdList.add(ExpungeVMCmd.class);
         cmdList.add(GetVMPasswordCmd.class);
         cmdList.add(ListVMsCmd.class);
-        cmdList.add(ListVMsCmdByAdmin.class);
         cmdList.add(ScaleVMCmd.class);
         cmdList.add(RebootVMCmd.class);
         cmdList.add(RemoveNicFromVMCmd.class);
@@ -2898,6 +2943,54 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         cmdList.add(UpdateRemoteAccessVpnCmd.class);
         cmdList.add(UpdateVpnConnectionCmd.class);
         cmdList.add(UpdateVpnGatewayCmd.class);
+        // separated admin commands
+        cmdList.add(ListAccountsCmdByAdmin.class);
+        cmdList.add(ListZonesCmdByAdmin.class);
+        cmdList.add(ListTemplatesCmdByAdmin.class);
+        cmdList.add(CreateTemplateCmdByAdmin.class);
+        cmdList.add(CopyTemplateCmdByAdmin.class);
+        cmdList.add(RegisterTemplateCmdByAdmin.class);
+        cmdList.add(ListTemplatePermissionsCmdByAdmin.class);
+        cmdList.add(RegisterIsoCmdByAdmin.class);
+        cmdList.add(CopyIsoCmdByAdmin.class);
+        cmdList.add(ListIsosCmdByAdmin.class);
+        cmdList.add(AttachIsoCmdByAdmin.class);
+        cmdList.add(DetachIsoCmdByAdmin.class);
+        cmdList.add(ListIsoPermissionsCmdByAdmin.class);
+        cmdList.add(UpdateVMAffinityGroupCmdByAdmin.class);
+        cmdList.add(AddNicToVMCmdByAdmin.class);
+        cmdList.add(RemoveNicFromVMCmdByAdmin.class);
+        cmdList.add(UpdateDefaultNicForVMCmdByAdmin.class);
+        cmdList.add(ListLoadBalancerRuleInstancesCmdByAdmin.class);
+        cmdList.add(DeployVMCmdByAdmin.class);
+        cmdList.add(DestroyVMCmdByAdmin.class);
+        cmdList.add(RebootVMCmdByAdmin.class);
+        cmdList.add(ResetVMPasswordCmdByAdmin.class);
+        cmdList.add(ResetVMSSHKeyCmdByAdmin.class);
+        cmdList.add(RestoreVMCmdByAdmin.class);
+        cmdList.add(ScaleVMCmdByAdmin.class);
+        cmdList.add(StartVMCmdByAdmin.class);
+        cmdList.add(StopVMCmdByAdmin.class);
+        cmdList.add(UpdateVMCmdByAdmin.class);
+        cmdList.add(UpgradeVMCmdByAdmin.class);
+        cmdList.add(RevertToVMSnapshotCmdByAdmin.class);
+        cmdList.add(ListVMsCmdByAdmin.class);
+        cmdList.add(AttachVolumeCmdByAdmin.class);
+        cmdList.add(CreateVolumeCmdByAdmin.class);
+        cmdList.add(DetachVolumeCmdByAdmin.class);
+        cmdList.add(MigrateVolumeCmdByAdmin.class);
+        cmdList.add(ResizeVolumeCmdByAdmin.class);
+        cmdList.add(UpdateVolumeCmdByAdmin.class);
+        cmdList.add(UploadVolumeCmdByAdmin.class);
+        cmdList.add(ListVolumesCmdByAdmin.class);
+        cmdList.add(AssociateIPAddrCmdByAdmin.class);
+        cmdList.add(ListPublicIpAddressesCmdByAdmin.class);
+        cmdList.add(CreateNetworkCmdByAdmin.class);
+        cmdList.add(UpdateNetworkCmdByAdmin.class);
+        cmdList.add(ListNetworksCmdByAdmin.class);
+        cmdList.add(CreateVPCCmdByAdmin.class);
+        cmdList.add(ListVPCsCmdByAdmin.class);
+        cmdList.add(UpdateVPCCmdByAdmin.class);
         return cmdList;
     }
 


Mime
View raw message