-
Notifications
You must be signed in to change notification settings - Fork 898
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Contains provider, parser, refresher, refresh worker and persistence of container_project and container_route
- Loading branch information
Showing
19 changed files
with
256 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
class ContainerProject < ActiveRecord::Base | ||
include CustomAttributeMixin | ||
include ReportableMixin | ||
belongs_to :ext_management_system, :foreign_key => "ems_id" | ||
|
||
has_many :labels, :class_name => CustomAttribute, :as => :resource, :conditions => {:section => "labels"} | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
class ContainerRoute < ActiveRecord::Base | ||
include CustomAttributeMixin | ||
include ReportableMixin | ||
|
||
belongs_to :ext_management_system, :foreign_key => "ems_id" | ||
has_many :labels, :class_name => CustomAttribute, :as => :resource, :conditions => {:section => "labels"} | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
class EmsOpenshift < EmsContainer | ||
include ContainerProviderMixin | ||
|
||
# TODO: what about k8s entities? | ||
has_many :container_routes, :foreign_key => :ems_id, :dependent => :destroy | ||
has_many :container_projects, :foreign_key => :ems_id, :dependent => :destroy | ||
|
||
default_value_for :port, 8443 | ||
|
||
def self.ems_type | ||
@ems_type ||= "openshift".freeze | ||
end | ||
|
||
def self.description | ||
@description ||= "Openshift".freeze | ||
end | ||
|
||
def self.raw_connect(hostname, port) | ||
require 'openshift_client' | ||
api_endpoint = raw_api_endpoint(hostname, port) | ||
osclient = OpenshiftClient::Client.new(api_endpoint) | ||
# TODO: support real authentication using certificates | ||
osclient.ssl_options(:verify_ssl => OpenSSL::SSL::VERIFY_NONE) | ||
osclient | ||
end | ||
|
||
def kubernetes_connect | ||
require 'kubeclient' | ||
kube = Kubeclient::Client.new(api_endpoint) | ||
# TODO: support real authentication using certificates | ||
kube.ssl_options(:verify_ssl => OpenSSL::SSL::VERIFY_NONE) | ||
kube | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
module EmsRefresh::Parsers | ||
class Openshift < Kubernetes | ||
def ems_inv_to_hashes(inventory) | ||
# super(inventory) | ||
get_projects(inventory) | ||
get_routes(inventory) | ||
EmsRefresh.log_inv_debug_trace(@data, "data:") | ||
@data | ||
end | ||
|
||
def get_routes(inventory) | ||
process_collection(inventory["route"], :container_routes) { |n| parse_route(n) } | ||
end | ||
|
||
def get_projects(inventory) | ||
process_collection(inventory["project"], :container_projects) { |n| parse_project(n) } | ||
end | ||
|
||
def parse_project(project) | ||
new_result = parse_base_item(project) | ||
new_result.except!(:namespace) | ||
new_result.merge!( | ||
:labels => parse_labels(project), | ||
:display_name => project.displayName | ||
) | ||
p new_result | ||
new_result | ||
end | ||
|
||
def parse_route(route) | ||
new_result = parse_base_item(route) | ||
new_result.merge!( | ||
# TODO: persist tls | ||
:host => route.host, | ||
:labels => parse_labels(route), | ||
# TODO: this part needs to be modified to service_id instead | ||
:service_name => route.serviceName, | ||
:path => route.path | ||
) | ||
new_result | ||
end | ||
end | ||
end |
14 changes: 14 additions & 0 deletions
14
vmdb/app/models/ems_refresh/refreshers/openshift_refresher.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
module EmsRefresh | ||
module Refreshers | ||
class OpenshiftRefresher < BaseRefresher | ||
include EmsRefresherMixin | ||
|
||
def parse_inventory(ems, _targets = nil) | ||
all_entities = ems.with_provider_connection(&:all_entities) | ||
# all_entities.merge!(ems.kubernetes_connect.all_entities) | ||
EmsRefresh.log_inv_debug_trace(all_entities, "inv_hash:") | ||
EmsRefresh::Parsers::Openshift.ems_inv_to_hashes(all_entities) | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
class MiqEmsRefreshWorkerOpenshift < MiqEmsRefreshWorker | ||
def self.ems_class | ||
EmsOpenshift | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
module ContainerProviderMixin | ||
extend ActiveSupport::Concern | ||
|
||
included do | ||
|
||
has_many :container_nodes, :foreign_key => :ems_id, :dependent => :destroy | ||
has_many :container_groups, :foreign_key => :ems_id, :dependent => :destroy | ||
has_many :container_services, :foreign_key => :ems_id, :dependent => :destroy | ||
|
||
def self.raw_api_endpoint(hostname, port) | ||
URI::HTTPS.build(:host => hostname, :port => port.to_i) | ||
end | ||
|
||
# UI methods for determining availability of fields | ||
def supports_port? | ||
true | ||
end | ||
|
||
def api_endpoint | ||
raw_api_endpoint(hostname, port) | ||
end | ||
|
||
def connect(_options = {}) | ||
self.class.raw_connect(hostname, port) | ||
end | ||
|
||
def authentication_check | ||
# TODO: support real authentication using certificates | ||
true | ||
end | ||
|
||
def verify_credentials(_auth_type = nil, _options = {}) | ||
# TODO: support real authentication using certificates | ||
true | ||
end | ||
|
||
def authentication_status_ok?(_type = nil) | ||
# TODO: support real authentication using certificates | ||
true | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
class CreateContainerRoutes < ActiveRecord::Migration | ||
def up | ||
create_table :container_routes do |t| | ||
t.string :ems_ref | ||
t.string :name | ||
t.timestamp :creation_timestamp | ||
t.string :resource_version | ||
t.string :namespace | ||
t.string :host | ||
t.string :service_name | ||
t.string :path | ||
t.belongs_to :ems, :type => :bigint | ||
end | ||
add_index :container_routes, :ems_id | ||
end | ||
|
||
def down | ||
remove_index :container_routes, :ems_id | ||
drop_table :container_routes | ||
end | ||
end |
18 changes: 18 additions & 0 deletions
18
vmdb/db/migrate/20150414094834_create_container_projects.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
class CreateContainerProjects < ActiveRecord::Migration | ||
def up | ||
create_table :container_projects do |t| | ||
t.string :ems_ref | ||
t.string :name | ||
t.timestamp :creation_timestamp | ||
t.string :resource_version | ||
t.string :display_name | ||
t.belongs_to :ems, :type => :bigint | ||
end | ||
add_index :container_projects, :ems_id | ||
end | ||
|
||
def down | ||
remove_index :container_projects, :ems_id | ||
drop_table :container_projects | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
require 'workers/ems_refresh_worker' | ||
|
||
class EmsRefreshWorkerOpenshift < EmsRefreshWorker | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,7 @@ | |
foreman_configuration | ||
foreman_provisioning | ||
kubernetes | ||
openshift | ||
openstack | ||
openstack_infra | ||
rhevm | ||
|