Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ProActive
scheduling
Commits
b67f2c8d
Unverified
Commit
b67f2c8d
authored
Jul 16, 2020
by
Fabien Viale
Committed by
GitHub
Jul 16, 2020
Browse files
Merge pull request #3786 from fviale/master
Add getNodeTokens method to ResourceManage
parents
8d2379f7
3b3de1bf
Changes
3
Hide whitespace changes
Inline
Side-by-side
rm/rm-client/src/main/java/org/ow2/proactive/resourcemanager/common/util/RMProxyUserInterface.java
View file @
b67f2c8d
...
...
@@ -487,4 +487,9 @@ public class RMProxyUserInterface extends RMListenerProxy implements ResourceMan
public
void
setNodeTokens
(
String
nodeUrl
,
List
<
String
>
tokens
)
throws
RMException
{
target
.
setNodeTokens
(
nodeUrl
,
tokens
);
}
@Override
public
List
<
String
>
getNodeTokens
(
String
nodeUrl
)
throws
RMException
{
return
target
.
getNodeTokens
(
nodeUrl
);
}
}
rm/rm-client/src/main/java/org/ow2/proactive/resourcemanager/frontend/ResourceManager.java
View file @
b67f2c8d
...
...
@@ -572,4 +572,6 @@ public interface ResourceManager {
void
setNodeTokens
(
String
nodeUrl
,
List
<
String
>
tokens
)
throws
RMException
;
List
<
String
>
getNodeTokens
(
String
nodeUrl
)
throws
RMException
;
}
rm/rm-server/src/main/java/org/ow2/proactive/resourcemanager/core/RMCore.java
View file @
b67f2c8d
...
...
@@ -3109,6 +3109,9 @@ public class RMCore implements ResourceManager, InitActive, RunActive {
@Override
public
void
addNodeToken
(
String
nodeUrl
,
String
token
)
throws
RMException
{
if
(
token
==
null
||
token
.
isEmpty
())
{
throw
new
RMException
(
"Invalid empty token"
);
}
if
(
allNodes
.
containsKey
(
nodeUrl
))
{
RMNode
rmNode
=
allNodes
.
get
(
nodeUrl
);
checkNodeAdminPermission
(
rmNode
,
caller
);
...
...
@@ -3124,8 +3127,20 @@ public class RMCore implements ResourceManager, InitActive, RunActive {
}
}
public
List
<
String
>
getNodeTokens
(
String
nodeUrl
)
throws
RMException
{
if
(
allNodes
.
containsKey
(
nodeUrl
))
{
RMNode
rmNode
=
allNodes
.
get
(
nodeUrl
);
return
rmNode
.
getNodeTokens
();
}
else
{
throw
new
RMException
(
"Unknown node "
+
nodeUrl
);
}
}
@Override
public
void
removeNodeToken
(
String
nodeUrl
,
String
token
)
throws
RMException
{
if
(
token
==
null
||
token
.
isEmpty
())
{
throw
new
RMException
(
"Invalid empty token"
);
}
if
(
allNodes
.
containsKey
(
nodeUrl
))
{
RMNode
rmNode
=
allNodes
.
get
(
nodeUrl
);
checkNodeAdminPermission
(
rmNode
,
caller
);
...
...
@@ -3144,6 +3159,9 @@ public class RMCore implements ResourceManager, InitActive, RunActive {
@Override
public
void
setNodeTokens
(
String
nodeUrl
,
List
<
String
>
tokens
)
throws
RMException
{
if
(
tokens
.
stream
().
anyMatch
(
token
->
token
==
null
||
token
.
isEmpty
()))
{
throw
new
RMException
(
"Invalid empty token in list "
+
tokens
);
}
if
(
allNodes
.
containsKey
(
nodeUrl
))
{
RMNode
rmNode
=
allNodes
.
get
(
nodeUrl
);
rmNode
.
setNodeTokens
(
nodeUrl
,
tokens
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment