X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/080c940d7a8134a6e277a53b7e45eb27e2b2c87f..342c15f625fda8746e7d74510a298286b3a52196:/sdk/R/R/Arvados.R

diff --git a/sdk/R/R/Arvados.R b/sdk/R/R/Arvados.R
index 0ec2d11529..744cb3c296 100644
--- a/sdk/R/R/Arvados.R
+++ b/sdk/R/R/Arvados.R
@@ -1,7 +1,3 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-
 #' users.get
 #' 
 #' users.get is a method defined in Arvados class.
@@ -108,6 +104,19 @@ NULL
 #' @name users.update_uuid
 NULL
 
+#' users.merge
+#' 
+#' users.merge is a method defined in Arvados class.
+#' 
+#' @usage arv$users.merge(new_owner_uuid,
+#' 	new_user_token, redirect_to_new_user = NULL)
+#' @param new_owner_uuid 
+#' @param new_user_token 
+#' @param redirect_to_new_user 
+#' @return User object.
+#' @name users.merge
+NULL
+
 #' users.list
 #' 
 #' users.list is a method defined in Arvados class.
@@ -390,55 +399,55 @@ NULL
 #' @name api_clients.list
 NULL
 
-#' authorized_keys.get
+#' container_requests.get
 #' 
-#' authorized_keys.get is a method defined in Arvados class.
+#' container_requests.get is a method defined in Arvados class.
 #' 
-#' @usage arv$authorized_keys.get(uuid)
-#' @param uuid The UUID of the AuthorizedKey in question.
-#' @return AuthorizedKey object.
-#' @name authorized_keys.get
+#' @usage arv$container_requests.get(uuid)
+#' @param uuid The UUID of the ContainerRequest in question.
+#' @return ContainerRequest object.
+#' @name container_requests.get
 NULL
 
-#' authorized_keys.create
+#' container_requests.create
 #' 
-#' authorized_keys.create is a method defined in Arvados class.
+#' container_requests.create is a method defined in Arvados class.
 #' 
-#' @usage arv$authorized_keys.create(authorizedkey,
+#' @usage arv$container_requests.create(containerrequest,
 #' 	ensure_unique_name = "false")
-#' @param authorizedKey AuthorizedKey object.
+#' @param containerRequest ContainerRequest object.
 #' @param ensure_unique_name Adjust name to ensure uniqueness instead of returning an error on (owner_uuid, name) collision.
-#' @return AuthorizedKey object.
-#' @name authorized_keys.create
+#' @return ContainerRequest object.
+#' @name container_requests.create
 NULL
 
-#' authorized_keys.update
+#' container_requests.update
 #' 
-#' authorized_keys.update is a method defined in Arvados class.
+#' container_requests.update is a method defined in Arvados class.
 #' 
-#' @usage arv$authorized_keys.update(authorizedkey,
+#' @usage arv$container_requests.update(containerrequest,
 #' 	uuid)
-#' @param authorizedKey AuthorizedKey object.
-#' @param uuid The UUID of the AuthorizedKey in question.
-#' @return AuthorizedKey object.
-#' @name authorized_keys.update
+#' @param containerRequest ContainerRequest object.
+#' @param uuid The UUID of the ContainerRequest in question.
+#' @return ContainerRequest object.
+#' @name container_requests.update
 NULL
 
-#' authorized_keys.delete
+#' container_requests.delete
 #' 
-#' authorized_keys.delete is a method defined in Arvados class.
+#' container_requests.delete is a method defined in Arvados class.
 #' 
-#' @usage arv$authorized_keys.delete(uuid)
-#' @param uuid The UUID of the AuthorizedKey in question.
-#' @return AuthorizedKey object.
-#' @name authorized_keys.delete
+#' @usage arv$container_requests.delete(uuid)
+#' @param uuid The UUID of the ContainerRequest in question.
+#' @return ContainerRequest object.
+#' @name container_requests.delete
 NULL
 
-#' authorized_keys.list
+#' container_requests.list
 #' 
-#' authorized_keys.list is a method defined in Arvados class.
+#' container_requests.list is a method defined in Arvados class.
 #' 
-#' @usage arv$authorized_keys.list(filters = NULL,
+#' @usage arv$container_requests.list(filters = NULL,
 #' 	where = NULL, order = NULL, select = NULL,
 #' 	distinct = NULL, limit = "100", offset = "0",
 #' 	count = "exact")
@@ -450,59 +459,59 @@ NULL
 #' @param limit 
 #' @param offset 
 #' @param count 
-#' @return AuthorizedKeyList object.
-#' @name authorized_keys.list
+#' @return ContainerRequestList object.
+#' @name container_requests.list
 NULL
 
-#' container_requests.get
+#' authorized_keys.get
 #' 
-#' container_requests.get is a method defined in Arvados class.
+#' authorized_keys.get is a method defined in Arvados class.
 #' 
-#' @usage arv$container_requests.get(uuid)
-#' @param uuid The UUID of the ContainerRequest in question.
-#' @return ContainerRequest object.
-#' @name container_requests.get
+#' @usage arv$authorized_keys.get(uuid)
+#' @param uuid The UUID of the AuthorizedKey in question.
+#' @return AuthorizedKey object.
+#' @name authorized_keys.get
 NULL
 
-#' container_requests.create
+#' authorized_keys.create
 #' 
-#' container_requests.create is a method defined in Arvados class.
+#' authorized_keys.create is a method defined in Arvados class.
 #' 
-#' @usage arv$container_requests.create(containerrequest,
+#' @usage arv$authorized_keys.create(authorizedkey,
 #' 	ensure_unique_name = "false")
-#' @param containerRequest ContainerRequest object.
+#' @param authorizedKey AuthorizedKey object.
 #' @param ensure_unique_name Adjust name to ensure uniqueness instead of returning an error on (owner_uuid, name) collision.
-#' @return ContainerRequest object.
-#' @name container_requests.create
+#' @return AuthorizedKey object.
+#' @name authorized_keys.create
 NULL
 
-#' container_requests.update
+#' authorized_keys.update
 #' 
-#' container_requests.update is a method defined in Arvados class.
+#' authorized_keys.update is a method defined in Arvados class.
 #' 
-#' @usage arv$container_requests.update(containerrequest,
+#' @usage arv$authorized_keys.update(authorizedkey,
 #' 	uuid)
