Skip to content

Commit 0617626

Browse files
authored
Fix incorrect model for cluster stats (#5361)
1 parent fc841a0 commit 0617626

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ public class ClusterNodesStats
4242

4343
[DataMember(Name = "ingest")]
4444
public ClusterIngestStats Ingest { get; internal set; }
45-
46-
[DataMember(Name = "architectures")]
47-
public IReadOnlyCollection<ArchitectureStats> Architectures { get; internal set; }
4845
}
4946

5047
public class NodePackagingType
@@ -180,6 +177,9 @@ public class ClusterOperatingSystemStats
180177

181178
[DataMember(Name = "pretty_names")]
182179
public IReadOnlyCollection<ClusterOperatingSystemPrettyNane> PrettyNames { get; internal set; }
180+
181+
[DataMember(Name = "architectures")]
182+
public IReadOnlyCollection<ArchitectureStats> Architectures { get; internal set; }
183183
}
184184

185185
[DataContract]

tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,14 @@ protected void Assert(ClusterNodesStats nodes)
7373
nodes.OperatingSystem.AvailableProcessors.Should().BeGreaterThan(0);
7474
nodes.OperatingSystem.AllocatedProcessors.Should().BeGreaterThan(0);
7575

76+
if (Cluster.ClusterConfiguration.Version.InRange(">=7.12.0"))
77+
{
78+
nodes.OperatingSystem.Architectures.Should().NotBeNull();
79+
nodes.OperatingSystem.Architectures.Count.Should().BeGreaterThan(0);
80+
nodes.OperatingSystem.Architectures.First().Architecture.Should().NotBeNullOrEmpty();
81+
nodes.OperatingSystem.Architectures.First().Count.Should().BeGreaterThan(0);
82+
}
83+
7684
nodes.OperatingSystem.Names.Should().NotBeEmpty();
7785

7886
if (Cluster.ClusterConfiguration.Version >= "6.8.0")
@@ -100,14 +108,6 @@ protected void Assert(ClusterNodesStats nodes)
100108

101109
if (Cluster.ClusterConfiguration.Version >= "7.6.0")
102110
nodes.Ingest.Should().NotBeNull();
103-
104-
if (Cluster.ClusterConfiguration.Version >= "7.12.0")
105-
{
106-
nodes.Architectures.Should().NotBeNull();
107-
nodes.Architectures.Count.Should().BeGreaterThan(0);
108-
nodes.Architectures.First().Architecture.Should().NotBeNullOrEmpty();
109-
nodes.Architectures.First().Count.Should().BeGreaterThan(0);
110-
}
111111
}
112112

113113
protected void Assert(ClusterIndicesStats indices)

0 commit comments

Comments
 (0)