[FINE] Skip invalid container_images

.gitignore

@@ -72,7 +72,7 @@ public/pictures/
 public/ui/
 
 # spec/
-spec/replication/util/data/euwe_migrations
+spec/replication/util/data/*_migrations
 
 # tmp/
 tmp/*

Dockerfile

@@ -1,7 +1,7 @@
 FROM centos:7
 ENV container docker
 MAINTAINER ManageIQ https://github.com/ManageIQ/manageiq-appliance-build
-ARG REF=master
+ARG REF=fine
 
 # Set ENV, LANG only needed if building with docker-1.8
 ENV LANG en_US.UTF-8
@@ -61,6 +61,7 @@ RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
                    gdbm-devel              \
                    cronie                  \
                    logrotate               \
+                   http-parser             \
                    &&                      \
     yum clean all
 
@@ -161,7 +162,7 @@ EXPOSE 80 443
 # NAME is set via -n flag to ALL atomic commands (install,run,stop,uninstall)
 LABEL name="manageiq" \
       vendor="ManageIQ" \
-      version="Master" \
+      version="Fine" \
       release=${REF} \
       architecture="x86_64" \
       url="http://manageiq.org/" \

Gemfile

@@ -6,39 +6,39 @@ source 'https://rubygems.org'
 # VMDB specific gems
 #
 
-gem "manageiq-gems-pending", ">0", :require => 'manageiq-gems-pending', :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :branch => "master"
+gem "manageiq-gems-pending", ">0", :require => 'manageiq-gems-pending', :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :branch => "fine"
 # Modified gems for gems-pending.  Setting sources here since they are git references
 gem "handsoap", "~>0.2.5", :require => false, :git => "https://github.com/ManageIQ/handsoap.git", :tag => "v0.2.5-5"
 gem "rubywbem",            :require => false, :git => "https://github.com/ManageIQ/rubywbem.git", :branch => "rubywbem_0_1_0"
 
 # when using this Gemfile inside a providers Gemfile, the dependency for the provider is already declared
 unless dependencies.detect { |d| d.name == "manageiq-content" }
-  gem "manageiq-content", :git => "https://github.com/ManageIQ/manageiq-content", :branch => "master"
+  gem "manageiq-content", :git => "https://github.com/ManageIQ/manageiq-content", :branch => "fine"
 end
 unless dependencies.detect { |d| d.name == "manageiq-providers-amazon" }
-  gem "manageiq-providers-amazon", :git => "https://github.com/ManageIQ/manageiq-providers-amazon", :branch => "master"
+  gem "manageiq-providers-amazon", :git => "https://github.com/ManageIQ/manageiq-providers-amazon", :branch => "fine"
 end
 unless dependencies.detect { |d| d.name == "manageiq-providers-azure" }
-  gem "manageiq-providers-azure", :git => "https://github.com/ManageIQ/manageiq-providers-azure", :branch => "master"
+  gem "manageiq-providers-azure", :git => "https://github.com/ManageIQ/manageiq-providers-azure", :branch => "fine"
 end
 unless dependencies.detect { |d| d.name == "manageiq-providers-vmware" }
-  gem "manageiq-providers-vmware", :git => "https://github.com/ManageIQ/manageiq-providers-vmware", :branch => "master"
+  gem "manageiq-providers-vmware", :git => "https://github.com/ManageIQ/manageiq-providers-vmware", :branch => "fine"
 end
 
 unless dependencies.detect { |d| d.name == "manageiq-ui-classic" }
-  gem "manageiq-ui-classic", :git => "https://github.com/ManageIQ/manageiq-ui-classic", :branch => "master"
+  gem "manageiq-ui-classic", :git => "https://github.com/ManageIQ/manageiq-ui-classic", :branch => "fine"
 end
 
 unless dependencies.detect { |d| d.name == "manageiq-providers-lenovo" }
-  gem "manageiq-providers-lenovo", :git => "https://github.com/ManageIQ/manageiq-providers-lenovo", :branch => "master"
+  gem "manageiq-providers-lenovo", :git => "https://github.com/ManageIQ/manageiq-providers-lenovo", :branch => "fine"
 end
 
 # Unmodified gems
 gem "activerecord-session_store",     "~>1.0.0"
 gem "acts_as_list",                   "~>0.7.2"
 gem "acts_as_tree",                   "~>2.1.0" # acts_as_tree needs to be required so that it loads before ancestry
 gem "ancestry",                       "~>2.2.1",       :require => false
-gem "ansible_tower_client",           "~>0.10.0",      :require => false
+gem "ansible_tower_client",           "~>0.12.0",      :require => false
 gem "aws-sdk",                        "~>2",           :require => false
 gem "bundler",                        ">=1.11.1",      :require => false
 gem "color",                          "~>1.8"
@@ -47,7 +47,7 @@ gem "dalli",                          "~>2.7.4",       :require => false
 gem "default_value_for",              "~>3.0.2"
 gem "elif",                           "=0.1.0",        :require => false
 gem "fast_gettext",                   "~>1.2.0"
-gem "fog-google",                     ">=0.5.2",       :require => false
+gem "fog-google",                     "=0.5.2",        :require => false
 gem "gettext_i18n_rails",             "~>1.7.2"
 gem "gettext_i18n_rails_js",          "~>1.1.0"
 gem "google-api-client",              "~>0.8.6",       :require => false
@@ -127,7 +127,6 @@ unless ENV["APPLIANCE"]
     gem "capybara",         "~>2.5.0",  :require => false
     gem "coveralls",                    :require => false
     gem "factory_girl",     "~>4.5.0",  :require => false
-    gem "jasmine",                      :require => false
     gem "sqlite3",                      :require => false
     gem "timecop",          "~>0.7.3",  :require => false
     gem "vcr",              "~>3.0.0",  :require => false

LICENSE.txt

@@ -1,7 +1,7 @@
 Except where otherwise noted, all ManageIQ source files are covered by
 the following copyright and license notice:
 
-Copyright 2014-2016 ManageIQ Authors.
+Copyright 2014-2017 ManageIQ Authors.
 
                                  Apache License
                            Version 2.0, January 2004

README.md

@@ -3,16 +3,16 @@
 [![Build Status](https://travis-ci.org/ManageIQ/manageiq.svg)](https://travis-ci.org/ManageIQ/manageiq)
 [![Code Climate](https://codeclimate.com/github/ManageIQ/manageiq/badges/gpa.svg)](https://codeclimate.com/github/ManageIQ/manageiq)
 [![Codacy](https://api.codacy.com/project/badge/grade/9ffce48ccb924020ae8f9e698048e9a4)](https://www.codacy.com/app/ManageIQ/manageiq)
-[![Coverage Status](https://coveralls.io/repos/ManageIQ/manageiq/badge.svg?branch=master&service=github)](https://coveralls.io/github/ManageIQ/manageiq?branch=master)
+[![Coverage Status](https://coveralls.io/repos/ManageIQ/manageiq/badge.svg?branch=fine&service=github)](https://coveralls.io/github/ManageIQ/manageiq?branch=fine)
 [![Dependency Status](https://gemnasium.com/ManageIQ/manageiq.svg)](https://gemnasium.com/ManageIQ/manageiq)
-[![Security](https://hakiri.io/github/ManageIQ/manageiq/master.svg)](https://hakiri.io/github/ManageIQ/manageiq/master)
+[![Security](https://hakiri.io/github/ManageIQ/manageiq/fine.svg)](https://hakiri.io/github/ManageIQ/manageiq/fine)
 
 [![Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ManageIQ/manageiq?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Translate](https://img.shields.io/badge/translate-zanata-blue.svg)](https://translate.zanata.org/zanata/project/view/manageiq)
 [![License](http://img.shields.io/badge/license-APACHE2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
 
-[![Build history for master branch](https://buildstats.info/travisci/chart/ManageIQ/manageiq?branch=master&buildCount=50)](https://travis-ci.org/ManageIQ/manageiq/branches)
+[![Build history for master branch](https://buildstats.info/travisci/chart/ManageIQ/manageiq?branch=fine&buildCount=50)](https://travis-ci.org/ManageIQ/manageiq/branches)
 
 ## Discover, Optimize, and Control your Hybrid IT
 

VERSION

@@ -1 +1 @@
-master
+fine-3

app/controllers/api/authentications_controller.rb

@@ -3,7 +3,7 @@ class AuthenticationsController < BaseController
     def edit_resource(type, id, data)
       auth = resource_search(id, type, collection_class(:authentications))
       raise "Update not supported for #{authentication_ident(auth)}" unless auth.respond_to?(:update_in_provider_queue)
-      task_id = auth.update_in_provider_queue(data)
+      task_id = auth.update_in_provider_queue(data.deep_symbolize_keys)
       action_result(true, "Updating #{authentication_ident(auth)}", :task_id => task_id)
     rescue => err
       action_result(false, err.to_s)

app/controllers/api/base_controller/normalizer.rb

@@ -83,7 +83,8 @@ def normalize_time(value)
       def normalize_url(value)
         svalue = value.to_s
         pref   = @req.api_prefix
-        svalue.match(pref) ? svalue : "#{pref}/#{svalue}"
+        suffix = @req.api_suffix
+        svalue.match(pref) ? svalue : "#{pref}/#{svalue}#{suffix}"
       end
 
       #

app/controllers/api/base_controller/parser/request_adapter.rb

@@ -31,6 +31,10 @@ def api_prefix
           @api_prefix ||= "#{base}#{prefix}"
         end
 
+        def api_suffix
+          @api_suffix ||= "?provider_class=#{@params['provider_class']}" if @params['provider_class']
+        end
+
         def attributes
           @attributes ||= @params['attributes'].to_s.split(',')
         end

app/controllers/api/base_controller/renderer.rb

@@ -75,10 +75,12 @@ def get_reftype(type, reftype, resource, _opts = {})
         return reftype unless resource.respond_to?(:attributes)
 
         rclass = resource.class
-        if collection_class(type) != rclass
-          matched_type = collection_config.name_for_klass(rclass)
-        end
-        matched_type || reftype
+        collection_class = collection_class(type)
+
+        # Ensures hrefs are consistent with those of the collection they were requested from
+        return reftype if collection_class == rclass || collection_class.descendants.include?(rclass)
+
+        collection_config.name_for_klass(rclass) || reftype
       end
 
       #
@@ -163,6 +165,21 @@ def collection_search(is_subcollection, type, klass)
         Rbac.filtered(res, options)
       end
 
+      def virtual_attribute_search(resource, attribute)
+        if resource.class < ApplicationRecord
+          # is relation in 'attribute' variable plural in the model class (from 'resource.class') ?
+          if [:has_many, :has_and_belongs_to_many].include?(resource.class.reflection_with_virtual(attribute).try(:macro))
+            resource_attr = resource.public_send(attribute)
+            return resource_attr unless resource_attr.try(:first).kind_of?(ApplicationRecord)
+            Rbac.filtered(resource_attr)
+          else
+            Rbac.filtered_object(resource).try(:public_send, attribute)
+          end
+        else
+          resource.public_send(attribute)
+        end
+      end
+
       #
       # Let's expand subcollections for objects if asked for
       #
@@ -203,7 +220,7 @@ def expand_virtual_attributes(json, type, resource)
       def fetch_direct_virtual_attribute(type, resource, attr)
         return unless attr_accessible?(resource, attr)
         virtattr_accessor = virtual_attribute_accessor(type, attr)
-        value = virtattr_accessor.nil? ? resource.public_send(attr) : send(virtattr_accessor, resource)
+        value = virtattr_accessor ? send(virtattr_accessor, resource) : virtual_attribute_search(resource, attr)
         result = {attr => normalize_virtual(nil, attr, value, :ignore_nil => true)}
         # set nil vtype above to "#{type}/#{resource.id}/#{attr}" to support id normalization
         [value, result]
@@ -212,7 +229,7 @@ def fetch_direct_virtual_attribute(type, resource, attr)
       def fetch_indirect_virtual_attribute(_type, resource, base, attr, object_hash)
         query_related_objects(base, resource, object_hash)
         return unless attr_accessible?(object_hash[base], attr)
-        value = object_hash[base].public_send(attr)
+        value  = virtual_attribute_search(object_hash[base], attr)
         result = {attr => normalize_virtual(nil, attr, value, :ignore_nil => true)}
         # set nil vtype above to "#{type}/#{resource.id}/#{base.tr('.', '/')}/#{attr}" to support id normalization
         base.split(".").reverse_each { |level| result = {level => result} }

app/controllers/api/base_controller/results.rb

@@ -8,6 +8,7 @@ def action_result(success, message = nil, options = {})
         res[:message] = message if message.present?
         res[:result]  = options[:result] unless options[:result].nil?
         add_task_to_result(res, options[:task_id]) if options[:task_id].present?
+        add_parent_href_to_result(res, options[:parent_id]) if options[:parent_id].present?
         res
       end
 
@@ -16,8 +17,9 @@ def add_href_to_result(hash, type, id)
         hash
       end
 
-      def add_parent_href_to_result(hash)
-        hash[:href] = "#{@req.api_prefix}/#{@req.collection}/#{@req.c_id}"
+      def add_parent_href_to_result(hash, parent_id = nil)
+        return if hash[:href].present?
+        hash[:href] = "#{@req.api_prefix}/#{@req.collection}/#{parent_id ? parent_id : @req.c_id}"
         hash
       end
 

app/controllers/api/cloud_tenants_controller.rb

@@ -0,0 +1,4 @@
+module Api
+  class CloudTenantsController < BaseController
+  end
+end

app/controllers/api/configuration_script_sources_controller.rb

@@ -1,9 +1,11 @@
 module Api
   class ConfigurationScriptSourcesController < BaseController
+    include Subcollections::ConfigurationScriptPayloads
+
     def edit_resource(type, id, data)
       config_script_src = resource_search(id, type, collection_class(:configuration_script_sources))
       raise "Update not supported for #{config_script_src_ident(config_script_src)}" unless config_script_src.respond_to?(:update_in_provider_queue)
-      task_id = config_script_src.update_in_provider_queue(data)
+      task_id = config_script_src.update_in_provider_queue(data.deep_symbolize_keys)
       action_result(true, "Updating #{config_script_src_ident(config_script_src)}", :task_id => task_id)
     rescue => err
       action_result(false, err.to_s)
@@ -25,7 +27,7 @@ def create_resource(_type, _id, data)
       manager = resource_search(manager_id, :providers, collection_class(:providers))
       type = ConfigurationScriptSource.class_for_manager(manager)
       raise "ConfigurationScriptSource cannot be added to #{manager_ident(manager)}" unless type.respond_to?(:create_in_provider_queue)
-      task_id = type.create_in_provider_queue(manager.id, data.except('manager_resource'))
+      task_id = type.create_in_provider_queue(manager.id, data.except('manager_resource').deep_symbolize_keys)
       action_result(true, "Creating ConfigurationScriptSource for #{manager_ident(manager)}", :task_id => task_id)
     rescue => err
       action_result(false, err.to_s)

app/controllers/api/policies_controller.rb

@@ -13,10 +13,9 @@ def create_resource(type, _id, data = {})
 
     def edit_resource(type, id = nil, data = {})
       raise BadRequestError, "Must specify an id for editing a #{type} resource" unless id
-      assert_all_required_fields_exists(data, type, %w(conditions_ids policy_contents))
       policy = resource_search(id, type, collection_class(:policies))
       begin
-        add_policies_content(data, policy)
+        add_policies_content(data, policy) if data["policy_contents"]
         policy.conditions = Condition.where(:id => data.delete("conditions_ids")) if data["conditions_ids"]
         policy.update_attributes(data)
       rescue => err
@@ -46,7 +45,7 @@ def add_policies_content(data, policy)
       policy.miq_policy_contents.destroy_all
       data.delete("policy_contents").each do |policy_content|
         add_policy_content(policy_content, policy)
-      end if data["policy_contents"]
+      end
     end
 
     def add_policy_content(policy_content, policy)

app/controllers/api/providers_controller.rb

@@ -14,6 +14,7 @@ class ProvidersController < BaseController
     include Subcollections::PolicyProfiles
     include Subcollections::Tags
     include Subcollections::CloudNetworks
+    include Subcollections::CloudTenants
     include Subcollections::CustomAttributes
     include Subcollections::LoadBalancers
 

app/controllers/api/reports_controller.rb

@@ -7,9 +7,17 @@ class ReportsController < BaseController
 
     before_action :set_additional_attributes, :only => [:index, :show]
 
-    def run_resource(_type, id, _data)
-      report = MiqReport.find(id)
-      report_result = MiqReportResult.find(report.queue_generate_table)
+    def reports_search_conditions
+      MiqReport.for_user(User.current_user).where_clause.ast unless User.current_user.admin?
+    end
+
+    def find_reports(id)
+      MiqReport.for_user(User.current_user).find(id)
+    end
+
+    def run_resource(type, id, _data)
+      report = resource_search(id, type, MiqReport)
+      report_result = MiqReportResult.find(report.queue_generate_table(:userid => User.current_user.userid))
       run_report_result(true,
                         "running report #{report.id}",
                         :task_id          => report_result.miq_task_id,

app/controllers/api/results_controller.rb

@@ -2,6 +2,14 @@ module Api
   class ResultsController < BaseController
     before_action :set_additional_attributes, :only => [:index, :show]
 
+    def results_search_conditions
+      MiqReportResult.for_user(User.current_user).where_clause.ast
+    end
+
+    def find_results(id)
+      MiqReportResult.for_user(User.current_user).find(id)
+    end
+
     private
 
     def set_additional_attributes

app/controllers/api/services_controller.rb

@@ -22,17 +22,32 @@ def add_resource_resource(type, id, data)
       raise "Must specify a service href or id to add_resource to" unless id
       svc = resource_search(id, type, collection_class(type))
 
-      resource_href = data.fetch_path("resource", "href")
-      raise "Must specify a resource reference" unless resource_href
-
-      resource_type, resource_id = parse_href(resource_href)
-      raise "Invalid resource href specified #{resource_href}" unless resource_type && resource_id
-
-      resource = resource_search(resource_id, resource_type, collection_class(resource_type))
+      resource_type, resource = validate_resource(data)
       raise "Cannot assign #{resource_type} to #{service_ident(svc)}" unless resource.respond_to? :add_to_service
 
       resource.add_to_service(svc)
-      action_result(true, "Assigned resource #{resource_type} id:#{resource_id} to #{service_ident(svc)}")
+      action_result(true, "Assigned resource #{resource_type} id:#{resource.id} to #{service_ident(svc)}")
+    rescue => err
+      action_result(false, err.to_s)
+    end
+
+    def remove_resource_resource(type, id, data)
+      raise 'Must specify a resource to remove_resource from' unless id
+      svc = resource_search(id, type, collection_class(type))
+
+      resource_type, resource = validate_resource(data)
+
+      svc.remove_resource(resource)
+      action_result(true, "Unassigned resource #{resource_type} id:#{resource.id} from #{service_ident(svc)}")
+    rescue => err
+      action_result(false, err.to_s)
+    end
+
+    def remove_all_resources_resource(type, id, _data)
+      raise "Must specify a service href or id to remove resources from" unless id
+      svc = resource_search(id, type, collection_class(type))
+      svc.remove_all_resources
+      action_result(true, "Removed all resources from #{service_ident(svc)}")
     rescue => err
       action_result(false, err.to_s)
     end
@@ -103,6 +118,17 @@ def suspend_resource(type, id = nil, _data = nil)
 
     private
 
+    def validate_resource(data)
+      resource_href = data.fetch_path("resource", "href")
+      raise "Must specify a resource reference" unless resource_href
+
+      resource_type, resource_id = parse_href(resource_href)
+      raise "Invalid resource href specified #{resource_href}" unless resource_type && resource_id
+
+      resource = resource_search(resource_id, resource_type, collection_class(resource_type))
+      [resource_type, resource]
+    end
+
     def build_service_attributes(data)
       attributes                 = data.dup
       attributes['job_template'] = fetch_configuration_script(data['job_template']) if data['job_template']