Skip to content

Commit c385367

Browse files
yadvryadvr
committed
api_refactor: move zone apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
1 parent 7f61d29 commit c385367

8 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎api/src/com/cloud/configuration/ConfigurationService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
2525
import com.cloud.api.commands.CreateServiceOfferingCmd;
2626
import com.cloud.api.commands.CreateVlanIpRangeCmd;
27-
import com.cloud.api.commands.CreateZoneCmd;
27+
import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
2828
import com.cloud.api.commands.DeleteDiskOfferingCmd;
2929
import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
3030
import com.cloud.api.commands.DeletePodCmd;
3131
import com.cloud.api.commands.DeleteServiceOfferingCmd;
3232
import com.cloud.api.commands.DeleteVlanIpRangeCmd;
33-
import com.cloud.api.commands.DeleteZoneCmd;
33+
import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
3434
import com.cloud.api.commands.LDAPConfigCmd;
3535
import com.cloud.api.commands.LDAPRemoveCmd;
3636
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
@@ -39,7 +39,7 @@
3939
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
4040
import com.cloud.api.commands.UpdatePodCmd;
4141
import com.cloud.api.commands.UpdateServiceOfferingCmd;
42-
import com.cloud.api.commands.UpdateZoneCmd;
42+
import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
4343
import com.cloud.dc.DataCenter;
4444
import com.cloud.dc.Pod;
4545
import com.cloud.dc.Vlan;

api/src/com/cloud/api/commands/CreateZoneCmd.java renamed to api/src/org/apache/cloudstack/api/admin/zone/command/CreateZoneCmd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package com.cloud.api.commands;
17+
package org.apache.cloudstack.api.admin.zone.command;
1818

1919
import org.apache.log4j.Logger;
2020

api/src/com/cloud/api/commands/DeleteZoneCmd.java renamed to api/src/org/apache/cloudstack/api/admin/zone/command/DeleteZoneCmd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package com.cloud.api.commands;
17+
package org.apache.cloudstack.api.admin.zone.command;
1818

1919
import org.apache.log4j.Logger;
2020

api/src/com/cloud/api/commands/MarkDefaultZoneForAccountCmd.java renamed to api/src/org/apache/cloudstack/api/admin/zone/command/MarkDefaultZoneForAccountCmd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package com.cloud.api.commands;
18+
package org.apache.cloudstack.api.admin.zone.command;
1919

2020
import org.apache.log4j.Logger;
2121

api/src/com/cloud/api/commands/UpdateZoneCmd.java renamed to api/src/org/apache/cloudstack/api/admin/zone/command/UpdateZoneCmd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package com.cloud.api.commands;
17+
package org.apache.cloudstack.api.admin.zone.command;
1818

1919
import java.util.List;
2020
import java.util.Map;

‎client/tomcatconf/commands.properties.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ disableAccount=org.apache.cloudstack.api.admin.account.command.DisableAccountCmd
2626
enableAccount=org.apache.cloudstack.api.admin.account.command.EnableAccountCmd;7
2727
###lockAccount=com.cloud.api.commands.LockAccountCmd;7
2828
listAccounts=org.apache.cloudstack.api.user.account.command.ListAccountsCmd;15
29-
markDefaultZoneForAccount=com.cloud.api.commands.MarkDefaultZoneForAccountCmd;1
29+
markDefaultZoneForAccount=org.apache.cloudstack.api.admin.zone.command.MarkDefaultZoneForAccountCmd;1
3030

3131
#### User commands
3232
createUser=org.apache.cloudstack.api.admin.user.command.CreateUserCmd;3
@@ -209,9 +209,9 @@ deletePod=com.cloud.api.commands.DeletePodCmd;1
209209
listPods=com.cloud.api.commands.ListPodsByCmd;3
210210

211211
#### zone commands
212-
createZone=com.cloud.api.commands.CreateZoneCmd;1
213-
updateZone=com.cloud.api.commands.UpdateZoneCmd;1
214-
deleteZone=com.cloud.api.commands.DeleteZoneCmd;1
212+
createZone=org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;1
213+
updateZone=org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;1
214+
deleteZone=org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;1
215215
listZones=org.apache.cloudstack.api.user.zone.command.ListZonesByCmd;15
216216

217217
#### events commands

‎server/src/com/cloud/configuration/ConfigurationManagerImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040

4141
import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
4242
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
43+
import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
44+
import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
4345
import org.apache.log4j.Logger;
4446

4547
import com.cloud.acl.SecurityChecker;
@@ -50,20 +52,18 @@
5052
import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
5153
import com.cloud.api.commands.CreateServiceOfferingCmd;
5254
import com.cloud.api.commands.CreateVlanIpRangeCmd;
53-
import com.cloud.api.commands.CreateZoneCmd;
5455
import com.cloud.api.commands.DeleteDiskOfferingCmd;
5556
import com.cloud.api.commands.DeletePodCmd;
5657
import com.cloud.api.commands.DeleteServiceOfferingCmd;
5758
import com.cloud.api.commands.DeleteVlanIpRangeCmd;
58-
import com.cloud.api.commands.DeleteZoneCmd;
59+
import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
5960
import com.cloud.api.commands.LDAPConfigCmd;
6061
import com.cloud.api.commands.LDAPRemoveCmd;
6162
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
6263
import com.cloud.api.commands.UpdateCfgCmd;
6364
import com.cloud.api.commands.UpdateDiskOfferingCmd;
6465
import com.cloud.api.commands.UpdatePodCmd;
6566
import com.cloud.api.commands.UpdateServiceOfferingCmd;
66-
import com.cloud.api.commands.UpdateZoneCmd;
6767
import com.cloud.capacity.dao.CapacityDao;
6868
import com.cloud.configuration.Resource.ResourceType;
6969
import com.cloud.configuration.dao.ConfigurationDao;

‎server/test/com/cloud/vpc/MockConfigurationManagerImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
2929
import com.cloud.api.commands.CreateServiceOfferingCmd;
3030
import com.cloud.api.commands.CreateVlanIpRangeCmd;
31-
import com.cloud.api.commands.CreateZoneCmd;
31+
import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
3232
import com.cloud.api.commands.DeleteDiskOfferingCmd;
3333
import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
3434
import com.cloud.api.commands.DeletePodCmd;
3535
import com.cloud.api.commands.DeleteServiceOfferingCmd;
3636
import com.cloud.api.commands.DeleteVlanIpRangeCmd;
37-
import com.cloud.api.commands.DeleteZoneCmd;
37+
import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
3838
import com.cloud.api.commands.LDAPConfigCmd;
3939
import com.cloud.api.commands.LDAPRemoveCmd;
40+
import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
4041
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
4142
import com.cloud.api.commands.UpdateCfgCmd;
4243
import com.cloud.api.commands.UpdateDiskOfferingCmd;
4344
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
4445
import com.cloud.api.commands.UpdatePodCmd;
4546
import com.cloud.api.commands.UpdateServiceOfferingCmd;
46-
import com.cloud.api.commands.UpdateZoneCmd;
4747
import com.cloud.configuration.Configuration;
4848
import com.cloud.configuration.ConfigurationManager;
4949
import com.cloud.configuration.ConfigurationService;

0 commit comments

Comments
 (0)