config/routes/api/v2.rb in katello-4.0.3 vs config/routes/api/v2.rb in katello-4.1.0.rc1

@@ -31,11 +31,11 @@
         end
 
         api_resources :activation_keys, :only => [:index, :create, :show, :update, :destroy] do
           get :auto_complete_search, :on => :collection
           member do
-            match '/product_content' => 'activation_keys#product_content', :via => :get
+            match '/product_content' => 'repository_sets#index', :via => :get, :entity => :activation_key
             match '/content_override' => 'activation_keys#content_override', :via => :put
             post :copy
             put :add_subscriptions
             put :remove_subscriptions
           end
@@ -72,19 +72,12 @@
           get :auto_complete_search, :on => :collection
           member do
             post :copy
             post :publish
             put :remove
-            get :available_puppet_modules
-            get :available_puppet_module_names
             match '/environments/:environment_id' => "content_views#remove_from_environment", :via => :delete
           end
-          api_resources :content_view_puppet_modules do
-            collection do
-              get :auto_complete_search
-            end
-          end
           api_resources :filters, :controller => :content_view_filters do
             collection do
               get :auto_complete_search
             end
             api_resources :errata, :only => [:index]
@@ -93,11 +86,10 @@
           api_resources :history, :controller => :content_view_histories, :only => [:index] do
             collection do
               get :auto_complete_search
             end
           end
-          api_resources :puppet_modules, :only => [:index]
           api_resources :repositories, :only => [:index] do
             collection do
               match '/show_all' => "content_view_repositories#show_all", :via => :get
             end
           end
@@ -105,25 +97,30 @@
         end
 
         api_resources :content_view_filters do
           api_resources :errata, :only => [:index]
           api_resources :package_groups, :only => [:index]
-          api_resources :rules, :controller => :content_view_filter_rules
+          api_resources :rules, :controller => :content_view_filter_rules do
+            collection do
+              get :auto_complete_search
+            end
+          end
           collection do
             get :auto_complete_search
           end
         end
 
-        api_resources :content_exports, :only => [] do
+        api_resources :content_exports, :only => [:index] do
           collection do
             post :version
             post :library
             get :index
-            get :api_status
           end
         end
 
+        api_resources :content_imports, :only => [:index]
+
         api_resources :content_export_incrementals, :only => [] do
           collection do
             post :version
             post :library
           end
@@ -195,11 +192,10 @@
           end
         end
 
         api_resources :environments, :only => [:index, :show, :create, :update, :destroy] do
           api_resources :activation_keys, :only => [:index, :create]
-          api_resources :puppet_modules, :only => [:index]
         end
 
         api_resources :errata, :only => [:index, :show] do
           collection do
             get :auto_complete_search
@@ -295,16 +291,10 @@
               put :enable
               put :disable
             end
           end
         end
-        api_resources :puppet_modules, :only => [:index, :show] do
-          collection do
-            get :auto_complete_search
-            get :compare
-          end
-        end
 
         api_resources :repositories, :only => [:index, :create, :show, :destroy, :update] do
           collection do
             get :auto_complete_search
             get :repository_types
@@ -393,11 +383,10 @@
 
           api_resources :packages, :only => [:index, :show]
           api_resources :package_groups, :only => [:index, :show]
           api_resources :files, :only => [:index, :show], :controller => 'file_units'
           api_resources :errata, :only => [:index, :show], :constraints => {:id => /[0-9a-zA-Z\-\+%_.:]+/}
-          api_resources :puppet_modules, :only => [:index, :show]
           api_resources :docker_manifests, :only => [:index, :show]
           api_resources :docker_manifest_lists, :only => [:index, :show]
           api_resources :docker_tags, :only => [:index, :show]
           api_resources :debs, :only => [:index, :show]
           api_resources :module_streams, :only => [:index, :show]
@@ -408,10 +397,9 @@
           api_resources :content_uploads, :controller => :content_uploads, :only => [:create, :destroy, :update]
 
           member do
             get :gpg_key_content
             put :remove_packages, :action => :remove_content
-            put :remove_puppet_modules, :action => :remove_content
             put :remove_docker_manifests, :action => :remove_content
             put :remove_content
             post :sync
             post :verify_checksum
             post :export