Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JENKINS-31417] CLI command connect-node extracted from core to CLI (#…
…1923) * [JENKINS-31417] CLI command connect-node extracted from core to CLI connect-node extended to accept multiple node names connect-node covered by test-cases * Slighty modified Javadoc * Fixed translations after rebase
- Loading branch information
1 parent
8d5afe8
commit 6b328e1
Showing
23 changed files
with
321 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
/* | ||
* The MIT License | ||
* | ||
* Copyright (c) 2015 Red Hat, Inc. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
* THE SOFTWARE. | ||
*/ | ||
package hudson.cli; | ||
|
||
import hudson.AbortException; | ||
import hudson.Extension; | ||
import hudson.model.Computer; | ||
import org.acegisecurity.AccessDeniedException; | ||
import hudson.util.EditDistance; | ||
import jenkins.model.Jenkins; | ||
import org.kohsuke.args4j.Argument; | ||
import org.kohsuke.args4j.Option; | ||
|
||
import java.util.ArrayList; | ||
import java.util.HashSet; | ||
import java.util.List; | ||
import java.util.logging.Logger; | ||
|
||
/** | ||
* @author pjanouse | ||
* @since TODO | ||
*/ | ||
@Extension | ||
public class ConnectNodeCommand extends CLICommand { | ||
|
||
@Argument(metaVar="NAME", usage="Slave name, or empty string for master; comama-separated list is supported", required=true, multiValued=true) | ||
private List<String> nodes; | ||
|
||
@Option(name="-f", usage="Cancel any currently pending connect operation and retry from scratch") | ||
public boolean force = false; | ||
|
||
private static final Logger LOGGER = Logger.getLogger(ConnectNodeCommand.class.getName()); | ||
|
||
@Override | ||
public String getShortDescription() { | ||
return Messages.ConnectNodeCommand_ShortDescription(); | ||
} | ||
|
||
@Override | ||
protected int run() throws Exception { | ||
boolean errorOccurred = false; | ||
final Jenkins jenkins = Jenkins.getActiveInstance(); | ||
|
||
final HashSet<String> hs = new HashSet<String>(); | ||
hs.addAll(nodes); | ||
|
||
List<String> names = null; | ||
|
||
for (String node_s : hs) { | ||
Computer computer = null; | ||
|
||
try { | ||
computer = jenkins.getComputer(node_s); | ||
|
||
if(computer == null) { | ||
if(names == null) { | ||
names = new ArrayList<String>(); | ||
for (Computer c : jenkins.getComputers()) | ||
if (!c.getName().isEmpty()) | ||
names.add(c.getName()); | ||
} | ||
String adv = EditDistance.findNearest(node_s, names); | ||
throw new IllegalArgumentException(adv == null ? | ||
hudson.model.Messages.Computer_NoSuchSlaveExistsWithoutAdvice(node_s) : | ||
hudson.model.Messages.Computer_NoSuchSlaveExists(node_s, adv)); | ||
} | ||
|
||
computer.cliConnect(force); | ||
} catch (Exception e) { | ||
if (hs.size() == 1) { | ||
throw e; | ||
} | ||
|
||
final String errorMsg = String.format(node_s + ": " + e.getMessage()); | ||
stderr.println(errorMsg); | ||
errorOccurred = true; | ||
continue; | ||
} | ||
} | ||
|
||
if (errorOccurred) { | ||
throw new AbortException("Error occured while performing this command, see previous stderr output."); | ||
} | ||
return 0; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,8 @@ | ||
DeleteNodeCommand.ShortDescription=Sletter en node | ||
DeleteJobCommand.ShortDescription=Sletter et job | ||
|
||
OnlineNodeCommand.ShortDescription=Genoptag brugen af en byggenode, for at annullere en tidligere udstedt "offline-node" kommando. | ||
|
||
ClearQueueCommand.ShortDescription=Ryd byggek\u00f8en | ||
ReloadConfigurationCommand.ShortDescription=Genindl\u00e6s alle data fra filsystemet. \ | ||
Nyttigt hvis du har modificeret konfigurationsfiler direkte, udenom Jenkins. | ||
|
||
DisconnectNodeCommand.ShortDescription=Afbryder forbindelsen til en node | ||
|
||
ConnectNodeCommand.ShortDescription=Gentilslut en node |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,7 @@ | ||
DeleteNodeCommand.ShortDescription=Knoten l\u00f6schen. | ||
DeleteJobCommand.ShortDescription=Job l\u00f6schen. | ||
|
||
OnlineNodeCommand.ShortDescription=Knoten wird wieder f\u00fcr neue Builds verwendet. Hebt ein vorausgegangenes "offline-node"-Kommando auf. | ||
|
||
ClearQueueCommand.ShortDescription=Build-Warteschlange l\u00f6schen. | ||
ReloadConfigurationCommand.ShortDescription=Alle Daten im Speicher verwerfen und Konfiguration neu von Festplatte laden. Dies ist n\u00fctzlich, wenn Sie \u00c4nderungen direkt im Dateisystem vorgenommen haben. | ||
|
||
ConnectNodeCommand.ShortDescription=Erneut mit Knoten verbinden. | ||
DisconnectNodeCommand.ShortDescription=Knoten trennen. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,6 @@ | ||
DeleteNodeCommand.ShortDescription=Cancella un nodo | ||
DeleteJobCommand.ShortDescription=Cancella un job | ||
|
||
OnlineNodeCommand.ShortDescription=Resume using a node for performing builds, to cancel out the earlier "offline-node" command. | ||
|
||
ClearQueueCommand.ShortDescription=Pulisce la coda di lavoro | ||
ReloadConfigurationCommand.ShortDescription=Discard all the loaded data in memory and reload everything from file system. Useful when you modified config files directly on disk. | ||
|
||
ConnectNodeCommand.ShortDescription=Riconnettersi ad un nodo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.