This is an automated email from the ASF dual-hosted git repository. sammichen pushed a commit to branch HDDS-1564 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit cb5486bfae6de2e15f9cd57f28f56ba1d05f1c9f Author: Li Cheng <[email protected]> AuthorDate: Thu Jan 9 05:19:34 2020 +0800 HDDS-2115 Add acceptance test for createPipeline CLI and datanode list CLI (#375) * HDDS-2115 Add acceptance test for createPipeline CLI and datanode list CLI. --- .../hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java | 9 ++++++++- .../src/main/smoketest/scmcli/{pipeline.robot => datanode.robot} | 7 ++++--- hadoop-ozone/dist/src/main/smoketest/scmcli/pipeline.robot | 7 ++++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java index 58a1778..e0bdddb 100644 --- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java +++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hdds.scm.cli.pipeline; import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.client.ScmClient; +import org.apache.hadoop.hdds.scm.pipeline.Pipeline; import picocli.CommandLine; import java.util.concurrent.Callable; @@ -60,10 +61,16 @@ public class CreatePipelineSubcommand implements Callable<Void> { + " is not supported yet."); } try (ScmClient scmClient = parent.getParent().createScmClient()) { - scmClient.createReplicationPipeline( + Pipeline pipeline = scmClient.createReplicationPipeline( type, factor, HddsProtos.NodePool.getDefaultInstance()); + + if (pipeline != null) { + System.out.println(pipeline.getId().toString() + + " is created. Factor: " + pipeline.getFactor() + + ", Type: " + pipeline.getType()); + } return null; } } diff --git a/hadoop-ozone/dist/src/main/smoketest/scmcli/pipeline.robot b/hadoop-ozone/dist/src/main/smoketest/scmcli/datanode.robot similarity index 82% copy from hadoop-ozone/dist/src/main/smoketest/scmcli/pipeline.robot copy to hadoop-ozone/dist/src/main/smoketest/scmcli/datanode.robot index 6a6f0b0..ed1173d 100644 --- a/hadoop-ozone/dist/src/main/smoketest/scmcli/pipeline.robot +++ b/hadoop-ozone/dist/src/main/smoketest/scmcli/datanode.robot @@ -23,6 +23,7 @@ Resource ../commonlib.robot *** Test Cases *** -Run list pipeline - ${output} = Execute ozone scmcli pipeline list - Should contain ${output} Type:RATIS, Factor:ONE, State:OPEN \ No newline at end of file +Run list datanodes + ${output} = Execute ozone scmcli datanode list + Should contain ${output} Datanode: + Should contain ${output} Related pipelines: \ No newline at end of file diff --git a/hadoop-ozone/dist/src/main/smoketest/scmcli/pipeline.robot b/hadoop-ozone/dist/src/main/smoketest/scmcli/pipeline.robot index 6a6f0b0..f411e0c 100644 --- a/hadoop-ozone/dist/src/main/smoketest/scmcli/pipeline.robot +++ b/hadoop-ozone/dist/src/main/smoketest/scmcli/pipeline.robot @@ -25,4 +25,9 @@ Resource ../commonlib.robot *** Test Cases *** Run list pipeline ${output} = Execute ozone scmcli pipeline list - Should contain ${output} Type:RATIS, Factor:ONE, State:OPEN \ No newline at end of file + Should contain ${output} Type: + Should contain ${output} Factor:ONE, State: + +Run create pipeline + ${output} = Execute ozone scmcli pipeline create + Should contain ${output} is created. Factor: ONE, Type: STAND_ALONE \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
