Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
681769a9
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
681769a9
编写于
7月 16, 2013
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #803 from olivergondza/node-cli
[FIXED JENKINS-18282] - Manipulate nodes via CLI
上级
b4d6d8c0
b74185f1
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
803 addition
and
3 deletion
+803
-3
core/src/main/java/hudson/cli/CreateNodeCommand.java
core/src/main/java/hudson/cli/CreateNodeCommand.java
+83
-0
core/src/main/java/hudson/cli/GetNodeCommand.java
core/src/main/java/hudson/cli/GetNodeCommand.java
+60
-0
core/src/main/java/hudson/cli/UpdateNodeCommand.java
core/src/main/java/hudson/cli/UpdateNodeCommand.java
+59
-0
core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java
.../src/main/java/hudson/cli/handlers/NodeOptionHandler.java
+68
-0
core/src/main/java/hudson/model/Computer.java
core/src/main/java/hudson/model/Computer.java
+13
-3
core/src/main/resources/hudson/cli/Messages.properties
core/src/main/resources/hudson/cli/Messages.properties
+6
-0
test/src/main/java/hudson/cli/CLICommandInvoker.java
test/src/main/java/hudson/cli/CLICommandInvoker.java
+154
-0
test/src/test/java/hudson/cli/CreateNodeCommandTest.java
test/src/test/java/hudson/cli/CreateNodeCommandTest.java
+152
-0
test/src/test/java/hudson/cli/GetNodeCommandTest.java
test/src/test/java/hudson/cli/GetNodeCommandTest.java
+91
-0
test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
+98
-0
test/src/test/resources/hudson/cli/node.xml
test/src/test/resources/hudson/cli/node.xml
+19
-0
未找到文件。
core/src/main/java/hudson/cli/CreateNodeCommand.java
0 → 100644
浏览文件 @
681769a9
/*
* 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
;
}
}
core/src/main/java/hudson/cli/GetNodeCommand.java
0 → 100644
浏览文件 @
681769a9
/*
* 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
;
}
}
core/src/main/java/hudson/cli/UpdateNodeCommand.java
0 → 100644
浏览文件 @
681769a9
/*
* 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
;
}
}
core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java
0 → 100644
浏览文件 @
681769a9
/*
* 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"
;
}
}
core/src/main/java/hudson/model/Computer.java
浏览文件 @
681769a9
...
...
@@ -77,6 +77,7 @@ import javax.servlet.ServletException;
import
java.io.File
;
import
java.io.FilenameFilter
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.PrintWriter
;
import
java.io.StringWriter
;
import
java.util.*
;
...
...
@@ -1194,9 +1195,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
}
if
(
req
.
getMethod
().
equals
(
"POST"
))
{
// submission
Node
result
=
(
Node
)
Jenkins
.
XSTREAM2
.
fromXML
(
req
.
getReader
());
replaceBy
(
result
);
updateByXml
(
req
.
getInputStream
());
return
;
}
...
...
@@ -1223,6 +1222,17 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
}
}
/**
* Updates Job by its XML definition.
*
* @since XXX
*/
public
void
updateByXml
(
final
InputStream
source
)
throws
IOException
,
ServletException
{
checkPermission
(
Jenkins
.
ADMINISTER
);
Node
result
=
(
Node
)
Jenkins
.
XSTREAM2
.
fromXML
(
source
);
replaceBy
(
result
);
}
/**
* Really deletes the slave.
*/
...
...
core/src/main/resources/hudson/cli/Messages.properties
浏览文件 @
681769a9
...
...
@@ -11,6 +11,8 @@ BuildCommand.ShortDescription=\
CopyJobCommand.ShortDescription
=
Copies a job.
CreateJobCommand.ShortDescription
=
\
Creates a new job by reading stdin as a configuration XML file.
CreateNodeCommand.ShortDescription
=
\
Creates a new node by reading stdin as a XML configuration.
DeleteBuildsCommand.ShortDescription
=
\
Deletes build record(s).
GroovyCommand.ShortDescription
=
\
...
...
@@ -44,10 +46,14 @@ VersionCommand.ShortDescription=\
Outputs the current version.
GetJobCommand.ShortDescription
=
\
Dumps the job definition XML to stdout
GetNodeCommand.ShortDescription
=
\
Dumps the node definition XML to stdout
SetBuildDisplayNameCommand.ShortDescription
=
\
Sets the displayName of a build
WhoAmICommand.ShortDescription
=
\
Reports your credential and permissions
UpdateJobCommand.ShortDescription
=
\
Updates the job definition XML from stdin. The opposite of the get-job command
UpdateNodeCommand.ShortDescription
=
\
Updates the node definition XML from stdin. The opposite of the get-node command
BuildCommand.CLICause.ShortDescription
=
Started by command line by {0}
test/src/main/java/hudson/cli/CLICommandInvoker.java
0 → 100644
浏览文件 @
681769a9
/*
* 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.model.User
;
import
hudson.security.Permission
;
import
hudson.security.GlobalMatrixAuthorizationStrategy
;
import
java.io.ByteArrayOutputStream
;
import
java.io.InputStream
;
import
java.io.PrintStream
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Locale
;
import
org.jvnet.hudson.test.JenkinsRule
;
/**
* Helper class to invoke {@link CLICommand} and check the response.
*
* @author ogondza
*/
public
class
CLICommandInvoker
{
private
static
final
String
username
=
"user"
;
private
final
JenkinsRule
rule
;
private
final
CLICommand
command
;
private
InputStream
stdin
;
private
List
<
String
>
args
=
Collections
.
emptyList
();
private
List
<
Permission
>
permissions
=
Collections
.
emptyList
();
private
Locale
locale
=
Locale
.
ENGLISH
;
public
CLICommandInvoker
(
final
JenkinsRule
rule
,
final
CLICommand
command
)
{
this
.
rule
=
rule
;
this
.
command
=
command
;
}
public
CLICommandInvoker
authorizedTo
(
final
Permission
...
permissions
)
{
this
.
permissions
=
Arrays
.
asList
(
permissions
);
return
this
;
}
public
CLICommandInvoker
withStdin
(
final
InputStream
stdin
)
{
this
.
stdin
=
stdin
;
return
this
;
}
public
CLICommandInvoker
withArgs
(
final
String
...
args
)
{
this
.
args
=
Arrays
.
asList
(
args
);
return
this
;
}
public
Result
invokeWithArgs
(
final
String
...
args
)
{
return
withArgs
(
args
).
invoke
();
}
public
Result
invoke
()
{
setAuth
();
final
ByteArrayOutputStream
out
=
new
ByteArrayOutputStream
();
final
ByteArrayOutputStream
err
=
new
ByteArrayOutputStream
();
final
int
returnCode
=
command
.
main
(
args
,
locale
,
stdin
,
new
PrintStream
(
out
),
new
PrintStream
(
err
)
);
return
new
Result
(
returnCode
,
out
,
err
);
}
private
void
setAuth
()
{
if
(
permissions
.
isEmpty
())
return
;
JenkinsRule
.
DummySecurityRealm
realm
=
rule
.
createDummySecurityRealm
();
realm
.
addGroups
(
username
,
"group"
);
rule
.
jenkins
.
setSecurityRealm
(
realm
);
GlobalMatrixAuthorizationStrategy
auth
=
new
GlobalMatrixAuthorizationStrategy
();
for
(
Permission
p:
permissions
)
{
auth
.
add
(
p
,
username
);
}
rule
.
jenkins
.
setAuthorizationStrategy
(
auth
);
command
.
setTransportAuth
(
user
().
impersonate
());
}
public
User
user
()
{
return
User
.
get
(
username
);
}
public
static
class
Result
{
private
final
int
result
;
private
final
ByteArrayOutputStream
out
;
private
final
ByteArrayOutputStream
err
;
private
Result
(
final
int
result
,
final
ByteArrayOutputStream
out
,
final
ByteArrayOutputStream
err
)
{
this
.
result
=
result
;
this
.
out
=
out
;
this
.
err
=
err
;
}
public
int
returnCode
()
{
return
result
;
}
public
String
stdout
()
{
return
out
.
toString
();
}
public
String
stderr
()
{
return
err
.
toString
();
}
}
}
test/src/test/java/hudson/cli/CreateNodeCommandTest.java
0 → 100644
浏览文件 @
681769a9
/*
* 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
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
hamcrest
.
Matchers
.
nullValue
;
import
static
org
.
hamcrest
.
text
.
IsEmptyString
.
isEmptyString
;
import
hudson.model.Node
;
import
hudson.model.Slave
;
import
hudson.security.Permission
;
import
jenkins.model.Jenkins
;
import
org.junit.Before
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.JenkinsRule
;
public
class
CreateNodeCommandTest
{
private
CLICommandInvoker
command
;
@Rule
public
final
JenkinsRule
j
=
new
JenkinsRule
();
@Before
public
void
setUp
()
{
command
=
new
CLICommandInvoker
(
j
,
new
CreateNodeCommand
());
}
@Test
public
void
createNodeShouldFailWithoutAdministerPermision
()
throws
Exception
{
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Permission
.
READ
)
.
withStdin
(
getClass
().
getResourceAsStream
(
"node.xml"
))
.
invoke
()
;
assertThat
(
result
.
stderr
(),
containsString
(
"user is missing the Overall/Administer permission"
));
assertThat
(
"No output expected"
,
result
.
stdout
(),
isEmptyString
());
assertThat
(
"Command is expected to fail"
,
result
.
returnCode
(),
equalTo
(-
1
));
}
@Test
public
void
createNode
()
throws
Exception
{
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Jenkins
.
ADMINISTER
)
.
withStdin
(
getClass
().
getResourceAsStream
(
"node.xml"
))
.
invoke
()
;
assertThat
(
"No error output expected"
,
result
.
stderr
(),
isEmptyString
());
assertThat
(
"Command is expected to succeed"
,
result
.
returnCode
(),
equalTo
(
0
));
final
Slave
updatedSlave
=
(
Slave
)
j
.
jenkins
.
getNode
(
"SlaveFromXML"
);
assertThat
(
updatedSlave
.
getNodeName
(),
equalTo
(
"SlaveFromXML"
));
assertThat
(
updatedSlave
.
getNumExecutors
(),
equalTo
(
42
));
assertThat
(
updatedSlave
.
getUserId
(),
equalTo
(
command
.
user
().
getId
()));
}
@Test
public
void
createNodeSpecifyingNameExplicitly
()
throws
Exception
{
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Jenkins
.
ADMINISTER
)
.
withStdin
(
getClass
().
getResourceAsStream
(
"node.xml"
))
.
invokeWithArgs
(
"CustomSlaveName"
)
;
assertThat
(
"No error output expected"
,
result
.
stderr
(),
isEmptyString
());
assertThat
(
"Command is expected to succeed"
,
result
.
returnCode
(),
equalTo
(
0
));
assertThat
(
"A slave with original name should not exist"
,
j
.
jenkins
.
getNode
(
"SlaveFromXml"
),
nullValue
());
final
Slave
updatedSlave
=
(
Slave
)
j
.
jenkins
.
getNode
(
"CustomSlaveName"
);
assertThat
(
updatedSlave
.
getNodeName
(),
equalTo
(
"CustomSlaveName"
));
assertThat
(
updatedSlave
.
getNumExecutors
(),
equalTo
(
42
));
assertThat
(
updatedSlave
.
getUserId
(),
equalTo
(
command
.
user
().
getId
()));
}
@Test
public
void
createNodeSpecifyingDifferentNameExplicitly
()
throws
Exception
{
final
Node
originalSlave
=
j
.
createSlave
(
"SlaveFromXml"
,
null
,
null
);
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Jenkins
.
ADMINISTER
)
.
withStdin
(
getClass
().
getResourceAsStream
(
"node.xml"
))
.
invokeWithArgs
(
"CustomSlaveName"
)
;
assertThat
(
"No error output expected"
,
result
.
stderr
(),
isEmptyString
());
assertThat
(
"Command is expected to succeed"
,
result
.
returnCode
(),
equalTo
(
0
));
assertThat
(
"A slave with original name should be left untouched"
,
j
.
jenkins
.
getNode
(
"SlaveFromXml"
),
equalTo
(
originalSlave
));
final
Slave
updatedSlave
=
(
Slave
)
j
.
jenkins
.
getNode
(
"CustomSlaveName"
);
assertThat
(
updatedSlave
.
getNodeName
(),
equalTo
(
"CustomSlaveName"
));
assertThat
(
updatedSlave
.
getNumExecutors
(),
equalTo
(
42
));
assertThat
(
updatedSlave
.
getUserId
(),
equalTo
(
command
.
user
().
getId
()));
}
@Test
public
void
createNodeShouldFailIfNodeAlreadyExist
()
throws
Exception
{
j
.
createSlave
(
"SlaveFromXML"
,
null
,
null
);
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Jenkins
.
ADMINISTER
)
.
withStdin
(
getClass
().
getResourceAsStream
(
"node.xml"
))
.
invoke
()
;
assertThat
(
result
.
stderr
(),
containsString
(
"Node 'SlaveFromXML' already exists"
));
assertThat
(
"No output expected"
,
result
.
stdout
(),
isEmptyString
());
assertThat
(
"Command is expected to fail"
,
result
.
returnCode
(),
equalTo
(-
1
));
}
@Test
public
void
createNodeShouldFailIfNodeAlreadyExistWhenNameSpecifiedExplicitly
()
throws
Exception
{
j
.
createSlave
(
"ExistingSlave"
,
null
,
null
);
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Jenkins
.
ADMINISTER
)
.
withStdin
(
getClass
().
getResourceAsStream
(
"node.xml"
))
.
invokeWithArgs
(
"ExistingSlave"
)
;
assertThat
(
result
.
stderr
(),
containsString
(
"Node 'ExistingSlave' already exists"
));
assertThat
(
"No output expected"
,
result
.
stdout
(),
isEmptyString
());
assertThat
(
"Command is expected to fail"
,
result
.
returnCode
(),
equalTo
(-
1
));
}
}
test/src/test/java/hudson/cli/GetNodeCommandTest.java
0 → 100644
浏览文件 @
681769a9
/*
* 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
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
hamcrest
.
Matchers
.
startsWith
;
import
static
org
.
hamcrest
.
text
.
IsEmptyString
.
isEmptyString
;
import
hudson.security.Permission
;
import
jenkins.model.Jenkins
;
import
org.junit.Before
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.JenkinsRule
;
public
class
GetNodeCommandTest
{
private
CLICommandInvoker
command
;
@Rule
public
final
JenkinsRule
j
=
new
JenkinsRule
();
@Before
public
void
setUp
()
{
command
=
new
CLICommandInvoker
(
j
,
new
GetNodeCommand
());
}
@Test
public
void
getNodeShouldFailWithoutAdministerPermision
()
throws
Exception
{
j
.
createSlave
(
"MySlave"
,
null
,
null
);
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Permission
.
READ
)
.
invokeWithArgs
(
"MySlave"
)
;
assertThat
(
result
.
stderr
(),
containsString
(
"user is missing the Overall/Administer permission"
));
assertThat
(
"No output expected"
,
result
.
stdout
(),
isEmptyString
());
assertThat
(
"Command is expected to fail"
,
result
.
returnCode
(),
equalTo
(-
1
));
}
@Test
public
void
getNodeShouldYieldConfigXml
()
throws
Exception
{
j
.
createSlave
(
"MySlave"
,
null
,
null
);
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Jenkins
.
ADMINISTER
)
.
invokeWithArgs
(
"MySlave"
)
;
assertThat
(
result
.
stdout
(),
startsWith
(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
));
assertThat
(
result
.
stdout
(),
containsString
(
"<name>MySlave</name>"
));
assertThat
(
"No error output expected"
,
result
.
stderr
(),
isEmptyString
());
assertThat
(
"Command is expected to succeed"
,
result
.
returnCode
(),
equalTo
(
0
));
}
@Test
public
void
getNodeShouldFailIfNodeDoesNotExist
()
throws
Exception
{
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Jenkins
.
ADMINISTER
)
.
invokeWithArgs
(
"MySlave"
)
;
assertThat
(
result
.
stderr
(),
containsString
(
"No such node 'MySlave'"
));
assertThat
(
"No output expected"
,
result
.
stdout
(),
isEmptyString
());
assertThat
(
"Command is expected to fail"
,
result
.
returnCode
(),
equalTo
(-
1
));
}
}
test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
0 → 100644
浏览文件 @
681769a9
/*
* 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
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
hamcrest
.
Matchers
.
nullValue
;
import
static
org
.
hamcrest
.
text
.
IsEmptyString
.
isEmptyString
;
import
hudson.model.Node
;
import
hudson.security.Permission
;
import
jenkins.model.Jenkins
;
import
org.junit.Before
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.JenkinsRule
;
public
class
UpdateNodeCommandTest
{
private
CLICommandInvoker
command
;
@Rule
public
final
JenkinsRule
j
=
new
JenkinsRule
();
@Before
public
void
setUp
()
{
command
=
new
CLICommandInvoker
(
j
,
new
UpdateNodeCommand
());
}
@Test
public
void
updateNodeShouldFailWithoutAdministerPermision
()
throws
Exception
{
j
.
createSlave
(
"MySlave"
,
null
,
null
);
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Permission
.
READ
)
.
invokeWithArgs
(
"MySlave"
)
;
assertThat
(
result
.
stderr
(),
containsString
(
"user is missing the Overall/Administer permission"
));
assertThat
(
"No output expected"
,
result
.
stdout
(),
isEmptyString
());
assertThat
(
"Command is expected to fail"
,
result
.
returnCode
(),
equalTo
(-
1
));
}
@Test
public
void
updateNodeShouldModifyNodeConfiguration
()
throws
Exception
{
j
.
createSlave
(
"MySlave"
,
null
,
null
);
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Jenkins
.
ADMINISTER
)
.
withStdin
(
getClass
().
getResourceAsStream
(
"node.xml"
))
.
invokeWithArgs
(
"MySlave"
)
;
assertThat
(
"No error output expected"
,
result
.
stderr
(),
isEmptyString
());
assertThat
(
"Command is expected to succeed"
,
result
.
returnCode
(),
equalTo
(
0
));
assertThat
(
"A slave with old name should not exist"
,
j
.
jenkins
.
getNode
(
"MySlave"
),
nullValue
());
final
Node
updatedSlave
=
j
.
jenkins
.
getNode
(
"SlaveFromXML"
);
assertThat
(
updatedSlave
.
getNodeName
(),
equalTo
(
"SlaveFromXML"
));
assertThat
(
updatedSlave
.
getNumExecutors
(),
equalTo
(
42
));
}
@Test
public
void
updateNodeShouldFailIfNodeDoesNotExist
()
throws
Exception
{
final
CLICommandInvoker
.
Result
result
=
command
.
authorizedTo
(
Jenkins
.
ADMINISTER
)
.
withStdin
(
getClass
().
getResourceAsStream
(
"node.xml"
))
.
invokeWithArgs
(
"MySlave"
)
;
assertThat
(
result
.
stderr
(),
containsString
(
"No such node 'MySlave'"
));
assertThat
(
"No output expected"
,
result
.
stdout
(),
isEmptyString
());
assertThat
(
"Command is expected to fail"
,
result
.
returnCode
(),
equalTo
(-
1
));
}
}
test/src/test/resources/hudson/cli/node.xml
0 → 100644
浏览文件 @
681769a9
<?xml version="1.0" encoding="UTF-8"?>
<slave>
<name>
SlaveFromXML
</name>
<description>
XML slave description
</description>
<remoteFS>
/user/hudson/wokspace
</remoteFS>
<numExecutors>
42
</numExecutors>
<mode>
NORMAL
</mode>
<retentionStrategy
class=
"hudson.slaves.RetentionStrategy$1"
>
<DESCRIPTOR>
<outer-class
reference=
"../.."
/>
</DESCRIPTOR>
</retentionStrategy>
<launcher
class=
"hudson.slaves.CommandLauncher"
>
<agentCommand>
"
/opt/java6/jre/bin/java
"
-jar
"
slave.jar
"
</agentCommand>
</launcher>
<label></label>
<nodeProperties/>
<userId>
SYSTEM
</userId>
</slave>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录