Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #803 from olivergondza/node-cli
[FIXED JENKINS-18282] - Manipulate nodes via CLI
- Loading branch information
Showing
11 changed files
with
803 additions
and
3 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,83 @@ | ||
/* | ||
* The MIT License | ||
* | ||
* Copyright 2013 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.Extension; | ||
import hudson.model.Node; | ||
import hudson.model.Slave; | ||
import hudson.model.User; | ||
import jenkins.model.Jenkins; | ||
|
||
import org.kohsuke.args4j.Argument; | ||
import org.kohsuke.args4j.CmdLineException; | ||
|
||
/** | ||
* @author ogondza | ||
* @since XXX | ||
*/ | ||
@Extension | ||
public class CreateNodeCommand extends CLICommand { | ||
|
||
@Argument(metaVar="NODE", usage="Name of the node") | ||
public String nodeName; | ||
|
||
@Override | ||
public String getShortDescription() { | ||
|
||
return Messages.CreateNodeCommand_ShortDescription(); | ||
} | ||
|
||
@Override | ||
protected int run() throws Exception { | ||
|
||
final Jenkins jenkins = Jenkins.getInstance(); | ||
jenkins.checkPermission(Jenkins.ADMINISTER); | ||
|
||
final Node newNode = (Node) Jenkins.XSTREAM2.fromXML(stdin); | ||
|
||
if (nodeName != null) { | ||
|
||
// Using deprecated method but it's contract is preserved | ||
newNode.setNodeName(nodeName); | ||
} | ||
|
||
if(newNode instanceof Slave) { //change userId too | ||
User user = User.current(); | ||
((Slave) newNode).setUserId(user==null ? "anonymous" : user.getId()); | ||
} | ||
|
||
if (jenkins.getNode(newNode.getNodeName()) != null) { | ||
|
||
throw new CmdLineException( | ||
null, "Node '" + newNode.getNodeName() + "' already exists" | ||
); | ||
} | ||
|
||
jenkins.addNode(newNode); | ||
|
||
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
* The MIT License | ||
* | ||
* Copyright (c) 2013, 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.Extension; | ||
import hudson.model.Node; | ||
|
||
import java.io.IOException; | ||
|
||
import jenkins.model.Jenkins; | ||
|
||
import org.kohsuke.args4j.Argument; | ||
|
||
/** | ||
* @author ogondza | ||
* @since XXX | ||
*/ | ||
@Extension | ||
public class GetNodeCommand extends CLICommand { | ||
|
||
@Argument(metaVar="NODE", usage="Name of the node", required=true) | ||
public Node node; | ||
|
||
@Override | ||
public String getShortDescription() { | ||
|
||
return Messages.GetNodeCommand_ShortDescription(); | ||
} | ||
|
||
@Override | ||
protected int run() throws IOException { | ||
|
||
node.checkPermission(Jenkins.ADMINISTER); | ||
|
||
Jenkins.XSTREAM2.toXMLUTF8(node, stdout); | ||
|
||
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* The MIT License | ||
* | ||
* Copyright 2013 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 java.io.IOException; | ||
|
||
import javax.servlet.ServletException; | ||
|
||
import hudson.Extension; | ||
import hudson.model.Node; | ||
|
||
import org.kohsuke.args4j.Argument; | ||
|
||
/** | ||
* @author ogondza | ||
* @since XXX | ||
*/ | ||
@Extension | ||
public class UpdateNodeCommand extends CLICommand { | ||
|
||
@Argument(metaVar="NODE", usage="Name of the node", required=true) | ||
public Node node; | ||
|
||
@Override | ||
public String getShortDescription() { | ||
|
||
return Messages.UpdateNodeCommand_ShortDescription(); | ||
} | ||
|
||
@Override | ||
protected int run() throws IOException, ServletException { | ||
|
||
node.toComputer().updateByXml(stdin); | ||
|
||
return 0; | ||
} | ||
} |
68 changes: 68 additions & 0 deletions
68
core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java
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,68 @@ | ||
/* | ||
* The MIT License | ||
* | ||
* Copyright (c) 2013, 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.handlers; | ||
|
||
import hudson.model.Node; | ||
import jenkins.model.Jenkins; | ||
|
||
import org.kohsuke.MetaInfServices; | ||
import org.kohsuke.args4j.CmdLineException; | ||
import org.kohsuke.args4j.CmdLineParser; | ||
import org.kohsuke.args4j.OptionDef; | ||
import org.kohsuke.args4j.spi.OptionHandler; | ||
import org.kohsuke.args4j.spi.Parameters; | ||
import org.kohsuke.args4j.spi.Setter; | ||
|
||
/** | ||
* Refers to {@link Node} by its name. | ||
* | ||
* @author ogondza | ||
* @since XXX | ||
*/ | ||
@MetaInfServices | ||
public class NodeOptionHandler extends OptionHandler<Node> { | ||
|
||
public NodeOptionHandler(CmdLineParser parser, OptionDef option, Setter<Node> setter) { | ||
|
||
super(parser, option, setter); | ||
} | ||
|
||
@Override | ||
public int parseArguments(Parameters params) throws CmdLineException { | ||
|
||
String nodeName = params.getParameter(0); | ||
|
||
final Node node = Jenkins.getInstance().getNode(nodeName); | ||
if (node == null) throw new CmdLineException(owner, "No such node '" + nodeName + "'"); | ||
|
||
setter.addValue(node); | ||
return 1; | ||
} | ||
|
||
@Override | ||
public String getDefaultMetaVariable() { | ||
|
||
return "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
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.