HDDS-1934. TestSecureOzoneCluster may fail due to port conflict (#1254)

Author: adoroszlai

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java

@@ -35,6 +35,7 @@
 import org.apache.hadoop.hdds.HddsConfigKeys;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.SCMSecurityProtocol;
+import org.apache.hadoop.hdds.scm.HddsTestUtils;
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
 import org.apache.hadoop.hdds.scm.ScmInfo;
 import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
@@ -271,7 +272,7 @@ public void testSecureScmStartupSuccess() throws Exception {
   public void testSCMSecurityProtocol() throws Exception {
 
     initSCM();
-    scm = StorageContainerManager.createSCM(conf);
+    scm = HddsTestUtils.getScm(conf);
     //Reads the SCM Info from SCM instance
     try {
       scm.start();
@@ -739,7 +740,7 @@ public void testSecureOmReInit() throws Exception {
 
     initSCM();
     try {
-      scm = StorageContainerManager.createSCM(conf);
+      scm = HddsTestUtils.getScm(conf);
       scm.start();
       conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, false);
       OMStorage omStore = new OMStorage(conf);
@@ -785,7 +786,7 @@ public void testSecureOmInitSuccess() throws Exception {
     omLogs.clearOutput();
     initSCM();
     try {
-      scm = StorageContainerManager.createSCM(conf);
+      scm = HddsTestUtils.getScm(conf);
       scm.start();
 
       OMStorage omStore = new OMStorage(conf);