-#' @param containerRequest ContainerRequest object.
-#' @param uuid The UUID of the ContainerRequest in question.
-#' @return ContainerRequest object.
-#' @name container_requests.update
+#' @param authorizedKey AuthorizedKey object.
+#' @param uuid The UUID of the AuthorizedKey in question.
+#' @return AuthorizedKey object.
+#' @name authorized_keys.update
 NULL
 
-#' container_requests.delete
+#' authorized_keys.delete
 #' 
-#' container_requests.delete is a method defined in Arvados class.
+#' authorized_keys.delete is a method defined in Arvados class.
 #' 
-#' @usage arv$container_requests.delete(uuid)
-#' @param uuid The UUID of the ContainerRequest in question.
-#' @return ContainerRequest object.
-#' @name container_requests.delete
+#' @usage arv$authorized_keys.delete(uuid)
+#' @param uuid The UUID of the AuthorizedKey in question.
+#' @return AuthorizedKey object.
+#' @name authorized_keys.delete
 NULL
 
-#' container_requests.list
+#' authorized_keys.list
 #' 
-#' container_requests.list is a method defined in Arvados class.
+#' authorized_keys.list is a method defined in Arvados class.
 #' 
-#' @usage arv$container_requests.list(filters = NULL,
+#' @usage arv$authorized_keys.list(filters = NULL,
 #' 	where = NULL, order = NULL, select = NULL,
 #' 	distinct = NULL, limit = "100", offset = "0",
 #' 	count = "exact")
@@ -514,8 +523,8 @@ NULL
 #' @param limit 
 #' @param offset 
 #' @param count 
-#' @return ContainerRequestList object.
-#' @name container_requests.list
+#' @return AuthorizedKeyList object.
+#' @name authorized_keys.list
 NULL
 
 #' collections.get
@@ -747,78 +756,6 @@ NULL
 #' @name job_tasks.list
 NULL
 
-#' links.get
-#' 
-#' links.get is a method defined in Arvados class.
-#' 
-#' @usage arv$links.get(uuid)
-#' @param uuid The UUID of the Link in question.
-#' @return Link object.
-#' @name links.get
-NULL
-
-#' links.create
-#' 
-#' links.create is a method defined in Arvados class.
-#' 
-#' @usage arv$links.create(link, ensure_unique_name = "false")
-#' @param link Link object.
-#' @param ensure_unique_name Adjust name to ensure uniqueness instead of returning an error on (owner_uuid, name) collision.
-#' @return Link object.
-#' @name links.create
-NULL
-
-#' links.update
-#' 
-#' links.update is a method defined in Arvados class.
-#' 
-#' @usage arv$links.update(link, uuid)
-#' @param link Link object.
-#' @param uuid The UUID of the Link in question.
-#' @return Link object.
-#' @name links.update
-NULL
-
-#' links.delete
-#' 
-#' links.delete is a method defined in Arvados class.
-#' 
-#' @usage arv$links.delete(uuid)
-#' @param uuid The UUID of the Link in question.
-#' @return Link object.
-#' @name links.delete
-NULL
-
-#' links.list
-#' 
-#' links.list is a method defined in Arvados class.
-#' 
-#' @usage arv$links.list(filters = NULL,
-#' 	where = NULL, order = NULL, select = NULL,
-#' 	distinct = NULL, limit = "100", offset = "0",
-#' 	count = "exact")
-#' @param filters 
-#' @param where 
-#' @param order 
-#' @param select 
-#' @param distinct 
-#' @param limit 
-#' @param offset 
-#' @param count 
-#' @return LinkList object.
-#' @name links.list
-NULL
-
-#' links.get_permissions
-#' 
-#' links.get_permissions is a method defined in Arvados class.
-#' 
-#' @usage arv$links.get_permissions(uuid)
-#' @param uuid 
-#' @return Link object.
-#' @name links.get_permissions
-NULL
-
 #' jobs.get
 #' 
 #' jobs.get is a method defined in Arvados class.
@@ -1017,53 +954,201 @@ NULL
 #' @name keep_disks.list
 NULL
 
-#' keep_services.get
+#' nodes.get
 #' 
-#' keep_services.get is a method defined in Arvados class.
+#' nodes.get is a method defined in Arvados class.
 #' 
-#' @usage arv$keep_services.get(uuid)
-#' @param uuid The UUID of the KeepService in question.
-#' @return KeepService object.
-#' @name keep_services.get
+#' @usage arv$nodes.get(uuid)
+#' @param uuid The UUID of the Node in question.
+#' @return Node object.
+#' @name nodes.get
 NULL
 
-#' keep_services.create
+#' nodes.create
 #' 
-#' keep_services.create is a method defined in Arvados class.
+#' nodes.create is a method defined in Arvados class.
 #' 
-#' @usage arv$keep_services.create(keepservice,
-#' 	ensure_unique_name = "false")
-#' @param keepService KeepService object.
+#' @usage arv$nodes.create(node, ensure_unique_name = "false",
+#' 	assign_slot = NULL)
+#' @param node Node object.
 #' @param ensure_unique_name Adjust name to ensure uniqueness instead of returning an error on (owner_uuid, name) collision.
-#' @return KeepService object.
-#' @name keep_services.create
+#' @param assign_slot assign slot and hostname
+#' @return Node object.
+#' @name nodes.create
 NULL
 
-#' keep_services.update
+#' nodes.update
 #' 
-#' keep_services.update is a method defined in Arvados class.
+#' nodes.update is a method defined in Arvados class.
 #' 
-#' @usage arv$keep_services.update(keepservice,
-#' 	uuid)
-#' @param keepService KeepService object.
-#' @param uuid The UUID of the KeepService in question.
-#' @return KeepService object.
-#' @name keep_services.update
+#' @usage arv$nodes.update(node, uuid, assign_slot = NULL)
+#' @param node Node object.
+#' @param uuid The UUID of the Node in question.
+#' @param assign_slot assign slot and hostname
+#' @return Node object.
+#' @name nodes.update
 NULL
 
-#' keep_services.delete
+#' nodes.delete
 #' 
-#' keep_services.delete is a method defined in Arvados class.
+#' nodes.delete is a method defined in Arvados class.
 #' 
