Skip to content

Commit adc816b

Browse files
author
gitlab
committed
Merge branch 'zwatchbugfixes-all@@2' into 'master'
Zwatchbugfixes all@@2 See merge request zstackio/zstack!2398
2 parents 3ba1b4c + 6727651 commit adc816b

16 files changed

Lines changed: 560 additions & 10 deletions

‎conf/springConfigXml/AccountManager.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<bean id="AccountManager" class="org.zstack.identity.AccountManagerImpl">
1616
<zstack:plugin>
17-
<zstack:extension interface="org.zstack.header.Component"/>
17+
<zstack:extension interface="org.zstack.header.Component" order="9001"/>
1818
<zstack:extension interface="org.zstack.header.Service"/>
1919
<zstack:extension interface="org.zstack.header.managementnode.PrepareDbInitialValueExtensionPoint" order="9999"/>
2020
<zstack:extension interface="org.zstack.core.db.SoftDeleteEntityExtensionPoint"/>

‎core/src/main/java/org/zstack/core/CoreGlobalProperty.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class CoreGlobalProperty {
4444
public static boolean SHADOW_ENTITY_ON;
4545
@GlobalProperty(name = "consoleProxyPort", defaultValue = "4900")
4646
public static int CONSOLE_PROXY_PORT;
47-
@GlobalProperty(name = "dataDir", defaultValue = "/var/lib/zstack")
47+
@GlobalProperty(name = "dataDir", defaultValue = "/var/lib/zstack/")
4848
public static String DATA_DIR;
4949
@GlobalProperty(name = "logDir", defaultValue = "{catalina.home}/logs/")
5050
public static String LOG_DIR;

‎core/src/main/java/org/zstack/core/db/SQLBatchWithReturn.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@ protected <K> K persist(K k) {
3737
}
3838

3939
protected <K> K merge(K k) {
40-
databaseFacade.getEntityManager().merge(k);
41-
return k;
40+
return databaseFacade.getEntityManager().merge(k);
4241
}
4342

4443
protected void remove(Object k) {
45-
databaseFacade.getEntityManager().remove(k);
44+
databaseFacade.getEntityManager().remove(merge(k));
4645
}
4746

4847
protected void flush() {

‎header/src/main/java/org/zstack/header/PackageAPIInfo.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
@Retention(RetentionPolicy.RUNTIME)
1010
public @interface PackageAPIInfo {
1111
String APICategoryName() default "";
12+
boolean communityAvailable() default true;
1213
}

‎sdk/src/main/java/org/zstack/sdk/zwatch/alarm/AddActionToEventSubscriptionAction.java‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
package org.zstack.sdk.zwatch.alarm;
2+
3+
import java.util.HashMap;
4+
import java.util.Map;
5+
import org.zstack.sdk.*;
6+
7+
public class AddActionToEventSubscriptionAction extends AbstractAction {
8+
9+
private static final HashMap<String, Parameter> parameterMap = new HashMap<>();
10+
11+
private static final HashMap<String, Parameter> nonAPIParameterMap = new HashMap<>();
12+
13+
public static class Result {
14+
public ErrorCode error;
15+
public org.zstack.sdk.zwatch.alarm.AddActionToEventSubscriptionResult value;
16+
17+
public Result throwExceptionIfError() {
18+
if (error != null) {
19+
throw new ApiException(
20+
String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details)
21+
);
22+
}
23+
24+
return this;
25+
}
26+
}
27+
28+
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
29+
public java.lang.String subscriptionUuid;
30+
31+
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
32+
public java.lang.String actionUuid;
33+
34+
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
35+
public java.lang.String actionType;
36+
37+
@Param(required = false)
38+
public java.util.List systemTags;
39+
40+
@Param(required = false)
41+
public java.util.List userTags;
42+
43+
@Param(required = true)
44+
public String sessionId;
45+
46+
@NonAPIParam
47+
public long timeout = -1;
48+
49+
@NonAPIParam
50+
public long pollingInterval = -1;
51+
52+
53+
private Result makeResult(ApiResult res) {
54+
Result ret = new Result();
55+
if (res.error != null) {
56+
ret.error = res.error;
57+
return ret;
58+
}
59+
60+
org.zstack.sdk.zwatch.alarm.AddActionToEventSubscriptionResult value = res.getResult(org.zstack.sdk.zwatch.alarm.AddActionToEventSubscriptionResult.class);
61+
ret.value = value == null ? new org.zstack.sdk.zwatch.alarm.AddActionToEventSubscriptionResult() : value;
62+
63+
return ret;
64+
}
65+
66+
public Result call() {
67+
ApiResult res = ZSClient.call(this);
68+
return makeResult(res);
69+
}
70+
71+
public void call(final Completion<Result> completion) {
72+
ZSClient.call(this, new InternalCompletion() {
73+
@Override
74+
public void complete(ApiResult res) {
75+
completion.complete(makeResult(res));
76+
}
77+
});
78+
}
79+
80+
protected Map<String, Parameter> getParameterMap() {
81+
return parameterMap;
82+
}
83+
84+
protected Map<String, Parameter> getNonAPIParameterMap() {
85+
return nonAPIParameterMap;
86+
}
87+
88+
protected RestInfo getRestInfo() {
89+
RestInfo info = new RestInfo();
90+
info.httpMethod = "POST";
91+
info.path = "/zwatch/events/subscriptions/{subscriptionUuid}/actions";
92+
info.needSession = true;
93+
info.needPoll = true;
94+
info.parameterName = "params";
95+
return info;
96+
}
97+
98+
}

‎sdk/src/main/java/org/zstack/sdk/zwatch/alarm/AddActionToEventSubscriptionResult.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package org.zstack.sdk.zwatch.alarm;
2+
3+
import org.zstack.sdk.zwatch.alarm.EventSubscriptionInventory;
4+
5+
public class AddActionToEventSubscriptionResult {
6+
public EventSubscriptionInventory inventory;
7+
public void setInventory(EventSubscriptionInventory inventory) {
8+
this.inventory = inventory;
9+
}
10+
public EventSubscriptionInventory getInventory() {
11+
return this.inventory;
12+
}
13+
14+
}

‎sdk/src/main/java/org/zstack/sdk/zwatch/alarm/AddLabelToAlarmResult.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.zstack.sdk.zwatch.alarm;
22

3-
import org.zstack.sdk.zwatch.alarm.AlarmInventory;
3+
import org.zstack.sdk.zwatch.alarm.AlarmLabelInventory;
44

55
public class AddLabelToAlarmResult {
6-
public AlarmInventory inventory;
7-
public void setInventory(AlarmInventory inventory) {
6+
public AlarmLabelInventory inventory;
7+
public void setInventory(AlarmLabelInventory inventory) {
88
this.inventory = inventory;
99
}
10-
public AlarmInventory getInventory() {
10+
public AlarmLabelInventory getInventory() {
1111
return this.inventory;
1212
}
1313

‎sdk/src/main/java/org/zstack/sdk/zwatch/alarm/AddLabelToEventSubscriptionAction.java‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
package org.zstack.sdk.zwatch.alarm;
2+
3+
import java.util.HashMap;
4+
import java.util.Map;
5+
import org.zstack.sdk.*;
6+
7+
public class AddLabelToEventSubscriptionAction extends AbstractAction {
8+
9+
private static final HashMap<String, Parameter> parameterMap = new HashMap<>();
10+
11+
private static final HashMap<String, Parameter> nonAPIParameterMap = new HashMap<>();
12+
13+
public static class Result {
14+
public ErrorCode error;
15+
public org.zstack.sdk.zwatch.alarm.AddLabelToEventSubscriptionResult value;
16+
17+
public Result throwExceptionIfError() {
18+
if (error != null) {
19+
throw new ApiException(
20+
String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details)
21+
);
22+
}
23+
24+
return this;
25+
}
26+
}
27+
28+
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
29+
public java.lang.String subscriptionUuid;
30+
31+
@Param(required = true, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
32+
public java.lang.String key;
33+
34+
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
35+
public java.lang.String value;
36+
37+
@Param(required = true, validValues = {"Regex","Equal"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
38+
public java.lang.String operator;
39+
40+
@Param(required = false)
41+
public java.lang.String resourceUuid;
42+
43+
@Param(required = false)
44+
public java.util.List systemTags;
45+
46+
@Param(required = false)
47+
public java.util.List userTags;
48+
49+
@Param(required = true)
50+
public String sessionId;
51+
52+
@NonAPIParam
53+
public long timeout = -1;
54+
55+
@NonAPIParam
56+
public long pollingInterval = -1;
57+
58+
59+
private Result makeResult(ApiResult res) {
60+
Result ret = new Result();
61+
if (res.error != null) {
62+
ret.error = res.error;
63+
return ret;
64+
}
65+
66+
org.zstack.sdk.zwatch.alarm.AddLabelToEventSubscriptionResult value = res.getResult(org.zstack.sdk.zwatch.alarm.AddLabelToEventSubscriptionResult.class);
67+
ret.value = value == null ? new org.zstack.sdk.zwatch.alarm.AddLabelToEventSubscriptionResult() : value;
68+
69+
return ret;
70+
}
71+
72+
public Result call() {
73+
ApiResult res = ZSClient.call(this);
74+
return makeResult(res);
75+
}
76+
77+
public void call(final Completion<Result> completion) {
78+
ZSClient.call(this, new InternalCompletion() {
79+
@Override
80+
public void complete(ApiResult res) {
81+
completion.complete(makeResult(res));
82+
}
83+
});
84+
}
85+
86+
protected Map<String, Parameter> getParameterMap() {
87+
return parameterMap;
88+
}
89+
90+
protected Map<String, Parameter> getNonAPIParameterMap() {
91+
return nonAPIParameterMap;
92+
}
93+
94+
protected RestInfo getRestInfo() {
95+
RestInfo info = new RestInfo();
96+
info.httpMethod = "POST";
97+
info.path = "/zwatch/events/subscriptions/{subscriptionUuid}/labels";
98+
info.needSession = true;
99+
info.needPoll = true;
100+
info.parameterName = "params";
101+
return info;
102+
}
103+
104+
}

‎sdk/src/main/java/org/zstack/sdk/zwatch/alarm/AddLabelToEventSubscriptionResult.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package org.zstack.sdk.zwatch.alarm;
2+
3+
import org.zstack.sdk.zwatch.alarm.EventSubscriptionLabelInventory;
4+
5+
public class AddLabelToEventSubscriptionResult {
6+
public EventSubscriptionLabelInventory inventory;
7+
public void setInventory(EventSubscriptionLabelInventory inventory) {
8+
this.inventory = inventory;
9+
}
10+
public EventSubscriptionLabelInventory getInventory() {
11+
return this.inventory;
12+
}
13+
14+
}

‎sdk/src/main/java/org/zstack/sdk/zwatch/alarm/EventSubscriptionLabelInventory.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
public class EventSubscriptionLabelInventory {
66

7+
public java.lang.String uuid;
8+
public void setUuid(java.lang.String uuid) {
9+
this.uuid = uuid;
10+
}
11+
public java.lang.String getUuid() {
12+
return this.uuid;
13+
}
14+
715
public java.lang.String key;
816
public void setKey(java.lang.String key) {
917
this.key = key;

0 commit comments

Comments
 (0)