Skip to content

<fix>[compute]: first create of zone set default #2648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 5.4.0
Choose a base branch
from
Open

<fix>[compute]: first create of zone set default #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions compute/src/main/java/org/zstack/compute/zone/ZoneManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
import org.zstack.core.cloudbus.CloudBus;
import org.zstack.core.cloudbus.MessageSafe;
import org.zstack.core.componentloader.PluginRegistry;
import org.zstack.core.db.DatabaseFacade;
import org.zstack.core.db.DbEntityLister;
import org.zstack.core.db.SQL;
import org.zstack.core.db.SQLBatch;
import org.zstack.core.db.*;
import org.zstack.core.errorcode.ErrorFacade;
import org.zstack.core.thread.ChainTask;
import org.zstack.core.thread.SyncTaskChain;
Expand Down Expand Up @@ -160,6 +157,11 @@ protected void scripts() {
}

private void createZone(APICreateZoneMsg msg, ReturnValueCompletion<ZoneInventory> completion) {
Long existCount = Q.New(ZoneVO.class).count();
if (existCount == 0) {
msg.setDefault(true);
}

if (msg.getDefault() == null || !msg.getDefault()) {
completion.success(createZoneFromApiMessage(msg));
return;
Expand Down
11 changes: 11 additions & 0 deletions test/src/test/groovy/org/zstack/test/integration/compute/ZoneCase.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class ZoneCase extends SubCase {
@Override
void test() {
env.create {
testFirstZoneSetDefaultZone()
testCreateZoneAsDefaultZone()
testBatchCreateZoneAsDefaultZone()
testUpdateZoneToDefaultZone()
Expand All @@ -48,6 +49,16 @@ class ZoneCase extends SubCase {
env.delete()
}

void testFirstZoneSetDefaultZone() {
ZoneInventory zone = createZone {
name = "FirstZone"
description = "first zone"
} as ZoneInventory

assert zone != null
assert zone.isDefault
}

void testCreateZoneAsDefaultZone() {
ZoneInventory zone = createZone {
name = "zone1"
Expand Down