Skip to content

Commit 9ffd059

Browse files
committed
Adding support for VMLimit in AzureVMTemplateBuilder
1 parent 8c3169d commit 9ffd059

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.jenkins.tools.bom</groupId>
4646
<artifactId>bom-${jenkins.baseline}.x</artifactId>
47-
<version>4545.v56392b_7ca_7b_a_</version>
47+
<version>4570.v1b_c718dd3b_1e</version>
4848
<scope>import</scope>
4949
<type>pom</type>
5050
</dependency>
@@ -151,7 +151,7 @@
151151
<dependency>
152152
<groupId>com.puppycrawl.tools</groupId>
153153
<artifactId>checkstyle</artifactId>
154-
<version>10.21.4</version>
154+
<version>10.23.0</version>
155155
</dependency>
156156
</dependencies>
157157
<executions>

src/main/java/com/microsoft/azure/vmagent/builders/AzureVMTemplateBuilder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.microsoft.azure.vmagent.launcher.AzureInboundLauncher;
77
import com.microsoft.azure.vmagent.launcher.AzureSSHLauncher;
88
import com.microsoft.azure.vmagent.util.Constants;
9+
import com.microsoft.azure.vmagent.availability.NoAvailabilityRequired;
910

1011
public class AzureVMTemplateBuilder extends AzureVMTemplateFluent<AzureVMTemplateBuilder> {
1112

@@ -18,6 +19,7 @@ public AzureVMTemplateBuilder() {
1819
public AzureVMTemplateBuilder(AzureVMAgentTemplate template) {
1920
this.fluent = this;
2021
fluent.withName(template.getTemplateName());
22+
fluent.withMaxVirtualMachinesLimit(template.getMaxVirtualMachinesLimit());
2123
fluent.withDescription(template.getTemplateDesc());
2224
fluent.withLabels(template.getLabels());
2325
fluent.withLocation(template.getLocation());
@@ -52,6 +54,7 @@ public AzureVMTemplateBuilder(AzureVMTemplateFluent<?> fluent) {
5254
public AzureVMTemplateBuilder(AzureVMTemplateFluent<?> fluent, AzureVMAgentTemplate template) {
5355
this.fluent = fluent;
5456
fluent.withName(template.getTemplateName());
57+
fluent.withMaxVirtualMachinesLimit(template.getMaxVirtualMachinesLimit());
5558
fluent.withDescription(template.getTemplateDesc());
5659
fluent.withLabels(template.getLabels());
5760
fluent.withLocation(template.getLocation());
@@ -96,7 +99,7 @@ public AzureVMAgentTemplate build() {
9699
fluent.getDescription(),
97100
fluent.getLabels(),
98101
fluent.getLocation(),
99-
null,
102+
new NoAvailabilityRequired(),
100103
fluent.getVirtualMachineSize(),
101104
fluent.getStorageAccountNameReferenceType(),
102105
fluent.getStorageAccountType(),

src/main/java/com/microsoft/azure/vmagent/builders/AzureVMTemplateFluent.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
public class AzureVMTemplateFluent<T extends AzureVMTemplateFluent<T>> {
1414

15+
private int maxVirtualMachinesLimit;
16+
1517
private String name;
1618

1719
private String description;
@@ -57,6 +59,7 @@ public class AzureVMTemplateFluent<T extends AzureVMTemplateFluent<T>> {
5759
private List<AzureTagPair> cloudTags;
5860

5961
public AzureVMTemplateFluent() {
62+
maxVirtualMachinesLimit = 10;
6063
location = "Japan West";
6164
virtualMachineSize = "Standard_A0";
6265
storageAccountType = "Standard_LRS";
@@ -73,6 +76,11 @@ public AzureVMTemplateFluent() {
7376
}
7477

7578
//CHECKSTYLE:OFF
79+
public T withMaxVirtualMachinesLimit(int maxVirtualMachinesLimit) {
80+
this.maxVirtualMachinesLimit = maxVirtualMachinesLimit;
81+
return (T) this;
82+
}
83+
7684
public T withName(String name) {
7785
this.name = name;
7886
return (T) this;
@@ -208,6 +216,10 @@ public T withAdminCredential(String credentialsId) {
208216
}
209217
//CHECKSTYLE:ON
210218

219+
public int getMaxVirtualMachinesLimit() {
220+
return maxVirtualMachinesLimit;
221+
}
222+
211223
public String getName() {
212224
return name;
213225
}

0 commit comments

Comments
 (0)