foreman_docker 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 312b5ebf35209421ab37d4f6ce21b42f5c8a4f4c
-  data.tar.gz: a62f11d57a4d7eaadade21338983bf135883b7e8
+  metadata.gz: 535366638d0c74fc0d0902bf69a124ef157d4baf
+  data.tar.gz: f4f6b1a8d0d816e58b2123ab7c93a44867b6172a
 SHA512:
-  metadata.gz: 5bbd89c9d4efe80997326ebc6fb46487144e443628de9dfeca2ee8e319bbd0cadee4c79ac9bf75d97eda83ccebb3f3457bc1301955610d11e4573d198581e438
-  data.tar.gz: 9a93d2c256eec38df60fa1d4d3c83c94f99641cef7f3960978f6c2da2ab4edc215c7ab3aa0098a4b7358cfd958d29e8ce02c1f80750e6fa81353d5b153d21df5
+  metadata.gz: 2d3ff95541102881f8a73b04d185a2715caf0f28e30d8e5cb2bfa592fa6916abfecb8b58184d70a286ca70d663713bafeb5c4737415d5acab79745bf507bfb29
+  data.tar.gz: d3f63fa79b9b614a44f6f44f45910b6a3ece99aa47524265984991f135b10075162fb2dec22c58ca47270d80ccd3cc397dbc39b4f487eeb9eb92f4525b7dd246

data/app/controllers/api/v2/containers_controller.rb

@@ -14,14 +14,16 @@ module Api
       api :GET, '/compute_resources/:compute_resource_id/containers/',
           N_('List all containers in a compute resource')
       param :compute_resource_id, :identifier
-      param_group :pagination, ::Api::V2::BaseController
+      param_group :search_and_pagination, ::Api::V2::BaseController
 
       def index
         if params[:compute_resource_id].present?
-          @containers = Container.where(:compute_resource_id => params[:compute_resource_id])
+          scoped = Container.where(:compute_resource_id => params[:compute_resource_id])
         else
-          @containers = Container.all
+          scoped = Container.scoped
         end
+        @containers = scoped.search_for(params[:search], :order => params[:order])
+                      .paginate(:page => params[:page])
       end
 
       api :GET, '/containers/:id/', N_('Show a container')
@@ -38,13 +40,16 @@ module Api
           param :name, String, :required => true
           param_group :taxonomies, ::Api::V2::BaseController
           param :compute_resource_id, :identifier, :required => true
