apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

api_refactor: move disk and service offering to admin pkg

Browse Source 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-06 10:53:42 -08:00
parent ecc8249365
commit 1f1ac79a6c
10 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/com/cloud/configuration/ConfigurationService.java
View File

@ -20,25 +20,24 @@ import java.util.List;
import javax.naming.NamingException;
import com.cloud.api.commands.CreateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.*;
import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
import com.cloud.api.commands.CreateServiceOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd;
import com.cloud.api.commands.CreateVlanIpRangeCmd;
import org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
import com.cloud.api.commands.DeleteDiskOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
import com.cloud.api.commands.DeletePodCmd;
import com.cloud.api.commands.DeleteServiceOfferingCmd;
import com.cloud.api.commands.DeleteVlanIpRangeCmd;
import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
import com.cloud.api.commands.LDAPConfigCmd;
import com.cloud.api.commands.LDAPRemoveCmd;
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;
import com.cloud.api.commands.UpdateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
import com.cloud.api.commands.UpdatePodCmd;
import com.cloud.api.commands.UpdateServiceOfferingCmd;
import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
import com.cloud.dc.DataCenter;
import com.cloud.dc.Pod;

2
api/src/com/cloud/api/commands/CreateDiskOfferingCmd.java → api/src/org/apache/cloudstack/api/admin/offering/command/CreateDiskOfferingCmd.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.offering.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/CreateServiceOfferingCmd.java → api/src/org/apache/cloudstack/api/admin/offering/command/CreateServiceOfferingCmd.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.offering.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java → api/src/org/apache/cloudstack/api/admin/offering/command/DeleteDiskOfferingCmd.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.offering.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java → api/src/org/apache/cloudstack/api/admin/offering/command/DeleteServiceOfferingCmd.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.offering.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java → api/src/org/apache/cloudstack/api/admin/offering/command/UpdateDiskOfferingCmd.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.offering.command;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.ApiConstants;

2
api/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java → api/src/org/apache/cloudstack/api/admin/offering/command/UpdateServiceOfferingCmd.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.offering.command;
import org.apache.log4j.Logger;

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

@ -107,15 +107,15 @@ listOsTypes=org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd;15
listOsCategories=org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;15
#### service offering commands
createServiceOffering=com.cloud.api.commands.CreateServiceOfferingCmd;1
deleteServiceOffering=com.cloud.api.commands.DeleteServiceOfferingCmd;1
updateServiceOffering=com.cloud.api.commands.UpdateServiceOfferingCmd;1
createServiceOffering=org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd;1
deleteServiceOffering=org.apache.cloudstack.api.admin.offering.command.DeleteServiceOfferingCmd;1
updateServiceOffering=org.apache.cloudstack.api.admin.offering.command.UpdateServiceOfferingCmd;1
listServiceOfferings=org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd;15
#### disk offering commands
createDiskOffering=com.cloud.api.commands.CreateDiskOfferingCmd;1
updateDiskOffering=com.cloud.api.commands.UpdateDiskOfferingCmd;1
deleteDiskOffering=com.cloud.api.commands.DeleteDiskOfferingCmd;1
createDiskOffering=org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd;1
updateDiskOffering=org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd;1
deleteDiskOffering=org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd;1
listDiskOfferings=org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd;15
#### vlan commands

12
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -41,6 +41,8 @@ import javax.naming.directory.InitialDirContext;
import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;
import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd;
import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
import org.apache.log4j.Logger;
@ -49,21 +51,19 @@ import com.cloud.acl.SecurityChecker;
import com.cloud.alert.AlertManager;
import org.apache.cloudstack.api.ApiConstants.LDAPParams;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.commands.CreateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
import com.cloud.api.commands.CreateServiceOfferingCmd;
import com.cloud.api.commands.CreateVlanIpRangeCmd;
import com.cloud.api.commands.DeleteDiskOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd;
import com.cloud.api.commands.DeletePodCmd;
import com.cloud.api.commands.DeleteServiceOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.DeleteServiceOfferingCmd;
import com.cloud.api.commands.DeleteVlanIpRangeCmd;
import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
import com.cloud.api.commands.LDAPConfigCmd;
import com.cloud.api.commands.LDAPRemoveCmd;
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
import com.cloud.api.commands.UpdateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd;
import com.cloud.api.commands.UpdatePodCmd;
import com.cloud.api.commands.UpdateServiceOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.UpdateServiceOfferingCmd;
import com.cloud.capacity.dao.CapacityDao;
import com.cloud.configuration.Resource.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;

12
server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
View File

@ -24,26 +24,26 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import javax.naming.NamingException;
import com.cloud.api.commands.CreateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;
import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
import com.cloud.api.commands.CreateServiceOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd;
import com.cloud.api.commands.CreateVlanIpRangeCmd;
import org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.UpdateServiceOfferingCmd;
import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
import com.cloud.api.commands.DeleteDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
import com.cloud.api.commands.DeletePodCmd;
import com.cloud.api.commands.DeleteServiceOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.DeleteServiceOfferingCmd;
import com.cloud.api.commands.DeleteVlanIpRangeCmd;
import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
import com.cloud.api.commands.LDAPConfigCmd;
import com.cloud.api.commands.LDAPRemoveCmd;
import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
import com.cloud.api.commands.UpdateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
import com.cloud.api.commands.UpdatePodCmd;
import com.cloud.api.commands.UpdateServiceOfferingCmd;
import com.cloud.configuration.Configuration;
import com.cloud.configuration.ConfigurationManager;
import com.cloud.configuration.ConfigurationService;