Skip to content

Commit e9afa66

Browse files
committed
fixup! Added API to register hub/peripherals
1 parent b3e0ec2 commit e9afa66

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

java/code/src/com/suse/manager/xmlrpc/iss/IssHandler.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public IssHandler(HubManager hubManagerIn) {
6666
* Generate a new access token for ISS for accessing this system
6767
* @param loggedInUser the user logged in. It must have the sat admin role.
6868
* @param fqdn the FQDN of the peripheral/hub that will be using this access token
69-
*
7069
* @return the serialized form of the token
7170
*
7271
* @apidoc.doc Generate a new access token for ISS for accessing this system
@@ -141,6 +140,7 @@ public int storeAccessToken(User loggedInUser, String fqdn, String token) {
141140
* @param username the name of the user, needed to access the remote server. It must have the sat admin role.
142141
* @param password the password of the user, needed to access the remote server.
143142
* @return 1 on success, exception otherwise
143+
*
144144
* @apidoc.doc Registers automatically a remote server with the specified ISS role.
145145
* @apidoc.param #session_key()
146146
* @apidoc.param #param_desc("string", "fqdn", "the FQDN of the remote server to register ")
@@ -164,6 +164,7 @@ public int register(User loggedInUser, String fqdn, String role, String username
164164
* @param password the password of the user, needed to access the remote server.
165165
* @param rootCA the root CA certificate, in case it's needed to establish a secure connection
166166
* @return 1 on success, exception otherwise
167+
*
167168
* @apidoc.doc Registers automatically a remote server with the specified ISS role.
168169
* @apidoc.param #session_key()
169170
* @apidoc.param #param_desc("string", "fqdn", "the FQDN of the remote server to register ")
@@ -172,7 +173,7 @@ public int register(User loggedInUser, String fqdn, String role, String username
172173
* It must have the sat admin role")
173174
* @apidoc.param #param_desc("string", "password", "the password of the user, needed to access the remote
174175
* server")
175-
* @apidoc.param #param_desc("string", "rootCA", the root CA certificate, in case it's needed to establish a secure
176+
* @apidoc.param #param_desc("string", "rootCA", "the root CA certificate, in case it's needed to establish a secure
176177
* connection")
177178
* @apidoc.returntype #return_int_success()
178179
*/
@@ -222,6 +223,7 @@ public int register(User loggedInUser, String fqdn, String role, String username
222223
* @param role the ISS role of the remote server. Can be either HUB or PERIPHERAL
223224
* @param token the token used to authenticate on the remote server.
224225
* @return 1 on success, exception otherwise
226+
*
225227
* @apidoc.doc Registers a remote server with the specified ISS role using an existing specified access token.
226228
* @apidoc.param #session_key()
227229
* @apidoc.param #param_desc("string", "fqdn", "the FQDN of the remote server to register ")
@@ -241,12 +243,13 @@ public int registerWithToken(User loggedInUser, String fqdn, String role, String
241243
* @param token the token used to authenticate on the remote server.
242244
* @param rootCA the root CA certificate, in case it's needed to establish a secure connection
243245
* @return 1 on success, exception otherwise
246+
*
244247
* @apidoc.doc Registers a remote server with the specified ISS role using an existing specified access token.
245248
* @apidoc.param #session_key()
246249
* @apidoc.param #param_desc("string", "fqdn", "the FQDN of the remote server to register ")
247250
* @apidoc.param #param_desc("string", "role", "the ISS role of the remote server. Either HUB or PERIPHERAL")
248251
* @apidoc.param #param_desc("string", "token", "the token used to authenticate on the remote server.")
249-
* @apidoc.param #param_desc("string", "rootCA", the root CA certificate, in case it's needed to establish a secure
252+
* @apidoc.param #param_desc("string", "rootCA", "the root CA certificate, in case it's needed to establish a secure
250253
* connection")
251254
* @apidoc.returntype #return_int_success()
252255
*/

0 commit comments

Comments
 (0)