Skip to content

Commit 02d36fa

Browse files
shwstpprshwstppr
authored
Merge branch '4.18' into fix-unmanagevm-resourcecount
2 parents 899ef66 + 4e7c668 commit 02d36fa

File tree

408 files changed

+6026
-10601
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

408 files changed

+6026
-10601
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v3
3131

3232
- name: Set up JDK 11
33-
uses: actions/setup-java@v3
33+
uses: actions/setup-java@v4
3434
with:
3535
java-version: '11'
3636
distribution: 'adopt'

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
- uses: actions/checkout@v3
194194

195195
- name: Set up JDK
196-
uses: actions/setup-java@v3
196+
uses: actions/setup-java@v4
197197
with:
198198
java-version: '11'
199199
distribution: 'adopt'

‎.github/workflows/codecov.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- uses: actions/checkout@v3
3636

3737
- name: Set up JDK11
38-
uses: actions/setup-java@v3
38+
uses: actions/setup-java@v4
3939
with:
4040
distribution: 'temurin'
4141
java-version: '11'
@@ -47,9 +47,11 @@ jobs:
4747
cd nonoss && bash -x install-non-oss.sh && cd ..
4848
mvn -P quality -Dsimulator -Dnoredist clean install -T$(nproc)
4949
50-
- uses: codecov/codecov-action@v3
50+
- uses: codecov/codecov-action@v4
5151
with:
5252
files: ./client/target/site/jacoco-aggregate/jacoco.xml
5353
fail_ci_if_error: true
54+
flags: unittests
5455
verbose: true
5556
name: codecov
57+
token: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/main-sonar-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
fetch-depth: 0
3434

3535
- name: Set up JDK11
36-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3737
with:
3838
distribution: 'temurin'
3939
java-version: '11'

‎.github/workflows/rat.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@v3
3131
- name: Set up JDK 11
32-
uses: actions/setup-java@v3
32+
uses: actions/setup-java@v4
3333
with:
3434
java-version: '11'
3535
distribution: 'adopt'

‎.github/workflows/sonar-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fetch-depth: 0
3939

4040
- name: Set up JDK11
41-
uses: actions/setup-java@v3
41+
uses: actions/setup-java@v4
4242
with:
4343
distribution: 'temurin'
4444
java-version: '11'

‎agent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
27-
<version>4.18.2.0-SNAPSHOT</version>
27+
<version>4.18.3.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
3030
<dependency>

‎agent/src/main/java/com/cloud/agent/properties/AgentProperties.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
*/
1515
package com.cloud.agent.properties;
1616

17+
import org.apache.cloudstack.utils.security.KeyStoreUtils;
18+
1719
/**
1820
* Class of constant agent's properties available to configure on
1921
* "agent.properties".
@@ -728,6 +730,13 @@ public Property<Integer> getWorkers() {
728730
*/
729731
public static final Property<String> CONTROL_CIDR = new Property<>("control.cidr", "169.254.0.0/16");
730732

733+
/**
734+
* Keystore passphrase
735+
* Data type: String.<br>
736+
* Default value: <code>null</code>
737+
*/
738+
public static final Property<String> KEYSTORE_PASSPHRASE = new Property<>(KeyStoreUtils.KS_PASSPHRASE_PROPERTY, null, String.class);
739+
731740
public static class Property <T>{
732741
private String name;
733742
private T defaultValue;

‎api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
27-
<version>4.18.2.0-SNAPSHOT</version>
27+
<version>4.18.3.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
3030
<dependency>

‎api/src/main/java/com/cloud/event/EventTypes.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.cloudstack.api.response.ZoneResponse;
3030
import org.apache.cloudstack.config.Configuration;
3131
import org.apache.cloudstack.ha.HAConfig;
32+
import org.apache.cloudstack.quota.QuotaTariff;
3233
import org.apache.cloudstack.usage.Usage;
3334

3435
import com.cloud.dc.DataCenter;
@@ -693,6 +694,11 @@ public class EventTypes {
693694
// SystemVM
694695
public static final String EVENT_LIVE_PATCH_SYSTEMVM = "LIVE.PATCH.SYSTEM.VM";
695696

697+
// Quota
698+
public static final String EVENT_QUOTA_TARIFF_CREATE = "QUOTA.TARIFF.CREATE";
699+
public static final String EVENT_QUOTA_TARIFF_DELETE = "QUOTA.TARIFF.DELETE";
700+
public static final String EVENT_QUOTA_TARIFF_UPDATE = "QUOTA.TARIFF.UPDATE";
701+
696702
static {
697703

698704
// TODO: need a way to force author adding event types to declare the entity details as well, with out braking
@@ -1118,6 +1124,11 @@ public class EventTypes {
11181124

11191125
entityEventDetails.put(EVENT_IMAGE_STORE_DATA_MIGRATE, ImageStore.class);
11201126
entityEventDetails.put(EVENT_LIVE_PATCH_SYSTEMVM, "SystemVMs");
1127+
1128+
// Quota
1129+
entityEventDetails.put(EVENT_QUOTA_TARIFF_CREATE, QuotaTariff.class);
1130+
entityEventDetails.put(EVENT_QUOTA_TARIFF_DELETE, QuotaTariff.class);
1131+
entityEventDetails.put(EVENT_QUOTA_TARIFF_UPDATE, QuotaTariff.class);
11211132
}
11221133

11231134
public static String getEntityForEvent(String eventName) {

0 commit comments

Comments
 (0)