Merge pull request #13681 from abellotti/api_options_subcollections

Api collection OPTIONS Enhancement to expose list of supported subcollections
ManageIQ · Jan 27, 2017 · 479460f · 479460f
2 parents 2bec755 + 2395855
commit 479460f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/app/controllers/api/base_controller/renderer.rb b/app/controllers/api/base_controller/renderer.rb
@@ -436,6 +436,7 @@ def render_options(resource, data = {})
                                        collection.virtual_reflections.keys.collect(&:to_s)).sort
             }
           end
+        options[:subcollections] = Array(collection_config[resource].subcollections).sort
         options[:data] = data
         render :json => options
       end

diff --git a/spec/requests/api/arbitration_rule_spec.rb b/spec/requests/api/arbitration_rule_spec.rb
@@ -185,10 +185,12 @@
 
       attributes = (ArbitrationRule.attribute_names - ArbitrationRule.virtual_attribute_names).sort.as_json
       reflections = (ArbitrationRule.reflections.keys | ArbitrationRule.virtual_reflections.keys.collect(&:to_s)).sort
+      subcollections = Array(Api::ApiConfig.collections[:arbitration_rules].subcollections).collect(&:to_s).sort
       expected = {
         'attributes'         => attributes,
         'virtual_attributes' => ArbitrationRule.virtual_attribute_names.sort.as_json,
         'relationships'      => reflections,
+        'subcollections'     => subcollections,
         'data'               => {
           'field_values' => ArbitrationRule.field_values
         }

diff --git a/spec/requests/api/querying_spec.rb b/spec/requests/api/querying_spec.rb
@@ -698,6 +698,7 @@ def create_vms_by_name(names)
         'attributes'         => (Vm.attribute_names - Vm.virtual_attribute_names).sort.as_json,
         'virtual_attributes' => Vm.virtual_attribute_names.sort.as_json,
         'relationships'      => (Vm.reflections.keys | Vm.virtual_reflections.keys.collect(&:to_s)).sort,
+        'subcollections'     => Array(Api::ApiConfig.collections[:vms].subcollections).collect(&:to_s).sort,
         'data'               => {}
       }
       run_options(vms_url)