Merge branch 'master' of git.clinicalfuture.com:arvados

[arvados.git] / services / api / config / routes.rb

diff --git a/services/api/config/routes.rb b/services/api/config/routes.rb
index 4ab7b60fd6d8bf190b5bc162c28d0fe234c5b83c..d330817c9eb489fd75828f0846a3f682cd050e01 100644 (file)
--- a/services/api/config/routes.rb
+++ b/services/api/config/routes.rb
@@ -1,4 +1,6 @@
 Server::Application.routes.draw do
+  resources :humans
+  resources :traits
   resources :repositories
   resources :virtual_machines
   resources :authorized_keys
@@ -82,8 +84,13 @@ Server::Application.routes.draw do
       match '/keep_disks/ping' => 'keep_disks#ping', :as => :ping_keep_disk
       match '/links/from/:tail_uuid' => 'links#index', :as => :arvados_v1_links_from
       match '/users/current' => 'users#current'
+      match '/users/system' => 'users#system'
       match '/jobs/queue' => 'jobs#queue'
+      match '/jobs/:uuid/log_tail_follow' => 'jobs#log_tail_follow'
+      match '/users/:uuid/event_stream' => 'users#event_stream'
       match '/virtual_machines/get_all_logins' => 'virtual_machines#get_all_logins'
+      match '/virtual_machines/:uuid/logins' => 'virtual_machines#logins'
+      post '/api_client_authorizations/create_system_auth' => 'api_client_authorizations#create_system_auth'
       match '/repositories/get_all_permissions' => 'repositories#get_all_permissions'
       resources :collections
       resources :links
@@ -94,12 +101,16 @@ Server::Application.routes.draw do
       resources :groups
       resources :logs
       resources :users
+      resources :api_clients
+      resources :api_client_authorizations
       resources :jobs
       resources :job_tasks
       resources :keep_disks
       resources :authorized_keys
       resources :virtual_machines
       resources :repositories
+      resources :traits
+      resources :humans
     end
   end
 
@@ -113,6 +124,8 @@ Server::Application.routes.draw do
 
   match '/discovery/v1/apis/arvados/v1/rest', :to => 'arvados/v1/schema#discovery_rest_description'
 
+  match '/static/login_failure', :to => 'static#login_failure', :as => :login_failure
+
   # Send unroutable requests to an arbitrary controller
   # (ends up at ApplicationController#render_not_found)
   match '*a', :to => 'arvados/v1/links#render_not_found'