Revert "Merge pull request #19 from cfcosta/middleware-api-endpoints"

This reverts commit 02f47ff, reversing changes made to ef8a010.
ManageIQ · Jan 2, 2018 · 294567f · 294567f
1 parent fced14c
commit 294567f
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 496 deletions.
diff --git a/app/controllers/api/middleware_datasources_controller.rb b/app/controllers/api/middleware_datasources_controller.rb
diff --git a/app/controllers/api/middleware_deployments_controller.rb b/app/controllers/api/middleware_deployments_controller.rb
diff --git a/app/controllers/api/middleware_domains_controller.rb b/app/controllers/api/middleware_domains_controller.rb
diff --git a/app/controllers/api/middleware_messagings_controller.rb b/app/controllers/api/middleware_messagings_controller.rb
diff --git a/app/controllers/api/middleware_servers_controller.rb b/app/controllers/api/middleware_servers_controller.rb
diff --git a/config/api.yml b/config/api.yml
@@ -1474,91 +1474,6 @@
       :get:
       - :name: read
         :identifier: metrics_view
-  :middleware_datasources:
-    :description: Middleware Datasources
-    :klass: MiddlewareDatasource
-    :options:
-    - :collection
-    :verbs: *gp
-    :collection_actions:
-      :get:
-      - :name: read
-        :identifier: middleware_datasource_show_list
-      :post:
-      - :name: query
-        :identifier: middleware_datasource_show_list
-    :resource_actions:
-      :get:
-      - :name: read
-        :identifier: middleware_datasource_show
-  :middleware_deployments:
-    :description: Middleware Deployments
-    :klass: MiddlewareDeployment
-    :options:
-    - :collection
-    :verbs: *gp
-    :collection_actions:
-      :get:
-      - :name: read
-        :identifier: middleware_deployment_show_list
-      :post:
-      - :name: query
-        :identifier: middleware_deployment_show_list
-    :resource_actions:
-      :get:
-      - :name: read
-        :identifier: middleware_deployment_show
-  :middleware_domains:
-    :description: Middleware Domains
-    :klass: MiddlewareDomain
-    :options:
-    - :collection
-    :verbs: *gp
-    :collection_actions:
-      :get:
-      - :name: read
-        :identifier: middleware_domain_show_list
-      :post:
-      - :name: query
-        :identifier: middleware_domain_show_list
-    :resource_actions:
-      :get:
-      - :name: read
-        :identifier: middleware_domain_show
-  :middleware_messagings:
-    :description: Middleware Messagings
-    :klass: MiddlewareMessaging
-    :options:
-    - :collection
-    :verbs: *gp
-    :collection_actions:
-      :get:
-      - :name: read
-        :identifier: middleware_messaging_show_list
-      :post:
-      - :name: query
-        :identifier: middleware_messaging_show_list
-    :resource_actions:
-      :get:
-      - :name: read
-        :identifier: middleware_messaging_show
-  :middleware_servers:
-    :description: Middleware Servers
-    :klass: MiddlewareServer
-    :options:
-    - :collection
-    :verbs: *gp
-    :collection_actions:
-      :get:
-      - :name: read
-        :identifier: middleware_server_show_list
-      :post:
-      - :name: query
-        :identifier: middleware_server_show_list
-    :resource_actions:
-      :get:
-      - :name: read
-        :identifier: middleware_server_show
   :network_routers:
     :description: Network_Routers
     :identifier: network_router

diff --git a/spec/requests/collections_spec.rb b/spec/requests/collections_spec.rb
@@ -161,31 +161,6 @@ def test_collection_bulk_query(collection, collection_url, klass, id = nil)
       test_collection_query(:hosts, api_hosts_url, Host, :guid)
     end
 
-    it "query Middleware Datasources" do
-      FactoryGirl.create(:middleware_datasource)
-      test_collection_query(:middleware_datasources, api_middleware_datasources_url, MiddlewareDatasource)
-    end
-
-    it "query Middleware Deployments" do
-      FactoryGirl.create(:middleware_deployment)
-      test_collection_query(:middleware_deployments, api_middleware_deployments_url, MiddlewareDeployment)
-    end
-
-    it "query Middleware Domains" do
-      FactoryGirl.create(:middleware_domain)
-      test_collection_query(:middleware_domains, api_middleware_domains_url, MiddlewareDomain)
-    end
-
-    it "query Middleware Messagings" do
-      FactoryGirl.create(:middleware_messaging)
-      test_collection_query(:middleware_messagings, api_middleware_messagings_url, MiddlewareMessaging)
-    end
-
-    it "query Middleware Servers" do
-      FactoryGirl.create(:middleware_server)
-      test_collection_query(:middleware_servers, api_middleware_servers_url, MiddlewareServer)
-    end
-
     it "query Pictures" do
       FactoryGirl.create(:picture)
       test_collection_query(:pictures, api_pictures_url, Picture)
@@ -489,31 +464,6 @@ def test_collection_bulk_query(collection, collection_url, klass, id = nil)
       test_collection_bulk_query(:hosts, api_hosts_url, Host)
     end
 
-    it "bulk query MiddlewareDatasources" do
-      FactoryGirl.create(:middleware_datasource)
-      test_collection_bulk_query(:middleware_datasources, api_middleware_datasources_url, MiddlewareDatasource)
-    end
-
-    it "bulk query MiddlewareDeployments" do
-      FactoryGirl.create(:middleware_deployment)
-      test_collection_bulk_query(:middleware_deployments, api_middleware_deployments_url, MiddlewareDeployment)
-    end
-
-    it "bulk query MiddlewareDomains" do
-      FactoryGirl.create(:middleware_domain)
-      test_collection_bulk_query(:middleware_domains, api_middleware_domains_url, MiddlewareDomain)
-    end
-
-    it "bulk query MiddlewareMessaging" do
-      FactoryGirl.create(:middleware_messaging)
-      test_collection_bulk_query(:middleware_messagings, api_middleware_messagings_url, MiddlewareMessaging)
-    end
-
-    it "bulk query MiddlewareServer" do
-      FactoryGirl.create(:middleware_server)
-      test_collection_bulk_query(:middleware_servers, api_middleware_servers_url, MiddlewareServer)
-    end
-
     it 'bulk query NetworkRouters' do
       FactoryGirl.create(:network_router)
       test_collection_bulk_query(:network_routers, api_network_routers_url, NetworkRouter)

diff --git a/spec/requests/middleware_datasources_spec.rb b/spec/requests/middleware_datasources_spec.rb
diff --git a/spec/requests/middleware_deployments_spec.rb b/spec/requests/middleware_deployments_spec.rb
diff --git a/spec/requests/middleware_domains_spec.rb b/spec/requests/middleware_domains_spec.rb