Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove oVirt provider code #118

Merged
merged 1 commit into from
Apr 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ gemspec
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"

# This is needed because some of the smart analysis tests scripts, insde the 'lib/gems/pending/MiqVm/test' directory,
# use the oVirt provider inventory classes.
gem "manageiq-providers-ovirt", :require => false, :git => "https://github.com/ManageIQ/manageiq-providers-ovirt.git", :branch => "master"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once this is merged, we'll need to open GH issue in manageiq-releasen repo to update the branch name when we cut gaprindashvili.


group :test do
gem "simplecov", :require => false
gem "codeclimate-test-reporter", "~> 1.0.0", :require => false
Expand Down
4 changes: 2 additions & 2 deletions lib/gems/pending/MiqVm/test/rhevmTest.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'ostruct'
require 'MiqVm/MiqVm'
require 'ovirt'
require 'ovirt_provider/inventory/ovirt_inventory'
require 'manageiq/providers/ovirt/legacy/inventory'
Ovirt.logger = $rhevm_log if $rhevm_log

RHEVM_SERVER = raise "please define RHEVM_SERVER"
Expand All @@ -26,7 +26,7 @@ def format(event)

begin

$rhevm = OvirtInventory.new(
$rhevm = ManageIQ::Providers::Ovirt::Legacy::Inventory.new(
:server => RHEVM_SERVER,
:port => RHEVM_PORT,
:domain => RHEVM_DOMAIN,
Expand Down
41 changes: 0 additions & 41 deletions lib/gems/pending/ovirt_provider/events/ovirt_event_monitor.rb

This file was deleted.

205 changes: 0 additions & 205 deletions lib/gems/pending/ovirt_provider/inventory/ovirt_inventory.rb

This file was deleted.

1 change: 0 additions & 1 deletion manageiq-gems-pending.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ Gem::Specification.new do |s|
s.add_runtime_dependency "nokogiri", "~>1.6.8"
s.add_runtime_dependency "openscap", "~>0.4.3"
s.add_runtime_dependency "ovirt", "~>0.15.1"
s.add_runtime_dependency "parallel", "~>1.9" # For OvirtInventory
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bdunne Even though this is being removed and the comment says "For OvirtInventory", can you please verify this is needed by anyone else that was getting it automatically? azure comes to mind, and also the core repo, but I'm not sure what else.

s.add_runtime_dependency "pg", "~>0.18.2"
s.add_runtime_dependency "pg-dsn_parser", "~>0.1.0"
s.add_runtime_dependency "psych", "~>2.0.12"
Expand Down