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.

Sign up for GitHub

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

Jump to bottom

ovn: introducing ovn as ovirt's network provider #15929

Merged
merged 1 commit into from
Oct 3, 2017
Merged

ovn: introducing ovn as ovirt's network provider #15929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/models/cloud_tenant.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class CloudTenant < ApplicationRecord
include NewWithTypeStiMixin
extend ActsAsTree::TreeWalker

belongs_to :ext_management_system, :foreign_key => "ems_id", :class_name => "ManageIQ::Providers::CloudManager"
belongs_to :ext_management_system, :foreign_key => "ems_id"
has_one :source_tenant, :as => :source, :class_name => 'Tenant'
has_many :security_groups
has_many :cloud_networks
Expand Down
2 changes: 1 addition & 1 deletion app/models/mixins/has_network_manager_mixin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module HasNetworkManagerMixin

def ensure_managers
ensure_network_manager
network_manager.name = "#{name} Network Manager"
network_manager.name = "#{name} Network Manager" if network_manager
ensure_managers_zone_and_provider_region
end

Expand Down
1 change: 1 addition & 0 deletions config/permissions.tmpl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
- ems-type:openstack
- ems-type:openstack_infra
- ems-type:openstack_network
- ems-type:redhat_network
- ems-type:rhevm
- ems-type:scvmm
- ems-type:swift
Expand Down
6 changes: 6 additions & 0 deletions lib/workers/miq_worker_types.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
"ManageIQ::Providers::Redhat::InfraManager::EventCatcher" => %i(manageiq_default),
"ManageIQ::Providers::Redhat::InfraManager::MetricsCollectorWorker" => %i(manageiq_default),
"ManageIQ::Providers::Redhat::InfraManager::RefreshWorker" => %i(manageiq_default),
"ManageIQ::Providers::Redhat::NetworkManager::EventCatcher" => %i(manageiq_default),
"ManageIQ::Providers::Redhat::NetworkManager::MetricsCollectorWorker" => %i(manageiq_default),
"ManageIQ::Providers::Redhat::NetworkManager::RefreshWorker" => %i(manageiq_default),
"ManageIQ::Providers::StorageManager::CinderManager::RefreshWorker" => %i(manageiq_default),
"ManageIQ::Providers::StorageManager::SwiftManager::RefreshWorker" => %i(manageiq_default),
"ManageIQ::Providers::Vmware::CloudManager::EventCatcher" => %i(manageiq_default),
Expand Down Expand Up @@ -80,6 +83,7 @@
ManageIQ::Providers::Vmware::InfraManager::MetricsCollectorWorker
ManageIQ::Providers::Openstack::CloudManager::MetricsCollectorWorker
ManageIQ::Providers::Openstack::NetworkManager::MetricsCollectorWorker
ManageIQ::Providers::Redhat::NetworkManager::MetricsCollectorWorker
ManageIQ::Providers::Openstack::InfraManager::MetricsCollectorWorker
EmbeddedAnsibleWorker
MiqReportingWorker
Expand Down Expand Up @@ -107,6 +111,7 @@
ManageIQ::Providers::Redhat::InfraManager::RefreshWorker
ManageIQ::Providers::Openstack::CloudManager::RefreshWorker
ManageIQ::Providers::Openstack::NetworkManager::RefreshWorker
ManageIQ::Providers::Redhat::NetworkManager::RefreshWorker
ManageIQ::Providers::Openstack::InfraManager::RefreshWorker
ManageIQ::Providers::StorageManager::CinderManager::RefreshWorker
ManageIQ::Providers::StorageManager::SwiftManager::RefreshWorker
Expand All @@ -124,6 +129,7 @@
ManageIQ::Providers::Redhat::InfraManager::EventCatcher
ManageIQ::Providers::Openstack::CloudManager::EventCatcher
ManageIQ::Providers::Openstack::NetworkManager::EventCatcher
ManageIQ::Providers::Redhat::NetworkManager::EventCatcher
ManageIQ::Providers::Openstack::InfraManager::EventCatcher
ManageIQ::Providers::Amazon::CloudManager::EventCatcher
ManageIQ::Providers::Azure::CloudManager::EventCatcher
Expand Down
9 changes: 7 additions & 2 deletions spec/factories/ext_management_system.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,14 @@
end

factory :ems_redhat,
:parent => :ems_redhat_with_ensure_managers do
after(:build) { |ems_redhat| ems_redhat.class.skip_callback(:save, :before, :ensure_managers, :raise => false) }
end

factory :ems_redhat_with_ensure_managers,
:aliases => ["manageiq/providers/redhat/infra_manager"],
:class => "ManageIQ::Providers::Redhat::InfraManager",
:parent => :ems_infra do
:class => "ManageIQ::Providers::Redhat::InfraManager",
:parent => :ems_infra do
end

factory :ems_redhat_v3,
Expand Down
1 change: 1 addition & 0 deletions spec/models/ext_management_system_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"openstack_network" => "OpenStack Network",
"lenovo_ph_infra" => "Lenovo XClarity",
"nuage_network" => "Nuage Network Manager",
"redhat_network" => "Redhat Network",
"rhevm" => "Red Hat Virtualization",
"scvmm" => "Microsoft System Center VMM",
"vmwarews" => "VMware vCenter",
Expand Down