apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 18:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

api_refactor: move zone apis to admin pkg

Browse Source 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-06 10:41:10 -08:00
parent 7f61d29c37
commit c3853677c5
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,13 +24,13 @@ import com.cloud.api.commands.CreateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
import com.cloud.api.commands.CreateServiceOfferingCmd; import com.cloud.api.commands.CreateServiceOfferingCmd;
import com.cloud.api.commands.CreateVlanIpRangeCmd; import com.cloud.api.commands.CreateVlanIpRangeCmd;
import com.cloud.api.commands.CreateZoneCmd; import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
import com.cloud.api.commands.DeleteDiskOfferingCmd; import com.cloud.api.commands.DeleteDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
import com.cloud.api.commands.DeletePodCmd; import com.cloud.api.commands.DeletePodCmd;
import com.cloud.api.commands.DeleteServiceOfferingCmd; import com.cloud.api.commands.DeleteServiceOfferingCmd;
import com.cloud.api.commands.DeleteVlanIpRangeCmd; import com.cloud.api.commands.DeleteVlanIpRangeCmd;
import com.cloud.api.commands.DeleteZoneCmd; import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
import com.cloud.api.commands.LDAPConfigCmd; import com.cloud.api.commands.LDAPConfigCmd;
import com.cloud.api.commands.LDAPRemoveCmd; import com.cloud.api.commands.LDAPRemoveCmd;
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
@ -39,7 +39,7 @@ import com.cloud.api.commands.UpdateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
import com.cloud.api.commands.UpdatePodCmd; import com.cloud.api.commands.UpdatePodCmd;
import com.cloud.api.commands.UpdateServiceOfferingCmd; import com.cloud.api.commands.UpdateServiceOfferingCmd;
import com.cloud.api.commands.UpdateZoneCmd; import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter;
import com.cloud.dc.Pod; import com.cloud.dc.Pod;
import com.cloud.dc.Vlan; import com.cloud.dc.Vlan;

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

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the // KIND, either express or implied. See the License for the
// specific language governing permissions and limitations // specific language governing permissions and limitations
// under the License. // under the License.
package com.cloud.api.commands; package org.apache.cloudstack.api.admin.zone.command;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;

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

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the // KIND, either express or implied. See the License for the
// specific language governing permissions and limitations // specific language governing permissions and limitations
// under the License. // under the License.
package com.cloud.api.commands; package org.apache.cloudstack.api.admin.zone.command;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;

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

@ -15,7 +15,7 @@
// specific language governing permissions and limitations // specific language governing permissions and limitations
// under the License. // under the License.
package com.cloud.api.commands; package org.apache.cloudstack.api.admin.zone.command;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;

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

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the // KIND, either express or implied. See the License for the
// specific language governing permissions and limitations // specific language governing permissions and limitations
// under the License. // under the License.
package com.cloud.api.commands; package org.apache.cloudstack.api.admin.zone.command;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

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

@ -26,7 +26,7 @@ disableAccount=org.apache.cloudstack.api.admin.account.command.DisableAccountCmd
enableAccount=org.apache.cloudstack.api.admin.account.command.EnableAccountCmd;7 enableAccount=org.apache.cloudstack.api.admin.account.command.EnableAccountCmd;7
###lockAccount=com.cloud.api.commands.LockAccountCmd;7 ###lockAccount=com.cloud.api.commands.LockAccountCmd;7
listAccounts=org.apache.cloudstack.api.user.account.command.ListAccountsCmd;15 listAccounts=org.apache.cloudstack.api.user.account.command.ListAccountsCmd;15
markDefaultZoneForAccount=com.cloud.api.commands.MarkDefaultZoneForAccountCmd;1 markDefaultZoneForAccount=org.apache.cloudstack.api.admin.zone.command.MarkDefaultZoneForAccountCmd;1
#### User commands #### User commands
createUser=org.apache.cloudstack.api.admin.user.command.CreateUserCmd;3 createUser=org.apache.cloudstack.api.admin.user.command.CreateUserCmd;3
@ -209,9 +209,9 @@ deletePod=com.cloud.api.commands.DeletePodCmd;1
listPods=com.cloud.api.commands.ListPodsByCmd;3 listPods=com.cloud.api.commands.ListPodsByCmd;3
#### zone commands #### zone commands
createZone=com.cloud.api.commands.CreateZoneCmd;1 createZone=org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;1
updateZone=com.cloud.api.commands.UpdateZoneCmd;1 updateZone=org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;1
deleteZone=com.cloud.api.commands.DeleteZoneCmd;1 deleteZone=org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;1
listZones=org.apache.cloudstack.api.user.zone.command.ListZonesByCmd;15 listZones=org.apache.cloudstack.api.user.zone.command.ListZonesByCmd;15
#### events commands #### events commands

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