-#' @usage arv$keep_services.delete(uuid)
-#' @param uuid The UUID of the KeepService in question.
-#' @return KeepService object.
-#' @name keep_services.delete
+#' @usage arv$nodes.delete(uuid)
+#' @param uuid The UUID of the Node in question.
+#' @return Node object.
+#' @name nodes.delete
 NULL
 
-#' keep_services.accessible
+#' nodes.ping
 #' 
-#' keep_services.accessible is a method defined in Arvados class.
+#' nodes.ping is a method defined in Arvados class.
+#' 
+#' @usage arv$nodes.ping(uuid, ping_secret)
+#' @param uuid 
+#' @param ping_secret 
+#' @return Node object.
+#' @name nodes.ping
+NULL
+
+#' nodes.list
+#' 
+#' nodes.list is a method defined in Arvados class.
+#' 
+#' @usage arv$nodes.list(filters = NULL,
+#' 	where = NULL, order = NULL, select = NULL,
+#' 	distinct = NULL, limit = "100", offset = "0",
+#' 	count = "exact")
+#' @param filters 
+#' @param where 
+#' @param order 
+#' @param select 
+#' @param distinct 
+#' @param limit 
+#' @param offset 
+#' @param count 
+#' @return NodeList object.
+#' @name nodes.list
+NULL
+
+#' links.get
+#' 
+#' links.get is a method defined in Arvados class.
+#' 
+#' @usage arv$links.get(uuid)
+#' @param uuid The UUID of the Link in question.
+#' @return Link object.
+#' @name links.get
+NULL
+
+#' links.create
+#' 
+#' links.create is a method defined in Arvados class.
+#' 
+#' @usage arv$links.create(link, ensure_unique_name = "false")
+#' @param link Link object.
+#' @param ensure_unique_name Adjust name to ensure uniqueness instead of returning an error on (owner_uuid, name) collision.
+#' @return Link object.
+#' @name links.create
+NULL
+
+#' links.update
+#' 
+#' links.update is a method defined in Arvados class.
+#' 
+#' @usage arv$links.update(link, uuid)
+#' @param link Link object.
+#' @param uuid The UUID of the Link in question.
+#' @return Link object.
+#' @name links.update
+NULL
+
+#' links.delete
+#' 
+#' links.delete is a method defined in Arvados class.
+#' 
+#' @usage arv$links.delete(uuid)
+#' @param uuid The UUID of the Link in question.
+#' @return Link object.
+#' @name links.delete
+NULL
+
+#' links.list
+#' 
+#' links.list is a method defined in Arvados class.
+#' 
+#' @usage arv$links.list(filters = NULL,
+#' 	where = NULL, order = NULL, select = NULL,
+#' 	distinct = NULL, limit = "100", offset = "0",
+#' 	count = "exact")
+#' @param filters 
+#' @param where 
+#' @param order 
+#' @param select 
+#' @param distinct 
+#' @param limit 
+#' @param offset 
+#' @param count 
+#' @return LinkList object.
+#' @name links.list
+NULL
+
+#' links.get_permissions
+#' 
+#' links.get_permissions is a method defined in Arvados class.
+#' 
+#' @usage arv$links.get_permissions(uuid)
+#' @param uuid 
+#' @return Link object.
+#' @name links.get_permissions
+NULL
+
+#' keep_services.get
+#' 
+#' keep_services.get is a method defined in Arvados class.
+#' 
+#' @usage arv$keep_services.get(uuid)
+#' @param uuid The UUID of the KeepService in question.
+#' @return KeepService object.
+#' @name keep_services.get
+NULL
+
+#' keep_services.create
+#' 
+#' keep_services.create is a method defined in Arvados class.
+#' 
+#' @usage arv$keep_services.create(keepservice,
+#' 	ensure_unique_name = "false")
+#' @param keepService KeepService object.
+#' @param ensure_unique_name Adjust name to ensure uniqueness instead of returning an error on (owner_uuid, name) collision.
+#' @return KeepService object.
+#' @name keep_services.create
+NULL
+
+#' keep_services.update
+#' 
+#' keep_services.update is a method defined in Arvados class.
+#' 
+#' @usage arv$keep_services.update(keepservice,
+#' 	uuid)
+#' @param keepService KeepService object.
+#' @param uuid The UUID of the KeepService in question.
+#' @return KeepService object.
+#' @name keep_services.update
+NULL
+
+#' keep_services.delete
+#' 
+#' keep_services.delete is a method defined in Arvados class.
+#' 
+#' @usage arv$keep_services.delete(uuid)
+#' @param uuid The UUID of the KeepService in question.
+#' @return KeepService object.
+#' @name keep_services.delete
+NULL
+
+#' keep_services.accessible
+#' 
+#' keep_services.accessible is a method defined in Arvados class.
 #' 
 #' @usage arv$keep_services.accessible(NULL)
 #' @return KeepService object.
@@ -1228,82 +1313,6 @@ NULL
 #' @name pipeline_instances.list
 NULL
 
-#' nodes.get
-#' 
-#' nodes.get is a method defined in Arvados class.
-#' 
-#' @usage arv$nodes.get(uuid)
-#' @param uuid The UUID of the Node in question.
-#' @return Node object.
-#' @name nodes.get
-NULL
-
-#' nodes.create
-#' 
-#' nodes.create is a method defined in Arvados class.
-#' 
-#' @usage arv$nodes.create(node, ensure_unique_name = "false",
-#' 	assign_slot = NULL)
-#' @param node Node object.
-#' @param ensure_unique_name Adjust name to ensure uniqueness instead of returning an error on (owner_uuid, name) collision.
-#' @param assign_slot assign slot and hostname
-#' @return Node object.
-#' @name nodes.create
-NULL
-
-#' nodes.update
-#' 
-#' nodes.update is a method defined in Arvados class.
-#' 
-#' @usage arv$nodes.update(node, uuid, assign_slot = NULL)
-#' @param node Node object.
-#' @param uuid The UUID of the Node in question.
-#' @param assign_slot assign slot and hostname
-#' @return Node object.
-#' @name nodes.update
-NULL
-
-#' nodes.delete
-#' 
-#' nodes.delete is a method defined in Arvados class.
-#' 
-#' @usage arv$nodes.delete(uuid)
-#' @param uuid The UUID of the Node in question.
-#' @return Node object.
-#' @name nodes.delete
-NULL
-
-#' nodes.ping
-#' 
-#' nodes.ping is a method defined in Arvados class.
-#' 
-#' @usage arv$nodes.ping(uuid, ping_secret)
-#' @param uuid 
-#' @param ping_secret 
-#' @return Node object.
-#' @name nodes.ping
-NULL
-
-#' nodes.list
-#' 
-#' nodes.list is a method defined in Arvados class.
-#' 
-#' @usage arv$nodes.list(filters = NULL,
-#' 	where = NULL, order = NULL, select = NULL,
-#' 	distinct = NULL, limit = "100", offset = "0",
-#' 	count = "exact")
-#' @param filters 
-#' @param where 
-#' @param order 
-#' @param select 
-#' @param distinct 
-#' @param limit 
-#' @param offset 
-#' @param count 
-#' @return NodeList object.
-#' @name nodes.list
-NULL
-
 #' repositories.get
 #' 
 #' repositories.get is a method defined in Arvados class.
