From 94c8f88ff70a2b5f2b2287e6c1692385a3284831 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Thu, 30 Apr 2020 12:57:49 -0400
Subject: [PATCH] Re-enable nodes usage tests and update serialization version

Updates the serialization version and re-enables bwc tests for nodes
usage api after backport of #55732
---
 .../resources/rest-api-spec/test/mixed_cluster/10_basic.yml   | 3 ---
 .../action/admin/cluster/node/usage/NodeUsage.java            | 4 ++--
 .../action/admin/cluster/node/usage/NodesUsageRequest.java    | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yml
index df1f6cd8788fa..8f97dc1b0d36d 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yml
@@ -69,9 +69,6 @@
 
 ---
 "Verify nodes usage works":
-  - skip:
-      version: "all"
-      reason: "for backport"
   - do:
       nodes.usage: {}
   - is_true: nodes
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java
index 45fac09e00c91..41ffef0ff4006 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java
@@ -43,7 +43,7 @@ public NodeUsage(StreamInput in) throws IOException {
         timestamp = in.readLong();
         sinceTime = in.readLong();
         restUsage = (Map<String, Long>) in.readGenericValue();
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
             aggregationUsage = (Map<String, Object>) in.readGenericValue();
         } else {
             aggregationUsage = null;
@@ -121,7 +121,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeLong(timestamp);
         out.writeLong(sinceTime);
         out.writeGenericValue(restUsage);
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
             out.writeGenericValue(aggregationUsage);
         }
     }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java
index 92de4f7872d82..10f99e5ab34ad 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java
@@ -34,7 +34,7 @@ public class NodesUsageRequest extends BaseNodesRequest<NodesUsageRequest> {
     public NodesUsageRequest(StreamInput in) throws IOException {
         super(in);
         this.restActions = in.readBoolean();
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
             this.aggregations = in.readBoolean();
         }
     }
@@ -99,7 +99,7 @@ public NodesUsageRequest aggregations(boolean aggregations) {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeBoolean(restActions);
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
             out.writeBoolean(aggregations);
         }
     }