From 12c3e4ef98c594f27c11c3ef3398b6d97a9f2e86 Mon Sep 17 00:00:00 2001
From: Nanda kumar <nanda@apache.org>
Date: Thu, 29 Mar 2018 21:06:10 +0530
Subject: [PATCH] HDFS-13368. Ozone:TestEndPoint tests are failing
 consistently. Contributed by Shashikant Banerjee.

---
 hadoop-hdsl/server-scm/pom.xml                        |  6 +++++-
 .../hadoop/ozone/container/common/TestEndPoint.java   | 11 +++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/hadoop-hdsl/server-scm/pom.xml b/hadoop-hdsl/server-scm/pom.xml
index a6fcf3f7c74..802120be225 100644
--- a/hadoop-hdsl/server-scm/pom.xml
+++ b/hadoop-hdsl/server-scm/pom.xml
@@ -86,6 +86,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <version>1.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -162,4 +166,4 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/hadoop-hdsl/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java b/hadoop-hdsl/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
index 825efaa252d..6f8cc2d915b 100644
--- a/hadoop-hdsl/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
+++ b/hadoop-hdsl/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
@@ -214,7 +214,7 @@ public void testRegister() throws Exception {
       SCMRegisteredCmdResponseProto responseProto = rpcEndPoint.getEndPoint()
           .register(nodeToRegister.getProtoBufMessage(), scmAddressArray);
       Assert.assertNotNull(responseProto);
-      Assert.assertEquals(nodeToRegister.getUuid(),
+      Assert.assertEquals(nodeToRegister.getUuidString(),
           responseProto.getDatanodeUUID());
       Assert.assertNotNull(responseProto.getClusterID());
     }
@@ -230,11 +230,10 @@ private EndpointStateMachine registerTaskHelper(InetSocketAddress scmAddress,
     RegisterEndpointTask endpointTask =
         new RegisterEndpointTask(rpcEndPoint, conf);
     if (!clearDatanodeDetails) {
-      HdslProtos.DatanodeDetailsProto datanodeDetails =
-          HdslProtos.DatanodeDetailsProto.newBuilder()
-              .setUuid(UUID.randomUUID().toString())
-              .build();
-      endpointTask.setDatanodeDetailsProto(datanodeDetails);
+      DatanodeDetails datanodeDetails = TestUtils.getDatanodeDetails();
+      HdslProtos.DatanodeDetailsProto datanodeDetailsProto =
+          datanodeDetails.getProtoBufMessage();
+      endpointTask.setDatanodeDetailsProto(datanodeDetailsProto);
     }
     endpointTask.call();
     return rpcEndPoint;