@ -40,6 +40,8 @@ import javax.naming.directory.InitialDirContext;
import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import com.cloud.acl.SecurityChecker; import com.cloud.acl.SecurityChecker;
@ -50,12 +52,11 @@ import com.cloud.api.commands.CreateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
import com.cloud.api.commands.CreateServiceOfferingCmd; import com.cloud.api.commands.CreateServiceOfferingCmd;
import com.cloud.api.commands.CreateVlanIpRangeCmd; import com.cloud.api.commands.CreateVlanIpRangeCmd;
import com.cloud.api.commands.CreateZoneCmd;
import com.cloud.api.commands.DeleteDiskOfferingCmd; import com.cloud.api.commands.DeleteDiskOfferingCmd;
import com.cloud.api.commands.DeletePodCmd; import com.cloud.api.commands.DeletePodCmd;
import com.cloud.api.commands.DeleteServiceOfferingCmd; import com.cloud.api.commands.DeleteServiceOfferingCmd;
import com.cloud.api.commands.DeleteVlanIpRangeCmd; import com.cloud.api.commands.DeleteVlanIpRangeCmd;
import com.cloud.api.commands.DeleteZoneCmd; import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
import com.cloud.api.commands.LDAPConfigCmd; import com.cloud.api.commands.LDAPConfigCmd;
import com.cloud.api.commands.LDAPRemoveCmd; import com.cloud.api.commands.LDAPRemoveCmd;
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
@ -63,7 +64,6 @@ import com.cloud.api.commands.UpdateCfgCmd;
import com.cloud.api.commands.UpdateDiskOfferingCmd; import com.cloud.api.commands.UpdateDiskOfferingCmd;
import com.cloud.api.commands.UpdatePodCmd; import com.cloud.api.commands.UpdatePodCmd;
import com.cloud.api.commands.UpdateServiceOfferingCmd; import com.cloud.api.commands.UpdateServiceOfferingCmd;
import com.cloud.api.commands.UpdateZoneCmd;
import com.cloud.capacity.dao.CapacityDao; import com.cloud.capacity.dao.CapacityDao;
import com.cloud.configuration.Resource.ResourceType; import com.cloud.configuration.Resource.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.configuration.dao.ConfigurationDao;

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

@ -28,22 +28,22 @@ import com.cloud.api.commands.CreateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
import com.cloud.api.commands.CreateServiceOfferingCmd; import com.cloud.api.commands.CreateServiceOfferingCmd;
import com.cloud.api.commands.CreateVlanIpRangeCmd; import com.cloud.api.commands.CreateVlanIpRangeCmd;
import com.cloud.api.commands.CreateZoneCmd; import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
import com.cloud.api.commands.DeleteDiskOfferingCmd; import com.cloud.api.commands.DeleteDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
import com.cloud.api.commands.DeletePodCmd; import com.cloud.api.commands.DeletePodCmd;
import com.cloud.api.commands.DeleteServiceOfferingCmd; import com.cloud.api.commands.DeleteServiceOfferingCmd;
import com.cloud.api.commands.DeleteVlanIpRangeCmd; import com.cloud.api.commands.DeleteVlanIpRangeCmd;
import com.cloud.api.commands.DeleteZoneCmd; import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
import com.cloud.api.commands.LDAPConfigCmd; import com.cloud.api.commands.LDAPConfigCmd;
import com.cloud.api.commands.LDAPRemoveCmd; 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 org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
import com.cloud.api.commands.UpdateCfgCmd; import com.cloud.api.commands.UpdateCfgCmd;
import com.cloud.api.commands.UpdateDiskOfferingCmd; import com.cloud.api.commands.UpdateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
import com.cloud.api.commands.UpdatePodCmd; import com.cloud.api.commands.UpdatePodCmd;
import com.cloud.api.commands.UpdateServiceOfferingCmd; import com.cloud.api.commands.UpdateServiceOfferingCmd;
import com.cloud.api.commands.UpdateZoneCmd;
import com.cloud.configuration.Configuration; import com.cloud.configuration.Configuration;
import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ConfigurationManager;
import com.cloud.configuration.ConfigurationService; import com.cloud.configuration.ConfigurationService;