Skip to content

Commit 01e49d9

Browse files
authored
Merge pull request #235 from vmware/jenkins_sync_22.1.6_vro
Auto updated assets for vro 22.1.6
2 parents 02c59c0 + 0e0bd70 commit 01e49d9

File tree

5 files changed

+135
-13
lines changed

5 files changed

+135
-13
lines changed

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/ControllerProperties.java

+43-3
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,10 @@ public class ControllerProperties extends AviRestResource {
330330
@JsonInclude(Include.NON_NULL)
331331
private List<Integer> sslCertificateExpiryWarningDays = null;
332332

333+
@JsonProperty("system_report_cleanup_interval")
334+
@JsonInclude(Include.NON_NULL)
335+
private Integer systemReportCleanupInterval = 60;
336+
333337
@JsonProperty("system_report_limit")
334338
@JsonInclude(Include.NON_NULL)
335339
private Integer systemReportLimit = 10;
@@ -2504,6 +2508,38 @@ public ControllerProperties addSslCertificateExpiryWarningDaysItem(Integer sslCe
25042508
}
25052509

25062510

2511+
/**
2512+
* This is the getter method this will return the attribute value.
2513+
* Time in minutes to wait between cleanup of systemreports.
2514+
* Allowed values are 15-300.
2515+
* Field introduced in 22.1.6.
2516+
* Unit is min.
2517+
* Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
2518+
* edition.
2519+
* Default value when not specified in API or module is interpreted by Avi Controller as 60.
2520+
* @return systemReportCleanupInterval
2521+
*/
2522+
@VsoMethod
2523+
public Integer getSystemReportCleanupInterval() {
2524+
return systemReportCleanupInterval;
2525+
}
2526+
2527+
/**
2528+
* This is the setter method to the attribute.
2529+
* Time in minutes to wait between cleanup of systemreports.
2530+
* Allowed values are 15-300.
2531+
* Field introduced in 22.1.6.
2532+
* Unit is min.
2533+
* Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
2534+
* edition.
2535+
* Default value when not specified in API or module is interpreted by Avi Controller as 60.
2536+
* @param systemReportCleanupInterval set the systemReportCleanupInterval.
2537+
*/
2538+
@VsoMethod
2539+
public void setSystemReportCleanupInterval(Integer systemReportCleanupInterval) {
2540+
this.systemReportCleanupInterval = systemReportCleanupInterval;
2541+
}
2542+
25072543
/**
25082544
* This is the getter method this will return the attribute value.
25092545
* Number of systemreports retained in the system.
@@ -2512,7 +2548,8 @@ public ControllerProperties addSslCertificateExpiryWarningDaysItem(Integer sslCe
25122548
* The systemreport will be rotated and the reports don't exceed the threshold.
25132549
* Allowed values are 5-50.
25142550
* Field introduced in 22.1.6.
2515-
* Allowed in enterprise edition with any value, enterprise with cloud services edition.
2551+
* Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
2552+
* edition.
25162553
* Default value when not specified in API or module is interpreted by Avi Controller as 10.
25172554
* @return systemReportLimit
25182555
*/
@@ -2529,7 +2566,8 @@ public Integer getSystemReportLimit() {
25292566
* The systemreport will be rotated and the reports don't exceed the threshold.
25302567
* Allowed values are 5-50.
25312568
* Field introduced in 22.1.6.
2532-
* Allowed in enterprise edition with any value, enterprise with cloud services edition.
2569+
* Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
2570+
* edition.
25332571
* Default value when not specified in API or module is interpreted by Avi Controller as 10.
25342572
* @param systemReportLimit set the systemReportLimit.
25352573
*/
@@ -3315,7 +3353,8 @@ public boolean equals(java.lang.Object o) {
33153353
Objects.equals(this.seupgradeCopyBufferSize, objControllerProperties.seupgradeCopyBufferSize)&&
33163354
Objects.equals(this.cloudReconcileInterval, objControllerProperties.cloudReconcileInterval)&&
33173355
Objects.equals(this.cloudDiscoveryInterval, objControllerProperties.cloudDiscoveryInterval)&&
3318-
Objects.equals(this.systemReportLimit, objControllerProperties.systemReportLimit);
3356+
Objects.equals(this.systemReportLimit, objControllerProperties.systemReportLimit)&&
3357+
Objects.equals(this.systemReportCleanupInterval, objControllerProperties.systemReportCleanupInterval);
33193358
}
33203359

33213360
@Override
@@ -3398,6 +3437,7 @@ public String toString() {
33983437
sb.append(" seupgradeSegroupMinDeadTimeout: ").append(toIndentedString(seupgradeSegroupMinDeadTimeout)).append("\n");
33993438
sb.append(" sharedSslCertificates: ").append(toIndentedString(sharedSslCertificates)).append("\n");
34003439
sb.append(" sslCertificateExpiryWarningDays: ").append(toIndentedString(sslCertificateExpiryWarningDays)).append("\n");
3440+
sb.append(" systemReportCleanupInterval: ").append(toIndentedString(systemReportCleanupInterval)).append("\n");
34013441
sb.append(" systemReportLimit: ").append(toIndentedString(systemReportLimit)).append("\n");
34023442
sb.append(" unresponsiveSeReboot: ").append(toIndentedString(unresponsiveSeReboot)).append("\n");
34033443
sb.append(" updateDnsEntryRetryLimit: ").append(toIndentedString(updateDnsEntryRetryLimit)).append("\n");

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/EventDetails.java

+34-1
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@
198198
import com.vmware.avi.vro.model.SwitchoverEventDetails;
199199
import com.vmware.avi.vro.model.SwitchoverFailEventDetails;
200200
import com.vmware.avi.vro.model.CloudSyncServices;
201+
import com.vmware.avi.vro.model.SystemReport;
201202
import com.vmware.avi.vro.model.TencentSetup;
202203
import com.vmware.avi.vro.model.RmUnbindVsSeEventDetails;
203204
import com.vmware.avi.vro.model.UpgradeOpsEntry;
@@ -1015,6 +1016,10 @@ public class EventDetails extends AviRestResource {
10151016
@JsonInclude(Include.NON_NULL)
10161017
private CloudSyncServices syncServicesInfo = null;
10171018

1019+
@JsonProperty("system_report_event_details")
1020+
@JsonInclude(Include.NON_NULL)
1021+
private SystemReport systemReportEventDetails = null;
1022+
10181023
@JsonProperty("tencent_info")
10191024
@JsonInclude(Include.NON_NULL)
10201025
private TencentSetup tencentInfo = null;
@@ -5487,6 +5492,32 @@ public void setSyncServicesInfo(CloudSyncServices syncServicesInfo) {
54875492
this.syncServicesInfo = syncServicesInfo;
54885493
}
54895494

5495+
/**
5496+
* This is the getter method this will return the attribute value.
5497+
* System report event details.
5498+
* Field introduced in 22.1.6.
5499+
* Allowed in enterprise edition with any value, enterprise with cloud services edition.
5500+
* Default value when not specified in API or module is interpreted by Avi Controller as null.
5501+
* @return systemReportEventDetails
5502+
*/
5503+
@VsoMethod
5504+
public SystemReport getSystemReportEventDetails() {
5505+
return systemReportEventDetails;
5506+
}
5507+
5508+
/**
5509+
* This is the setter method to the attribute.
5510+
* System report event details.
5511+
* Field introduced in 22.1.6.
5512+
* Allowed in enterprise edition with any value, enterprise with cloud services edition.
5513+
* Default value when not specified in API or module is interpreted by Avi Controller as null.
5514+
* @param systemReportEventDetails set the systemReportEventDetails.
5515+
*/
5516+
@VsoMethod
5517+
public void setSystemReportEventDetails(SystemReport systemReportEventDetails) {
5518+
this.systemReportEventDetails = systemReportEventDetails;
5519+
}
5520+
54905521
/**
54915522
* This is the getter method this will return the attribute value.
54925523
* Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
@@ -6312,7 +6343,8 @@ public boolean equals(java.lang.Object o) {
63126343
Objects.equals(this.databaseEventInfo, objEventDetails.databaseEventInfo)&&
63136344
Objects.equals(this.dnsQueryError, objEventDetails.dnsQueryError)&&
63146345
Objects.equals(this.connectionEvent, objEventDetails.connectionEvent)&&
6315-
Objects.equals(this.adaptreplEvent, objEventDetails.adaptreplEvent);
6346+
Objects.equals(this.adaptreplEvent, objEventDetails.adaptreplEvent)&&
6347+
Objects.equals(this.systemReportEventDetails, objEventDetails.systemReportEventDetails);
63166348
}
63176349

63186350
@Override
@@ -6512,6 +6544,7 @@ public String toString() {
65126544
sb.append(" switchoverDetails: ").append(toIndentedString(switchoverDetails)).append("\n");
65136545
sb.append(" switchoverFailDetails: ").append(toIndentedString(switchoverFailDetails)).append("\n");
65146546
sb.append(" syncServicesInfo: ").append(toIndentedString(syncServicesInfo)).append("\n");
6547+
sb.append(" systemReportEventDetails: ").append(toIndentedString(systemReportEventDetails)).append("\n");
65156548
sb.append(" tencentInfo: ").append(toIndentedString(tencentInfo)).append("\n");
65166549
sb.append(" unbindVsSeDetails: ").append(toIndentedString(unbindVsSeDetails)).append("\n");
65176550
sb.append(" upgradeEntry: ").append(toIndentedString(upgradeEntry)).append("\n");

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/MetricsDbDiskEventDetails.java

+17-6
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,17 @@ public class MetricsDbDiskEventDetails extends AviRestResource {
3030

3131
@JsonProperty("metrics_free_sz")
3232
@JsonInclude(Include.NON_NULL)
33-
private Integer metricsFreeSz = null;
33+
private Float metricsFreeSz = null;
3434

3535
@JsonProperty("metrics_quota")
3636
@JsonInclude(Include.NON_NULL)
37-
private Integer metricsQuota = null;
37+
private Float metricsQuota = null;
3838

3939

4040

4141
/**
4242
* This is the getter method this will return the attribute value.
43+
* List of dropped metrics tables.
4344
* Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
4445
* Default value when not specified in API or module is interpreted by Avi Controller as null.
4546
* @return metricsDeletedTables
@@ -51,6 +52,7 @@ public List<String> getMetricsDeletedTables() {
5152

5253
/**
5354
* This is the setter method. this will set the metricsDeletedTables
55+
* List of dropped metrics tables.
5456
* Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
5557
* Default value when not specified in API or module is interpreted by Avi Controller as null.
5658
* @return metricsDeletedTables
@@ -62,6 +64,7 @@ public void setMetricsDeletedTables(List<String> metricsDeletedTables) {
6264

6365
/**
6466
* This is the setter method this will set the metricsDeletedTables
67+
* List of dropped metrics tables.
6568
* Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
6669
* Default value when not specified in API or module is interpreted by Avi Controller as null.
6770
* @return metricsDeletedTables
@@ -78,45 +81,53 @@ public MetricsDbDiskEventDetails addMetricsDeletedTablesItem(String metricsDelet
7881

7982
/**
8083
* This is the getter method this will return the attribute value.
84+
* Total size of freed metrics tables.
85+
* In kbs.
8186
* Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
8287
* Default value when not specified in API or module is interpreted by Avi Controller as null.
8388
* @return metricsFreeSz
8489
*/
8590
@VsoMethod
86-
public Integer getMetricsFreeSz() {
91+
public Float getMetricsFreeSz() {
8792
return metricsFreeSz;
8893
}
8994

9095
/**
9196
* This is the setter method to the attribute.
97+
* Total size of freed metrics tables.
98+
* In kbs.
9299
* Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
93100
* Default value when not specified in API or module is interpreted by Avi Controller as null.
94101
* @param metricsFreeSz set the metricsFreeSz.
95102
*/
96103
@VsoMethod
97-
public void setMetricsFreeSz(Integer metricsFreeSz) {
104+
public void setMetricsFreeSz(Float metricsFreeSz) {
98105
this.metricsFreeSz = metricsFreeSz;
99106
}
100107

101108
/**
102109
* This is the getter method this will return the attribute value.
110+
* Disk quota allocated for metrics db.
111+
* In gbs.
103112
* Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
104113
* Default value when not specified in API or module is interpreted by Avi Controller as null.
105114
* @return metricsQuota
106115
*/
107116
@VsoMethod
108-
public Integer getMetricsQuota() {
117+
public Float getMetricsQuota() {
109118
return metricsQuota;
110119
}
111120

112121
/**
113122
* This is the setter method to the attribute.
123+
* Disk quota allocated for metrics db.
124+
* In gbs.
114125
* Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
115126
* Default value when not specified in API or module is interpreted by Avi Controller as null.
116127
* @param metricsQuota set the metricsQuota.
117128
*/
118129
@VsoMethod
119-
public void setMetricsQuota(Integer metricsQuota) {
130+
public void setMetricsQuota(Float metricsQuota) {
120131
this.metricsQuota = metricsQuota;
121132
}
122133

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/ServiceEngineGroup.java

+39-1
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,10 @@ public class ServiceEngineGroup extends AviRestResource {
710710
@JsonInclude(Include.NON_NULL)
711711
private String seBandwidthType = null;
712712

713+
@JsonProperty("se_debug_trace_sz")
714+
@JsonInclude(Include.NON_NULL)
715+
private Integer seDebugTraceSz = 8;
716+
713717
@JsonProperty("se_delayed_flow_delete")
714718
@JsonInclude(Include.NON_NULL)
715719
private Boolean seDelayedFlowDelete = true;
@@ -6028,6 +6032,38 @@ public void setSeBandwidthType(String seBandwidthType) {
60286032
this.seBandwidthType = seBandwidthType;
60296033
}
60306034

6035+
/**
6036+
* This is the getter method this will return the attribute value.
6037+
* Use to cap the size of debug ring min(se_debug_trace_sz, num_dispatcher_cores).
6038+
* Only applicable to > 8g systems.
6039+
* Requires se reboot.
6040+
* Allowed values are 1,2,4,8.
6041+
* Field introduced in 22.1.6.
6042+
* Allowed in enterprise edition with any value, enterprise with cloud services edition.
6043+
* Default value when not specified in API or module is interpreted by Avi Controller as 8.
6044+
* @return seDebugTraceSz
6045+
*/
6046+
@VsoMethod
6047+
public Integer getSeDebugTraceSz() {
6048+
return seDebugTraceSz;
6049+
}
6050+
6051+
/**
6052+
* This is the setter method to the attribute.
6053+
* Use to cap the size of debug ring min(se_debug_trace_sz, num_dispatcher_cores).
6054+
* Only applicable to > 8g systems.
6055+
* Requires se reboot.
6056+
* Allowed values are 1,2,4,8.
6057+
* Field introduced in 22.1.6.
6058+
* Allowed in enterprise edition with any value, enterprise with cloud services edition.
6059+
* Default value when not specified in API or module is interpreted by Avi Controller as 8.
6060+
* @param seDebugTraceSz set the seDebugTraceSz.
6061+
*/
6062+
@VsoMethod
6063+
public void setSeDebugTraceSz(Integer seDebugTraceSz) {
6064+
this.seDebugTraceSz = seDebugTraceSz;
6065+
}
6066+
60316067
/**
60326068
* This is the getter method this will return the attribute value.
60336069
* Delay the cleanup of flowtable entry.
@@ -9504,7 +9540,8 @@ public boolean equals(java.lang.Object o) {
95049540
Objects.equals(this.ntpSyncFailEvent, objServiceEngineGroup.ntpSyncFailEvent)&&
95059541
Objects.equals(this.ntpSyncStatusInterval, objServiceEngineGroup.ntpSyncStatusInterval)&&
95069542
Objects.equals(this.useDpUtilForScaleout, objServiceEngineGroup.useDpUtilForScaleout)&&
9507-
Objects.equals(this.replayVrfRoutesInterval, objServiceEngineGroup.replayVrfRoutesInterval);
9543+
Objects.equals(this.replayVrfRoutesInterval, objServiceEngineGroup.replayVrfRoutesInterval)&&
9544+
Objects.equals(this.seDebugTraceSz, objServiceEngineGroup.seDebugTraceSz);
95089545
}
95099546

95109547
@Override
@@ -9679,6 +9716,7 @@ public String toString() {
96799716
sb.append(" sdbPipelineSize: ").append(toIndentedString(sdbPipelineSize)).append("\n");
96809717
sb.append(" sdbScanCount: ").append(toIndentedString(sdbScanCount)).append("\n");
96819718
sb.append(" seBandwidthType: ").append(toIndentedString(seBandwidthType)).append("\n");
9719+
sb.append(" seDebugTraceSz: ").append(toIndentedString(seDebugTraceSz)).append("\n");
96829720
sb.append(" seDelayedFlowDelete: ").append(toIndentedString(seDelayedFlowDelete)).append("\n");
96839721
sb.append(" seDeprovisionDelay: ").append(toIndentedString(seDeprovisionDelay)).append("\n");
96849722
sb.append(" seDosProfile: ").append(toIndentedString(seDosProfile)).append("\n");

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/SystemReport.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public void setImageRef(String imageRef) {
234234

235235
/**
236236
* This is the getter method this will return the attribute value.
237-
* Name of the report dervied from operation in a readable format.
237+
* Name of the report derived from operation in a readable format.
238238
* Ex upgrade_system_1a5c.
239239
* Field introduced in 22.1.6.
240240
* Allowed in enterprise edition with any value, enterprise with cloud services edition.
@@ -248,7 +248,7 @@ public String getName() {
248248

249249
/**
250250
* This is the setter method to the attribute.
251-
* Name of the report dervied from operation in a readable format.
251+
* Name of the report derived from operation in a readable format.
252252
* Ex upgrade_system_1a5c.
253253
* Field introduced in 22.1.6.
254254
* Allowed in enterprise edition with any value, enterprise with cloud services edition.

0 commit comments

Comments
 (0)