Merge pull request #15523 from lfu/refactor_container_manager

Move Openshift specific code into its provider directory.
ManageIQ · Aug 2, 2017 · 1fdd17e · 1fdd17e
2 parents 73d95e2 + 7bb28aa
commit 1fdd17e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 66 deletions.
diff --git a/app/models/container_template.rb b/app/models/container_template.rb
@@ -12,70 +12,4 @@ class ContainerTemplate < ApplicationRecord
   serialize :objects, Array
 
   acts_as_miq_taggable
-
-  MIQ_ENTITY_MAPPING = {
-    "Route"                 => ContainerRoute,
-    "Build"                 => ContainerBuildPod,
-    "BuildConfig"           => ContainerBuild,
-    "Template"              => ContainerTemplate,
-    "ResourceQuota"         => ContainerQuota,
-    "LimitRange"            => ContainerLimit,
-    "ReplicationController" => ContainerReplicator,
-    "PersistentVolumeClaim" => PersistentVolumeClaim,
-    "Pod"                   => ContainerGroup,
-    "Service"               => ContainerService,
-  }.freeze
-
-  def instantiate(params, project = nil)
-    project ||= container_project.name
-    processed_template = process_template(ext_management_system.connect,
-                                          :metadata   => {
-                                            :name      => name,
-                                            :namespace => project
-                                          },
-                                          :objects    => objects,
-                                          :parameters => params)
-    create_objects(processed_template['objects'], project)
-    @created_objects.each { |obj| obj[:miq_class] = MIQ_ENTITY_MAPPING[obj[:kind]] }
-  end
-
-  def process_template(client, template)
-    client.process_template(template)
-  rescue KubeException => e
-    raise MiqException::MiqProvisionError, "Unexpected Exception while processing template: #{e}"
-  end
-
-  def create_objects(objects, project)
-    @created_objects = []
-    objects.each { |obj| @created_objects << create_object(obj, project).to_h }
-  end
-
-  def create_object(obj, project)
-    obj = obj.symbolize_keys
-    obj[:metadata][:namespace] = project
-    method_name = "create_#{obj[:kind].underscore}"
-    begin
-      ext_management_system.connect_client(obj[:apiVersion], method_name).send(method_name, obj)
-    rescue KubeException => e
-      rollback_objects(@created_objects)
-      raise MiqException::MiqProvisionError, "Unexpected Exception while creating object: #{e}"
-    end
-  end
-
-  # rollback_objects cannot catch children objects created during the template instantiation and therefore those objects
-  # will remain in the cluster.
-  def rollback_objects(objects)
-    objects.each { |obj| rollback_object(obj) }
-  end
-
-  def rollback_object(obj)
-    method_name = "delete_#{obj[:kind].underscore}"
-    begin
-      ext_management_system.connect_client(obj[:apiVersion], method_name).send(method_name,
-                                                                               obj[:metadata][:name],
-                                                                               obj[:metadata][:namespace])
-    rescue KubeException => e
-      _log.error("Unexpected Exception while deleting object: #{e}")
-    end
-  end
 end
diff --git a/app/models/manageiq/providers/container_manager/container_template.rb b/app/models/manageiq/providers/container_manager/container_template.rb
@@ -0,0 +1,2 @@
+class ManageIQ::Providers::ContainerManager::ContainerTemplate < ContainerTemplate
+end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		class ManageIQ::Providers::ContainerManager::ContainerTemplate < ContainerTemplate
		end