Explorar el Código

Fix tests for new enterprise operation mode (#52113)

Randomized tests for licenses need to be updated to correctly
build enterprise license type.
Yang Wang hace 5 años
padre
commit
de7b915567

+ 9 - 8
x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollectorTests.java

@@ -162,14 +162,15 @@ public class ClusterStatsCollectorTests extends BaseCollectorTestCase {
         final MonitoringDoc.Node node = MonitoringTestUtils.randomMonitoringNode(random());
 
         final License license = License.builder()
-                                        .uid(UUID.randomUUID().toString())
-                                        .type(mode.name().toLowerCase(Locale.ROOT))
-                                        .issuer("elasticsearch")
-                                        .issuedTo("elastic")
-                                        .issueDate(System.currentTimeMillis())
-                                        .expiryDate(System.currentTimeMillis() + TimeValue.timeValueHours(24L).getMillis())
-                                        .maxNodes(2)
-                                        .build();
+                .uid(UUID.randomUUID().toString())
+                .type(mode.name().toLowerCase(Locale.ROOT))
+                .issuer("elasticsearch")
+                .issuedTo("elastic")
+                .issueDate(System.currentTimeMillis())
+                .expiryDate(System.currentTimeMillis() + TimeValue.timeValueHours(24L).getMillis())
+                .maxNodes(License.OperationMode.ENTERPRISE == mode ? -1 : randomIntBetween(1, 10))
+                .maxResourceUnits(License.OperationMode.ENTERPRISE == mode ? randomIntBetween(10, 99) : -1)
+                .build();
         when(licenseService.getLicense()).thenReturn(license);
 
         final ClusterStatsResponse mockClusterStatsResponse = mock(ClusterStatsResponse.class);

+ 4 - 2
x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java

@@ -94,14 +94,16 @@ public class ClusterStatsMonitoringDocTests extends BaseMonitoringDocTestCase<Cl
         usages = emptyList();
         clusterStats = mock(ClusterStatsResponse.class);
         clusterState = mock(ClusterState.class);
+        final License.OperationMode operationMode = randomFrom(License.OperationMode.values());
         license = License.builder()
                          .uid(randomAlphaOfLength(5))
-                         .type(randomFrom(License.OperationMode.values()).name())
+                         .type(operationMode.name().toLowerCase(Locale.ROOT))
                          .issuer(randomAlphaOfLength(5))
                          .issuedTo(randomAlphaOfLength(5))
                          .issueDate(timestamp)
                          .expiryDate(timestamp + randomIntBetween(1, 10) * 1_000L)
-                         .maxNodes(randomIntBetween(1, 5))
+                         .maxNodes(License.OperationMode.ENTERPRISE == operationMode ? -1 : randomIntBetween(1, 5))
+                         .maxResourceUnits(License.OperationMode.ENTERPRISE == operationMode ? randomIntBetween(1, 42) : -1)
                          .build();
 
         final DiscoveryNode masterNode = masterNode();