@@ -2130,6 +2139,7 @@ NULL
 #' 	\item{}{\code{\link{users.delete}}}
 #' 	\item{}{\code{\link{users.get}}}
 #' 	\item{}{\code{\link{users.list}}}
+#' 	\item{}{\code{\link{users.merge}}}
 #' 	\item{}{\code{\link{users.setup}}}
 #' 	\item{}{\code{\link{users.system}}}
 #' 	\item{}{\code{\link{users.unsetup}}}
@@ -2444,6 +2454,28 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
+		users.merge = function(new_owner_uuid, new_user_token,
+			redirect_to_new_user = NULL)
+		{
+			endPoint <- stringr::str_interp("users/merge")
+			url <- paste0(private$host, endPoint)
+			headers <- list(Authorization = paste("OAuth2", private$token), 
+			                "Content-Type" = "application/json")
+			queryArgs <- list(new_owner_uuid = new_owner_uuid,
+							  new_user_token = new_user_token, redirect_to_new_user = redirect_to_new_user)
+			
+			body <- NULL
+			
+			response <- private$REST$http$exec("POST", url, headers, body,
+			                                   queryArgs, private$numRetries)
+			resource <- private$REST$httpParser$parseJSONResponse(response)
+			
+			if(!is.null(resource$errors))
+				stop(resource$errors)
+			
+			resource
+		},
+
 		users.list = function(filters = NULL, where = NULL,
 			order = NULL, select = NULL, distinct = NULL,
 			limit = "100", offset = "0", count = "exact")
