Commit 4026da95 authored by lichenchong's avatar lichenchong
Browse files

Kinetic Admin: 

change kinetic admin cli default use ssl connection except firmware
download.
parent acf4f380

kinetic-client/src/main/java/com/seagate/kinetic/admin/cli/KineticAdminCLI.java

+19 −12
Original line number Diff line number Diff line
@@ -170,19 +170,17 @@ public class KineticAdminCLI { 
            adminClientConfig.setHost(DEFAULT_HOST);

        }



        if (Boolean.parseBoolean(useSsl)) {

        if (useSsl == null || useSsl.isEmpty() || Boolean.parseBoolean(useSsl)) {

            adminClientConfig.setUseSsl(true);

            adminClientConfig.setPort(DEFAULT_SSL_PORT);

        } else {

            adminClientConfig.setUseSsl(false);

            adminClientConfig.setPort(DEFAULT_PORT);

        }



        if (port != null && !port.isEmpty()) {

            validatePort(port);

            adminClientConfig.setPort(Integer.parseInt(port));

        } else if (Boolean.parseBoolean(useSsl)) {

            adminClientConfig.setPort(DEFAULT_SSL_PORT);

        } else {

            adminClientConfig.setPort(DEFAULT_PORT);

        }



        if (clusterVersion != null && !clusterVersion.isEmpty()) {
@@ -402,7 +400,7 @@ public class KineticAdminCLI { 
        sb.append("kineticAdmin -security <file> [-host <ip|hostname>] [-usessl <true|false>] [-port <port>] [-clversion <clusterversion>]\n");

        sb.append("kineticAdmin -getlog [-host <ip|hostname>] [-usessl <true|false>] [-port <port>] [-clversion <clusterversion>] [-type <utilization|temperature|capacity|configuration|message|statistic|limits|all>]\n");

        sb.append("kineticAdmin -getvendorspecificdevicelog <-name <vendorspecificname>> [-host <ip|hostname>] [-usessl <true|false>] [-port <port>] [-clversion <clusterversion>]\n");

        sb.append("kineticAdmin -firmware <file> [-host <ip|hostname>] [-usessl <true|false>] [-port <port>] [-clversion <clusterversion>]\n");

        sb.append("kineticAdmin -firmware <file> [-host <ip|hostname>] [-port <port>] [-clversion <clusterversion>]\n");

        sb.append("kineticAdmin -lockdevice <-pin <lockpin>> [-host <ip|hostname>] [-usessl <true|false>] [-port <port>] [-clversion <clusterversion>]\n");

        sb.append("kineticAdmin -unlockdevice <-pin <lockpin>> [-host <ip|hostname>] [-usessl <true|false>] [-port <port>] [-clversion <clusterversion>]");

        System.out.println(sb.toString());
@@ -517,6 +515,7 @@ public class KineticAdminCLI { 
                kineticAdminCLI.setClusterVersion(newClusterVersion);

                kineticAdminCLI.printSuccessResult();

            } else if (args[0].equalsIgnoreCase("-seterasepin")) {



                initAdminClient(args, kineticAdminCLI);



                String oldErasePin = kineticAdminCLI.getArgValue(
@@ -574,7 +573,15 @@ public class KineticAdminCLI { 
                    kineticAdminCLI.printGetVendorSpecificDeviceLog(device);

                }

            } else if (args[0].equalsIgnoreCase("-firmware")) {

                initAdminClient(args, kineticAdminCLI);

                String host;

                String port;

                String clusterVersion;

                String useSsl = "false";

                host = kineticAdminCLI.getArgValue("-host", args);

                port = kineticAdminCLI.getArgValue("-port", args);

                clusterVersion = kineticAdminCLI

                        .getArgValue("-clversion", args);

                kineticAdminCLI.init(host, useSsl, port, clusterVersion);



                String firmwareFile = kineticAdminCLI.getArgValue("-firmware",

                        args);