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 c3d2fd197f2809603d211cab5fd8a933b5c5c1f1..d330817c9eb489fd75828f0846a3f682cd050e01 100644 (file)
--- a/services/api/config/routes.rb
+++ b/services/api/config/routes.rb
@@ -1,8 +1,12 @@
 Server::Application.routes.draw do
+  resources :humans
+  resources :traits
+  resources :repositories
+  resources :virtual_machines
+  resources :authorized_keys
+  resources :keep_disks
   resources :commit_ancestors
-
   resources :commits
-
   resources :job_tasks
   resources :jobs
   resources :api_client_authorizations
@@ -73,12 +77,21 @@ Server::Application.routes.draw do
   # Note: This route will make all actions in every controller accessible via GET requests.
   # match ':controller(/:action(/:id(.:format)))'
 
-  namespace :orvos do
+  namespace :arvados do
     namespace :v1 do
       match '/schema' => 'schema#show'
       match '/nodes/:uuid/ping' => 'nodes#ping', :as => :ping_node
-      match '/links/from/:tail_uuid' => 'links#index', :as => :orvos_v1_links_from
+      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
       resources :nodes
@@ -88,8 +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
 
@@ -101,11 +122,13 @@ Server::Application.routes.draw do
   match '/login', :to => 'user_sessions#login'
   match '/logout', :to => 'user_sessions#logout'
 
-  match '/discovery/v1/apis/orvos/v1/rest', :to => 'orvos/v1/schema#discovery_rest_description'
+  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 => 'orvos/v1/links#render_not_found'
+  match '*a', :to => 'arvados/v1/links#render_not_found'
 
   root :to => 'static#home'
 end