Skip to content

Commit

Permalink
Merge pull request ManageIQ#14786 from jhernand/euwe_drop_support_for…
Browse files Browse the repository at this point in the history
…_multiple_ovirt_paths

[EUWE] Drop support for oVirt /api, always use /ovirt-engine/api
  • Loading branch information
simaishi authored Apr 21, 2017
2 parents c08afd1 + c9f9bf7 commit 35e1e13
Show file tree
Hide file tree
Showing 9 changed files with 3,582 additions and 3,790 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ def connect(options = {})
unless options[:skip_supported_api_validation] || supports_the_api_version?(version)
raise "version #{version} of the api is not supported by the provider"
end
# If there is API path stored in the endpoints table and use it:
path = options[:path] || default_endpoint.path
_log.info("Using stored API path '#{path}'.") unless path.blank?

server = options[:ip] || address
port = options[:port] || self.port
path = options[:path] || '/ovirt-engine/api'
username = options[:user] || authentication_userid(options[:auth_type])
password = options[:pass] || authentication_password(options[:auth_type])
service = options[:service] || "Service"
Expand All @@ -47,7 +45,7 @@ def connect(options = {})
connection = self.class.public_send(connect_method, server, port, path, username, password, service)

# Copy the API path to the endpoints table:
default_endpoint.path = version == 4 ? '/ovirt-engine/api' : connection.api_path
default_endpoint.path = path

connection
end
Expand Down
2,775 changes: 1,382 additions & 1,393 deletions spec/vcr_cassettes/manageiq/providers/redhat/infra_manager/refresher_3_0.yml

Large diffs are not rendered by default.

3,067 changes: 1,528 additions & 1,539 deletions spec/vcr_cassettes/manageiq/providers/redhat/infra_manager/refresher_3_1.yml

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 35e1e13

Please sign in to comment.