@@ -2949,9 +2981,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		authorized_keys.get = function(uuid)
+		container_requests.get = function(uuid)
 		{
-			endPoint <- stringr::str_interp("authorized_keys/${uuid}")
+			endPoint <- stringr::str_interp("container_requests/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -2969,17 +3001,17 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		authorized_keys.create = function(authorizedkey,
+		container_requests.create = function(containerrequest,
 			ensure_unique_name = "false")
 		{
-			endPoint <- stringr::str_interp("authorized_keys")
+			endPoint <- stringr::str_interp("container_requests")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- list(ensure_unique_name = ensure_unique_name)
 			
-			if(length(authorizedkey) > 0)
-				body <- jsonlite::toJSON(list(authorizedkey = authorizedkey), 
+			if(length(containerrequest) > 0)
+				body <- jsonlite::toJSON(list(containerrequest = containerrequest), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -2994,16 +3026,16 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		authorized_keys.update = function(authorizedkey, uuid)
+		container_requests.update = function(containerrequest, uuid)
 		{
-			endPoint <- stringr::str_interp("authorized_keys/${uuid}")
+			endPoint <- stringr::str_interp("container_requests/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- NULL
 			
-			if(length(authorizedkey) > 0)
-				body <- jsonlite::toJSON(list(authorizedkey = authorizedkey), 
+			if(length(containerrequest) > 0)
+				body <- jsonlite::toJSON(list(containerrequest = containerrequest), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -3018,9 +3050,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		authorized_keys.delete = function(uuid)
+		container_requests.delete = function(uuid)
 		{
-			endPoint <- stringr::str_interp("authorized_keys/${uuid}")
+			endPoint <- stringr::str_interp("container_requests/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3038,12 +3070,12 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		authorized_keys.list = function(filters = NULL,
+		container_requests.list = function(filters = NULL,
 			where = NULL, order = NULL, select = NULL,
 			distinct = NULL, limit = "100", offset = "0",
 			count = "exact")
 		{
-			endPoint <- stringr::str_interp("authorized_keys")
+			endPoint <- stringr::str_interp("container_requests")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3063,9 +3095,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		container_requests.get = function(uuid)
+		authorized_keys.get = function(uuid)
 		{
-			endPoint <- stringr::str_interp("container_requests/${uuid}")
+			endPoint <- stringr::str_interp("authorized_keys/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3083,17 +3115,17 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		container_requests.create = function(containerrequest,
+		authorized_keys.create = function(authorizedkey,
 			ensure_unique_name = "false")
 		{
-			endPoint <- stringr::str_interp("container_requests")
+			endPoint <- stringr::str_interp("authorized_keys")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- list(ensure_unique_name = ensure_unique_name)
 			
-			if(length(containerrequest) > 0)
-				body <- jsonlite::toJSON(list(containerrequest = containerrequest), 
+			if(length(authorizedkey) > 0)
+				body <- jsonlite::toJSON(list(authorizedkey = authorizedkey), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -3108,16 +3140,16 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		container_requests.update = function(containerrequest, uuid)
+		authorized_keys.update = function(authorizedkey, uuid)
 		{
-			endPoint <- stringr::str_interp("container_requests/${uuid}")
+			endPoint <- stringr::str_interp("authorized_keys/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- NULL
 			
-			if(length(containerrequest) > 0)
-				body <- jsonlite::toJSON(list(containerrequest = containerrequest), 
+			if(length(authorizedkey) > 0)
+				body <- jsonlite::toJSON(list(authorizedkey = authorizedkey), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -3132,9 +3164,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		container_requests.delete = function(uuid)
+		authorized_keys.delete = function(uuid)
 		{
-			endPoint <- stringr::str_interp("container_requests/${uuid}")
+			endPoint <- stringr::str_interp("authorized_keys/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3152,12 +3184,12 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		container_requests.list = function(filters = NULL,
+		authorized_keys.list = function(filters = NULL,
 			where = NULL, order = NULL, select = NULL,
 			distinct = NULL, limit = "100", offset = "0",
 			count = "exact")
 		{
-			endPoint <- stringr::str_interp("container_requests")
+			endPoint <- stringr::str_interp("authorized_keys")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3596,9 +3628,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		links.get = function(uuid)
+		jobs.get = function(uuid)
 		{
-			endPoint <- stringr::str_interp("links/${uuid}")
+			endPoint <- stringr::str_interp("jobs/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3616,16 +3648,21 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		links.create = function(link, ensure_unique_name = "false")
+		jobs.create = function(job, ensure_unique_name = "false",
+			find_or_create = "false", filters = NULL,
+			minimum_script_version = NULL, exclude_script_versions = NULL)
 		{
-			endPoint <- stringr::str_interp("links")
+			endPoint <- stringr::str_interp("jobs")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(ensure_unique_name = ensure_unique_name)
+			queryArgs <- list(ensure_unique_name = ensure_unique_name,
+							  find_or_create = find_or_create, filters = filters,
+							  minimum_script_version = minimum_script_version,
+							  exclude_script_versions = exclude_script_versions)
 			
-			if(length(link) > 0)
-				body <- jsonlite::toJSON(list(link = link), 
+			if(length(job) > 0)
+				body <- jsonlite::toJSON(list(job = job), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -3640,16 +3677,16 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		links.update = function(link, uuid)
+		jobs.update = function(job, uuid)
 		{
-			endPoint <- stringr::str_interp("links/${uuid}")
+			endPoint <- stringr::str_interp("jobs/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- NULL
 			
-			if(length(link) > 0)
-				body <- jsonlite::toJSON(list(link = link), 
+			if(length(job) > 0)
+				body <- jsonlite::toJSON(list(job = job), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -3664,9 +3701,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		links.delete = function(uuid)
+		jobs.delete = function(uuid)
 		{
-			endPoint <- stringr::str_interp("links/${uuid}")
+			endPoint <- stringr::str_interp("jobs/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3684,11 +3721,11 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		links.list = function(filters = NULL, where = NULL,
+		jobs.queue = function(filters = NULL, where = NULL,
 			order = NULL, select = NULL, distinct = NULL,
 			limit = "100", offset = "0", count = "exact")
 		{
-			endPoint <- stringr::str_interp("links")
+			endPoint <- stringr::str_interp("jobs/queue")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3708,9 +3745,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		links.get_permissions = function(uuid)
+		jobs.queue_size = function()
 		{
-			endPoint <- stringr::str_interp("permissions/${uuid}")
+			endPoint <- stringr::str_interp("jobs/queue_size")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3728,9 +3765,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		jobs.get = function(uuid)
+		jobs.cancel = function(uuid)
 		{
-			endPoint <- stringr::str_interp("jobs/${uuid}")
+			endPoint <- stringr::str_interp("jobs/${uuid}/cancel")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3738,7 +3775,7 @@ Arvados <- R6::R6Class(
 			
 			body <- NULL
 			
-			response <- private$REST$http$exec("GET", url, headers, body,
+			response <- private$REST$http$exec("POST", url, headers, body,
 			                                   queryArgs, private$numRetries)
 			resource <- private$REST$httpParser$parseJSONResponse(response)
 			
@@ -3748,24 +3785,15 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		jobs.create = function(job, ensure_unique_name = "false",
-			find_or_create = "false", filters = NULL,
-			minimum_script_version = NULL, exclude_script_versions = NULL)
+		jobs.lock = function(uuid)
 		{
-			endPoint <- stringr::str_interp("jobs")
+			endPoint <- stringr::str_interp("jobs/${uuid}/lock")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(ensure_unique_name = ensure_unique_name,
-							  find_or_create = find_or_create, filters = filters,
-							  minimum_script_version = minimum_script_version,
-							  exclude_script_versions = exclude_script_versions)
+			queryArgs <- NULL
 			
-			if(length(job) > 0)
-				body <- jsonlite::toJSON(list(job = job), 
-				                         auto_unbox = TRUE)
-			else
-				body <- NULL
+			body <- NULL
 			
 			response <- private$REST$http$exec("POST", url, headers, body,
 			                                   queryArgs, private$numRetries)
@@ -3777,21 +3805,21 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		jobs.update = function(job, uuid)
+		jobs.list = function(filters = NULL, where = NULL,
+			order = NULL, select = NULL, distinct = NULL,
+			limit = "100", offset = "0", count = "exact")
 		{
-			endPoint <- stringr::str_interp("jobs/${uuid}")
+			endPoint <- stringr::str_interp("jobs")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- NULL
+			queryArgs <- list(filters = filters, where = where,
+							  order = order, select = select, distinct = distinct,
+							  limit = limit, offset = offset, count = count)
 			
-			if(length(job) > 0)
-				body <- jsonlite::toJSON(list(job = job), 
-				                         auto_unbox = TRUE)
-			else
-				body <- NULL
+			body <- NULL
 			
-			response <- private$REST$http$exec("PUT", url, headers, body,
+			response <- private$REST$http$exec("GET", url, headers, body,
 			                                   queryArgs, private$numRetries)
 			resource <- private$REST$httpParser$parseJSONResponse(response)
 			
@@ -3801,9 +3829,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		jobs.delete = function(uuid)
+		keep_disks.get = function(uuid)
 		{
-			endPoint <- stringr::str_interp("jobs/${uuid}")
+			endPoint <- stringr::str_interp("keep_disks/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3811,7 +3839,7 @@ Arvados <- R6::R6Class(
 			
 			body <- NULL
 			
-			response <- private$REST$http$exec("DELETE", url, headers, body,
+			response <- private$REST$http$exec("GET", url, headers, body,
 			                                   queryArgs, private$numRetries)
 			resource <- private$REST$httpParser$parseJSONResponse(response)
 			
@@ -3821,21 +3849,21 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		jobs.queue = function(filters = NULL, where = NULL,
-			order = NULL, select = NULL, distinct = NULL,
-			limit = "100", offset = "0", count = "exact")
+		keep_disks.create = function(keepdisk, ensure_unique_name = "false")
 		{
-			endPoint <- stringr::str_interp("jobs/queue")
+			endPoint <- stringr::str_interp("keep_disks")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(filters = filters, where = where,
-							  order = order, select = select, distinct = distinct,
-							  limit = limit, offset = offset, count = count)
+			queryArgs <- list(ensure_unique_name = ensure_unique_name)
 			
-			body <- NULL
+			if(length(keepdisk) > 0)
+				body <- jsonlite::toJSON(list(keepdisk = keepdisk), 
+				                         auto_unbox = TRUE)
+			else
+				body <- NULL
 			
-			response <- private$REST$http$exec("GET", url, headers, body,
+			response <- private$REST$http$exec("POST", url, headers, body,
 			                                   queryArgs, private$numRetries)
 			resource <- private$REST$httpParser$parseJSONResponse(response)
 			
@@ -3845,17 +3873,21 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		jobs.queue_size = function()
+		keep_disks.update = function(keepdisk, uuid)
 		{
-			endPoint <- stringr::str_interp("jobs/queue_size")
+			endPoint <- stringr::str_interp("keep_disks/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- NULL
 			
-			body <- NULL
+			if(length(keepdisk) > 0)
+				body <- jsonlite::toJSON(list(keepdisk = keepdisk), 
+				                         auto_unbox = TRUE)
+			else
+				body <- NULL
 			
-			response <- private$REST$http$exec("GET", url, headers, body,
+			response <- private$REST$http$exec("PUT", url, headers, body,
 			                                   queryArgs, private$numRetries)
 			resource <- private$REST$httpParser$parseJSONResponse(response)
 			
@@ -3865,9 +3897,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		jobs.cancel = function(uuid)
+		keep_disks.delete = function(uuid)
 		{
-			endPoint <- stringr::str_interp("jobs/${uuid}/cancel")
+			endPoint <- stringr::str_interp("keep_disks/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3875,7 +3907,7 @@ Arvados <- R6::R6Class(
 			
 			body <- NULL
 			
-			response <- private$REST$http$exec("POST", url, headers, body,
+			response <- private$REST$http$exec("DELETE", url, headers, body,
 			                                   queryArgs, private$numRetries)
 			resource <- private$REST$httpParser$parseJSONResponse(response)
 			
@@ -3885,13 +3917,18 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		jobs.lock = function(uuid)
+		keep_disks.ping = function(uuid = NULL, ping_secret,
+			node_uuid = NULL, filesystem_uuid = NULL,
+			service_host = NULL, service_port, service_ssl_flag)
 		{
-			endPoint <- stringr::str_interp("jobs/${uuid}/lock")
+			endPoint <- stringr::str_interp("keep_disks/ping")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- NULL
+			queryArgs <- list(uuid = uuid, ping_secret = ping_secret,
+							  node_uuid = node_uuid, filesystem_uuid = filesystem_uuid,
+							  service_host = service_host, service_port = service_port,
+							  service_ssl_flag = service_ssl_flag)
 			
 			body <- NULL
 			
@@ -3905,11 +3942,12 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		jobs.list = function(filters = NULL, where = NULL,
-			order = NULL, select = NULL, distinct = NULL,
-			limit = "100", offset = "0", count = "exact")
+		keep_disks.list = function(filters = NULL,
+			where = NULL, order = NULL, select = NULL,
+			distinct = NULL, limit = "100", offset = "0",
+			count = "exact")
 		{
-			endPoint <- stringr::str_interp("jobs")
+			endPoint <- stringr::str_interp("keep_disks")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3929,9 +3967,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_disks.get = function(uuid)
+		nodes.get = function(uuid)
 		{
-			endPoint <- stringr::str_interp("keep_disks/${uuid}")
+			endPoint <- stringr::str_interp("nodes/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -3949,16 +3987,18 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_disks.create = function(keepdisk, ensure_unique_name = "false")
+		nodes.create = function(node, ensure_unique_name = "false",
+			assign_slot = NULL)
 		{
-			endPoint <- stringr::str_interp("keep_disks")
+			endPoint <- stringr::str_interp("nodes")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(ensure_unique_name = ensure_unique_name)
+			queryArgs <- list(ensure_unique_name = ensure_unique_name,
+							  assign_slot = assign_slot)
 			
-			if(length(keepdisk) > 0)
-				body <- jsonlite::toJSON(list(keepdisk = keepdisk), 
+			if(length(node) > 0)
+				body <- jsonlite::toJSON(list(node = node), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -3973,16 +4013,16 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_disks.update = function(keepdisk, uuid)
+		nodes.update = function(node, uuid, assign_slot = NULL)
 		{
-			endPoint <- stringr::str_interp("keep_disks/${uuid}")
+			endPoint <- stringr::str_interp("nodes/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- NULL
+			queryArgs <- list(assign_slot = assign_slot)
 			
-			if(length(keepdisk) > 0)
-				body <- jsonlite::toJSON(list(keepdisk = keepdisk), 
+			if(length(node) > 0)
+				body <- jsonlite::toJSON(list(node = node), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -3997,9 +4037,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_disks.delete = function(uuid)
+		nodes.delete = function(uuid)
 		{
-			endPoint <- stringr::str_interp("keep_disks/${uuid}")
+			endPoint <- stringr::str_interp("nodes/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -4017,18 +4057,13 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_disks.ping = function(uuid = NULL, ping_secret,
-			node_uuid = NULL, filesystem_uuid = NULL,
-			service_host = NULL, service_port, service_ssl_flag)
+		nodes.ping = function(uuid, ping_secret)
 		{
-			endPoint <- stringr::str_interp("keep_disks/ping")
+			endPoint <- stringr::str_interp("nodes/${uuid}/ping")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(uuid = uuid, ping_secret = ping_secret,
-							  node_uuid = node_uuid, filesystem_uuid = filesystem_uuid,
-							  service_host = service_host, service_port = service_port,
-							  service_ssl_flag = service_ssl_flag)
+			queryArgs <- list(ping_secret = ping_secret)
 			
 			body <- NULL
 			
@@ -4042,12 +4077,11 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_disks.list = function(filters = NULL,
-			where = NULL, order = NULL, select = NULL,
-			distinct = NULL, limit = "100", offset = "0",
-			count = "exact")
+		nodes.list = function(filters = NULL, where = NULL,
+			order = NULL, select = NULL, distinct = NULL,
+			limit = "100", offset = "0", count = "exact")
 		{
-			endPoint <- stringr::str_interp("keep_disks")
+			endPoint <- stringr::str_interp("nodes")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -4067,9 +4101,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_services.get = function(uuid)
+		links.get = function(uuid)
 		{
-			endPoint <- stringr::str_interp("keep_services/${uuid}")
+			endPoint <- stringr::str_interp("links/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -4087,17 +4121,16 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_services.create = function(keepservice,
-			ensure_unique_name = "false")
+		links.create = function(link, ensure_unique_name = "false")
 		{
-			endPoint <- stringr::str_interp("keep_services")
+			endPoint <- stringr::str_interp("links")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- list(ensure_unique_name = ensure_unique_name)
 			
-			if(length(keepservice) > 0)
-				body <- jsonlite::toJSON(list(keepservice = keepservice), 
+			if(length(link) > 0)
+				body <- jsonlite::toJSON(list(link = link), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -4112,16 +4145,16 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_services.update = function(keepservice, uuid)
+		links.update = function(link, uuid)
 		{
-			endPoint <- stringr::str_interp("keep_services/${uuid}")
+			endPoint <- stringr::str_interp("links/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- NULL
 			
-			if(length(keepservice) > 0)
-				body <- jsonlite::toJSON(list(keepservice = keepservice), 
+			if(length(link) > 0)
+				body <- jsonlite::toJSON(list(link = link), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -4136,9 +4169,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_services.delete = function(uuid)
+		links.delete = function(uuid)
 		{
-			endPoint <- stringr::str_interp("keep_services/${uuid}")
+			endPoint <- stringr::str_interp("links/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -4156,13 +4189,17 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_services.accessible = function()
+		links.list = function(filters = NULL, where = NULL,
+			order = NULL, select = NULL, distinct = NULL,
+			limit = "100", offset = "0", count = "exact")
 		{
-			endPoint <- stringr::str_interp("keep_services/accessible")
+			endPoint <- stringr::str_interp("links")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- NULL
+			queryArgs <- list(filters = filters, where = where,
+							  order = order, select = select, distinct = distinct,
+							  limit = limit, offset = offset, count = count)
 			
 			body <- NULL
 			
@@ -4176,18 +4213,13 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		keep_services.list = function(filters = NULL,
-			where = NULL, order = NULL, select = NULL,
-			distinct = NULL, limit = "100", offset = "0",
-			count = "exact")
+		links.get_permissions = function(uuid)
 		{
-			endPoint <- stringr::str_interp("keep_services")
+			endPoint <- stringr::str_interp("permissions/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(filters = filters, where = where,
-							  order = order, select = select, distinct = distinct,
-							  limit = limit, offset = offset, count = count)
+			queryArgs <- NULL
 			
 			body <- NULL
 			
@@ -4201,9 +4233,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_templates.get = function(uuid)
+		keep_services.get = function(uuid)
 		{
-			endPoint <- stringr::str_interp("pipeline_templates/${uuid}")
+			endPoint <- stringr::str_interp("keep_services/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -4221,17 +4253,17 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_templates.create = function(pipelinetemplate,
+		keep_services.create = function(keepservice,
 			ensure_unique_name = "false")
 		{
-			endPoint <- stringr::str_interp("pipeline_templates")
+			endPoint <- stringr::str_interp("keep_services")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- list(ensure_unique_name = ensure_unique_name)
 			
-			if(length(pipelinetemplate) > 0)
-				body <- jsonlite::toJSON(list(pipelinetemplate = pipelinetemplate), 
+			if(length(keepservice) > 0)
+				body <- jsonlite::toJSON(list(keepservice = keepservice), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -4246,16 +4278,16 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_templates.update = function(pipelinetemplate, uuid)
+		keep_services.update = function(keepservice, uuid)
 		{
-			endPoint <- stringr::str_interp("pipeline_templates/${uuid}")
+			endPoint <- stringr::str_interp("keep_services/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- NULL
 			
-			if(length(pipelinetemplate) > 0)
-				body <- jsonlite::toJSON(list(pipelinetemplate = pipelinetemplate), 
+			if(length(keepservice) > 0)
+				body <- jsonlite::toJSON(list(keepservice = keepservice), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -4270,9 +4302,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_templates.delete = function(uuid)
+		keep_services.delete = function(uuid)
 		{
-			endPoint <- stringr::str_interp("pipeline_templates/${uuid}")
+			endPoint <- stringr::str_interp("keep_services/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -4290,18 +4322,13 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_templates.list = function(filters = NULL,
-			where = NULL, order = NULL, select = NULL,
-			distinct = NULL, limit = "100", offset = "0",
-			count = "exact")
+		keep_services.accessible = function()
 		{
-			endPoint <- stringr::str_interp("pipeline_templates")
+			endPoint <- stringr::str_interp("keep_services/accessible")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(filters = filters, where = where,
-							  order = order, select = select, distinct = distinct,
-							  limit = limit, offset = offset, count = count)
+			queryArgs <- NULL
 			
 			body <- NULL
 			
@@ -4315,13 +4342,18 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_instances.get = function(uuid)
+		keep_services.list = function(filters = NULL,
+			where = NULL, order = NULL, select = NULL,
+			distinct = NULL, limit = "100", offset = "0",
+			count = "exact")
 		{
-			endPoint <- stringr::str_interp("pipeline_instances/${uuid}")
+			endPoint <- stringr::str_interp("keep_services")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- NULL
+			queryArgs <- list(filters = filters, where = where,
+							  order = order, select = select, distinct = distinct,
+							  limit = limit, offset = offset, count = count)
 			
 			body <- NULL
 			
@@ -4335,22 +4367,17 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_instances.create = function(pipelineinstance,
-			ensure_unique_name = "false")
+		pipeline_templates.get = function(uuid)
 		{
-			endPoint <- stringr::str_interp("pipeline_instances")
+			endPoint <- stringr::str_interp("pipeline_templates/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(ensure_unique_name = ensure_unique_name)
+			queryArgs <- NULL
 			
-			if(length(pipelineinstance) > 0)
-				body <- jsonlite::toJSON(list(pipelineinstance = pipelineinstance), 
-				                         auto_unbox = TRUE)
-			else
-				body <- NULL
+			body <- NULL
 			
-			response <- private$REST$http$exec("POST", url, headers, body,
+			response <- private$REST$http$exec("GET", url, headers, body,
 			                                   queryArgs, private$numRetries)
 			resource <- private$REST$httpParser$parseJSONResponse(response)
 			
@@ -4360,21 +4387,22 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_instances.update = function(pipelineinstance, uuid)
+		pipeline_templates.create = function(pipelinetemplate,
+			ensure_unique_name = "false")
 		{
-			endPoint <- stringr::str_interp("pipeline_instances/${uuid}")
+			endPoint <- stringr::str_interp("pipeline_templates")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- NULL
+			queryArgs <- list(ensure_unique_name = ensure_unique_name)
 			
-			if(length(pipelineinstance) > 0)
-				body <- jsonlite::toJSON(list(pipelineinstance = pipelineinstance), 
+			if(length(pipelinetemplate) > 0)
+				body <- jsonlite::toJSON(list(pipelinetemplate = pipelinetemplate), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
 			
-			response <- private$REST$http$exec("PUT", url, headers, body,
+			response <- private$REST$http$exec("POST", url, headers, body,
 			                                   queryArgs, private$numRetries)
 			resource <- private$REST$httpParser$parseJSONResponse(response)
 			
@@ -4384,17 +4412,21 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_instances.delete = function(uuid)
+		pipeline_templates.update = function(pipelinetemplate, uuid)
 		{
-			endPoint <- stringr::str_interp("pipeline_instances/${uuid}")
+			endPoint <- stringr::str_interp("pipeline_templates/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
 			queryArgs <- NULL
 			
-			body <- NULL
+			if(length(pipelinetemplate) > 0)
+				body <- jsonlite::toJSON(list(pipelinetemplate = pipelinetemplate), 
+				                         auto_unbox = TRUE)
+			else
+				body <- NULL
 			
-			response <- private$REST$http$exec("DELETE", url, headers, body,
+			response <- private$REST$http$exec("PUT", url, headers, body,
 			                                   queryArgs, private$numRetries)
 			resource <- private$REST$httpParser$parseJSONResponse(response)
 			
@@ -4404,9 +4436,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_instances.cancel = function(uuid)
+		pipeline_templates.delete = function(uuid)
 		{
-			endPoint <- stringr::str_interp("pipeline_instances/${uuid}/cancel")
+			endPoint <- stringr::str_interp("pipeline_templates/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -4414,7 +4446,7 @@ Arvados <- R6::R6Class(
 			
 			body <- NULL
 			
-			response <- private$REST$http$exec("POST", url, headers, body,
+			response <- private$REST$http$exec("DELETE", url, headers, body,
 			                                   queryArgs, private$numRetries)
 			resource <- private$REST$httpParser$parseJSONResponse(response)
 			
@@ -4424,12 +4456,12 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		pipeline_instances.list = function(filters = NULL,
+		pipeline_templates.list = function(filters = NULL,
 			where = NULL, order = NULL, select = NULL,
 			distinct = NULL, limit = "100", offset = "0",
 			count = "exact")
 		{
-			endPoint <- stringr::str_interp("pipeline_instances")
+			endPoint <- stringr::str_interp("pipeline_templates")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -4449,9 +4481,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		nodes.get = function(uuid)
+		pipeline_instances.get = function(uuid)
 		{
-			endPoint <- stringr::str_interp("nodes/${uuid}")
+			endPoint <- stringr::str_interp("pipeline_instances/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -4469,18 +4501,17 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		nodes.create = function(node, ensure_unique_name = "false",
-			assign_slot = NULL)
+		pipeline_instances.create = function(pipelineinstance,
+			ensure_unique_name = "false")
 		{
-			endPoint <- stringr::str_interp("nodes")
+			endPoint <- stringr::str_interp("pipeline_instances")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(ensure_unique_name = ensure_unique_name,
-							  assign_slot = assign_slot)
+			queryArgs <- list(ensure_unique_name = ensure_unique_name)
 			
-			if(length(node) > 0)
-				body <- jsonlite::toJSON(list(node = node), 
+			if(length(pipelineinstance) > 0)
+				body <- jsonlite::toJSON(list(pipelineinstance = pipelineinstance), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -4495,16 +4526,16 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		nodes.update = function(node, uuid, assign_slot = NULL)
+		pipeline_instances.update = function(pipelineinstance, uuid)
 		{
-			endPoint <- stringr::str_interp("nodes/${uuid}")
+			endPoint <- stringr::str_interp("pipeline_instances/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(assign_slot = assign_slot)
+			queryArgs <- NULL
 			
-			if(length(node) > 0)
-				body <- jsonlite::toJSON(list(node = node), 
+			if(length(pipelineinstance) > 0)
+				body <- jsonlite::toJSON(list(pipelineinstance = pipelineinstance), 
 				                         auto_unbox = TRUE)
 			else
 				body <- NULL
@@ -4519,9 +4550,9 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		nodes.delete = function(uuid)
+		pipeline_instances.delete = function(uuid)
 		{
-			endPoint <- stringr::str_interp("nodes/${uuid}")
+			endPoint <- stringr::str_interp("pipeline_instances/${uuid}")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
@@ -4539,13 +4570,13 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		nodes.ping = function(uuid, ping_secret)
+		pipeline_instances.cancel = function(uuid)
 		{
-			endPoint <- stringr::str_interp("nodes/${uuid}/ping")
+			endPoint <- stringr::str_interp("pipeline_instances/${uuid}/cancel")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")
-			queryArgs <- list(ping_secret = ping_secret)
+			queryArgs <- NULL
 			
 			body <- NULL
 			
@@ -4559,11 +4590,12 @@ Arvados <- R6::R6Class(
 			resource
 		},
 
-		nodes.list = function(filters = NULL, where = NULL,
-			order = NULL, select = NULL, distinct = NULL,
-			limit = "100", offset = "0", count = "exact")
+		pipeline_instances.list = function(filters = NULL,
+			where = NULL, order = NULL, select = NULL,
+			distinct = NULL, limit = "100", offset = "0",
+			count = "exact")
 		{
-			endPoint <- stringr::str_interp("nodes")
+			endPoint <- stringr::str_interp("pipeline_instances")
 			url <- paste0(private$host, endPoint)
 			headers <- list(Authorization = paste("OAuth2", private$token), 
 			                "Content-Type" = "application/json")