apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 20:29:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

api_refactor: capacity, hypvsr, alert and cert apis

Browse Source 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-06 11:25:56 -08:00
parent 780eb95830
commit 089db9c631
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/com/cloud/server/ManagementService.java
View File

@ -28,6 +28,8 @@ import org.apache.cloudstack.api.admin.cluster.command.ListClustersCmd;
import org.apache.cloudstack.api.admin.host.command.ListHostsCmd;
import org.apache.cloudstack.api.admin.host.command.UpdateHostPasswordCmd;
import org.apache.cloudstack.api.admin.pod.command.ListPodsByCmd;
import org.apache.cloudstack.api.admin.resource.command.ListAlertsCmd;
import org.apache.cloudstack.api.admin.resource.command.ListCapacityCmd;
import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd;
import org.apache.cloudstack.api.user.address.command.ListPublicIpAddressesCmd;
import org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd;
@ -41,9 +43,7 @@ import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd;
import org.apache.cloudstack.api.user.template.command.ListTemplatesCmd;
import org.apache.cloudstack.api.user.template.command.UpdateTemplateCmd;
import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;
import com.cloud.api.commands.ListAlertsCmd;
import org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd;
import com.cloud.api.commands.ListCapacityCmd;
import org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd;
import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;
@ -61,7 +61,7 @@ import org.apache.cloudstack.api.admin.domain.command.UpdateDomainCmd;
import org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd;
import org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroupCmd;
import org.apache.cloudstack.api.admin.systemvm.command.UpgradeSystemVMCmd;
import com.cloud.api.commands.UploadCustomCertificateCmd;
import org.apache.cloudstack.api.admin.resource.command.UploadCustomCertificateCmd;
import com.cloud.api.view.vo.DomainRouterJoinVO;
import com.cloud.async.AsyncJob;
import com.cloud.capacity.Capacity;

2
api/src/com/cloud/api/commands/ListAlertsCmd.java → api/src/org/apache/cloudstack/api/admin/resource/command/ListAlertsCmd.java
View File

@ -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.admin.resource.command;
import java.util.ArrayList;
import java.util.List;

2
api/src/com/cloud/api/commands/ListCapacityCmd.java → api/src/org/apache/cloudstack/api/admin/resource/command/ListCapacityCmd.java
View File

@ -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.admin.resource.command;
import java.text.DecimalFormat;
import java.util.List;

2
api/src/com/cloud/api/commands/UploadCustomCertificateCmd.java → api/src/org/apache/cloudstack/api/admin/resource/command/UploadCustomCertificateCmd.java
View File

@ -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.admin.resource.command;
import org.apache.log4j.Logger;

2
api/src/org/apache/cloudstack/api/user/hypervisor/command/ListHypervisorsCmd.java → api/src/org/apache/cloudstack/api/user/resource/command/ListHypervisorsCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.api.user.hypervisor.command;
package org.apache.cloudstack.api.user.resource.command;
import java.util.ArrayList;
import java.util.List;

8
client/tomcatconf/commands.properties.in
View File

@ -219,10 +219,10 @@ listEvents=org.apache.cloudstack.api.user.event.command.ListEventsCmd;15
listEventTypes=org.apache.cloudstack.api.user.event.command.ListEventTypesCmd;15
#### alerts commands
listAlerts=com.cloud.api.commands.ListAlertsCmd;3
listAlerts=org.apache.cloudstack.api.admin.resource.command.ListAlertsCmd;3
#### system capacity commands
listCapacity=com.cloud.api.commands.ListCapacityCmd;3
listCapacity=org.apache.cloudstack.api.admin.resource.command.ListCapacityCmd;3
#### swift commands^M
addSwift=org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd;1
@ -288,10 +288,10 @@ updateInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroup
listInstanceGroups=org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd;15
### Certificate commands
uploadCustomCertificate=com.cloud.api.commands.UploadCustomCertificateCmd;1
uploadCustomCertificate=org.apache.cloudstack.api.admin.resource.command.UploadCustomCertificateCmd;1
### other commands
listHypervisors=org.apache.cloudstack.api.user.hypervisor.command.ListHypervisorsCmd;15
listHypervisors=org.apache.cloudstack.api.user.resource.command.ListHypervisorsCmd;15
### VPN
createRemoteAccessVpn=org.apache.cloudstack.api.user.vpn.command.CreateRemoteAccessVpnCmd;15

6
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -44,6 +44,7 @@ import javax.crypto.spec.SecretKeySpec;
import org.apache.cloudstack.api.admin.cluster.command.ListClustersCmd;
import org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd;
import org.apache.cloudstack.api.admin.resource.command.ListAlertsCmd;
import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd;
import org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd;
import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;
@ -78,8 +79,7 @@ import org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd;
import org.apache.cloudstack.api.admin.systemvm.command.DestroySystemVmCmd;
import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd;
import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;
import com.cloud.api.commands.ListAlertsCmd;
import com.cloud.api.commands.ListCapacityCmd;
import org.apache.cloudstack.api.admin.resource.command.ListCapacityCmd;
import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
import org.apache.cloudstack.api.admin.host.command.ListHostsCmd;
import org.apache.cloudstack.api.admin.pod.command.ListPodsByCmd;
@ -96,7 +96,7 @@ import org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd;
import com.cloud.api.commands.UpdateTemplateOrIsoCmd;
import org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroupCmd;
import org.apache.cloudstack.api.admin.systemvm.command.UpgradeSystemVMCmd;
import com.cloud.api.commands.UploadCustomCertificateCmd;
import org.apache.cloudstack.api.admin.resource.command.UploadCustomCertificateCmd;
import com.cloud.api.response.ExtractResponse;
import com.cloud.api.view.vo.DomainRouterJoinVO;
import com.cloud.async.AsyncJob;