-          param :registry_id, :identifier, :desc => N_('Registry this container will have to use
-                                                        to get the image')
-          param :image, String, :desc => N_('Image to use to create the container.
-                                            Format should be repository:tag, e.g: centos:7')
+          param :registry_id, :identifier, :desc => N_('Registry this container will have to
+                                                        use to get the image')
+          param :repository_name, String, :required => true,
+                                          :desc => N_('Name of the repository to use
+                                                       to create the container. e.g: centos')
+          param :tag, String, :required => true,
+                              :desc => N_('Tag to use to create the container. e.g: latest')
           param :tty, :bool
           param :entrypoint, String
-          param :cmd, String
+          param :command, String, :required => true
           param :memory, String
           param :cpu_shares, :number
           param :cpu_sets, String
@@ -52,7 +57,9 @@ module Api
           param :attach_stdout, :bool
           param :attach_stdin, :bool
           param :attach_stderr, :bool
-          param :katello, :bool
+          param :capsule_id, :identifier, :desc => N_('The capsule this container will have to use
+                                                       to get the image. Relevant for images
+                                                       retrieved from katello registry.')
         end
       end
 
@@ -123,14 +130,20 @@ module Api
 
       private
 
-      def set_wizard_state
-        wizard_properties = { :preliminary   => [:compute_resource_id],
-                              :image         => [:registry_id, :repository_name, :tag, :katello],
-                              :configuration => [:name, :command, :entrypoint, :cpu_set,
-                                                 :cpu_shares, :memory],
-                              :environment   => [:tty, :attach_stdin, :attach_stdout,
-                                                 :attach_stderr] }
+      def wizard_properties
+        wizard_props = { :preliminary => [:compute_resource_id],
+                         :image => [:registry_id, :repository_name, :tag],
+                         :configuration => [:name, :command, :entrypoint, :cpu_set,
+                                            :cpu_shares, :memory],
+                         :environment => [:tty, :attach_stdin, :attach_stdout,
+                                          :attach_stderr] }
+        if DockerContainerWizardStates::Image.attribute_names.include?("capsule_id")
+          wizard_props[:image] << :capsule_id
+        end
+        wizard_props
+      end
 
+      def set_wizard_state
         wizard_state = DockerContainerWizardState.create
         wizard_properties.each do |step, properties|
           property_values = properties.each_with_object({}) do |property, values|

data/app/models/container.rb

@@ -11,6 +11,8 @@ class Container < ActiveRecord::Base
   accepts_nested_attributes_for :environment_variables, :allow_destroy => true
   include ForemanDocker::ParameterValidators
 
+  scoped_search :on => :name
+
   attr_accessible :command, :repository_name, :name, :compute_resource_id, :entrypoint,
                   :cpu_set, :cpu_shares, :memory, :tty, :attach_stdin, :registry_id,
                   :attach_stdout, :attach_stderr, :tag, :uuid, :environment_variables_attributes,

data/app/models/docker_container_wizard_state.rb

@@ -15,7 +15,6 @@ class DockerContainerWizardState < ActiveRecord::Base
     { :repository_name     => image.repository_name,
       :tag                 => image.tag,
       :registry_id         => image.registry_id,
-      :katello             => image.katello?,
       :name                => configuration.name,
       :compute_resource_id => preliminary.compute_resource_id,
       :tty                 => environment.tty,

data/db/migrate/20150303175646_remove_katello_flag_from_containers.rb

@@ -0,0 +1,9 @@
+class RemoveKatelloFlagFromContainers < ActiveRecord::Migration
+  def up
+    remove_column :containers, :katello
+  end
+
+  def down
+    add_column :containers, :katello, :boolean
+  end
+end

data/lib/foreman_docker/version.rb

@@ -1,3 +1,3 @@
 module ForemanDocker
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end

data/test/functionals/api/v2/containers_controller_test.rb

@@ -9,9 +9,20 @@ module Api
         assert_template 'index'
       end
 
+      test 'index can be filtered by name' do
+        %w(thomas clayton wolfe).each do |name|
+          FactoryGirl.create(:container, :name => name)
+        end
+        get :index, { :search => 'name = thomas' }, set_session_user
+        assert_response :success
+        assert_equal 1, assigns(:containers).length
+      end
+
       context 'container operations' do
         setup do
           @container = FactoryGirl.create(:container, :name => 'foo')
+          @registry = FactoryGirl.create(:docker_registry)
+          @compute_resource = FactoryGirl.create(:docker_cr)
         end
 
         test 'logs returns latest lines of container log' do
@@ -59,9 +70,53 @@ module Api
         end
 
         test 'creates a container with correct params' do
+          repository_name = "centos"
+          tag = "7"
+          name = "foo"
+          registry_uri = URI.parse(@registry.url)
           Service::Containers.any_instance.expects(:pull_image).returns(true)
-          Service::Containers.any_instance.expects(:start_container).returns(true)
-          post :create, :container => { :name => 'foo', :registry_id => 3, :image => 'centos:7' }
+          Service::Containers.any_instance
+            .expects(:start_container).returns(true).with do |container|
+            container.must_be_kind_of(Container)
+            container.repository_name.must_equal(repository_name)
+            container.tag.must_equal(tag)
+            container.compute_resource_id.must_equal(@compute_resource.id)
+            container.name.must_equal(name)
+            container.repository_pull_url.must_include(registry_uri.host)
+            container.repository_pull_url.must_include("#{repository_name}:#{tag}")
+          end
+          post :create, :container => { :compute_resource_id => @compute_resource.id,
+                                        :name => name,
+                                        :registry_id => @registry.id,
+                                        :repository_name => repository_name,
+                                        :tag => tag }
+          assert_response :created
+        end
+
+        test 'creates a katello container with correct params' do
+          DockerContainerWizardStates::Image.class_eval do
+            attr_accessor :capsule_id
+          end
+          DockerContainerWizardStates::Image.attribute_names.stubs(:include?).returns(true)
+          repository_name = "katello_centos"
+          tag = "7"
+          name = "foo"
+          capsule_id = "10000"
+          Service::Containers.any_instance.expects(:start_container!)
+            .returns(@container).with do |wizard_state|
+            wizard_state.must_be_kind_of(DockerContainerWizardState)
+            container_attributes = wizard_state.container_attributes
+            container_attributes[:repository_name].must_equal(repository_name)
+            container_attributes[:tag].must_equal(tag)
+            container_attributes[:compute_resource_id].must_equal(@compute_resource.id)
+            container_attributes[:name].must_equal(name)
+            wizard_state.image.capsule_id.must_equal(capsule_id)
+          end
+          post :create, :container => { :compute_resource_id => @compute_resource.id,
+                                        :name => name,
+                                        :capsule_id => capsule_id,
+                                        :repository_name => repository_name,
+                                        :tag => tag }
           assert_response :created
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -28,14 +28,14 @@ dependencies:
   name: wicked
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: Provision and manage Docker containers and images from Foreman.
@@ -120,6 +120,7 @@ files:
 - db/migrate/20141222113313_create_wizard_states.rb
 - db/migrate/20150122011747_add_katello_flag_to_docker_wizard_image.rb
 - db/migrate/20150129054944_add_katello_flag_to_containers.rb
+- db/migrate/20150303175646_remove_katello_flag_from_containers.rb
 - lib/foreman_docker.rb
 - lib/foreman_docker/engine.rb
 - lib/foreman_docker/tasks/test.rake
@@ -149,33 +150,32 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provision and manage Docker containers and images from Foreman
 test_files:
-- test/factories/compute_resources.rb
-- test/factories/containers.rb
-- test/factories/docker_registry.rb
-- test/test_plugin_helper.rb
 - test/functionals/api/v2/containers_controller_test.rb
-- test/functionals/containers_controller_test.rb
 - test/functionals/containers_steps_controller_test.rb
 - test/functionals/image_search_controller_test.rb
-- test/integration/container_steps_test.rb
-- test/integration/container_test.rb
+- test/functionals/containers_controller_test.rb
+- test/factories/docker_registry.rb
+- test/factories/compute_resources.rb
+- test/factories/containers.rb
 - test/units/container_test.rb
-- test/units/containers_service_test.rb
 - test/units/docker_registry_test.rb
 - test/units/registry_api_test.rb
-has_rdoc: 
+- test/units/containers_service_test.rb
+- test/test_plugin_helper.rb
+- test/integration/container_steps_test.rb
+- test/integration/container_test.rb