From 4524587ce31c83648d5ed53fea3a32ac9f320cf3 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Thu, 25 Feb 2021 16:49:49 +0000 Subject: [PATCH] Fix incorrect model for cluster stats --- .../Cluster/ClusterStats/ClusterNodesStats.cs | 6 +++--- .../Cluster/ClusterStats/ClusterStatsApiTests.cs | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs b/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs index e95a5171923..fd1831cb54c 100644 --- a/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs +++ b/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs @@ -42,9 +42,6 @@ public class ClusterNodesStats [DataMember(Name = "ingest")] public ClusterIngestStats Ingest { get; internal set; } - - [DataMember(Name = "architectures")] - public IReadOnlyCollection Architectures { get; internal set; } } public class NodePackagingType @@ -180,6 +177,9 @@ public class ClusterOperatingSystemStats [DataMember(Name = "pretty_names")] public IReadOnlyCollection PrettyNames { get; internal set; } + + [DataMember(Name = "architectures")] + public IReadOnlyCollection Architectures { get; internal set; } } [DataContract] diff --git a/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs b/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs index 6fba0508087..78bd71446e6 100644 --- a/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs +++ b/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs @@ -73,6 +73,14 @@ protected void Assert(ClusterNodesStats nodes) nodes.OperatingSystem.AvailableProcessors.Should().BeGreaterThan(0); nodes.OperatingSystem.AllocatedProcessors.Should().BeGreaterThan(0); + if (Cluster.ClusterConfiguration.Version.InRange(">=7.12.0")) + { + nodes.OperatingSystem.Architectures.Should().NotBeNull(); + nodes.OperatingSystem.Architectures.Count.Should().BeGreaterThan(0); + nodes.OperatingSystem.Architectures.First().Architecture.Should().NotBeNullOrEmpty(); + nodes.OperatingSystem.Architectures.First().Count.Should().BeGreaterThan(0); + } + nodes.OperatingSystem.Names.Should().NotBeEmpty(); if (Cluster.ClusterConfiguration.Version >= "6.8.0") @@ -100,14 +108,6 @@ protected void Assert(ClusterNodesStats nodes) if (Cluster.ClusterConfiguration.Version >= "7.6.0") nodes.Ingest.Should().NotBeNull(); - - if (Cluster.ClusterConfiguration.Version >= "7.12.0") - { - nodes.Architectures.Should().NotBeNull(); - nodes.Architectures.Count.Should().BeGreaterThan(0); - nodes.Architectures.First().Architecture.Should().NotBeNullOrEmpty(); - nodes.Architectures.First().Count.Should().BeGreaterThan(0); - } } protected void Assert(ClusterIndicesStats indices)