foreman_docker 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535366638d0c74fc0d0902bf69a124ef157d4baf
-  data.tar.gz: f4f6b1a8d0d816e58b2123ab7c93a44867b6172a
+  metadata.gz: fd4bd81fe224e418f11ab1338a1f65101dc8c9b5
+  data.tar.gz: dd31c502a1885ecdd88621d33cb58bc7e12d2496
 SHA512:
-  metadata.gz: 2d3ff95541102881f8a73b04d185a2715caf0f28e30d8e5cb2bfa592fa6916abfecb8b58184d70a286ca70d663713bafeb5c4737415d5acab79745bf507bfb29
-  data.tar.gz: d3f63fa79b9b614a44f6f44f45910b6a3ece99aa47524265984991f135b10075162fb2dec22c58ca47270d80ccd3cc397dbc39b4f487eeb9eb92f4525b7dd246
+  metadata.gz: 509eae97cbccfe1572e5460f19c87514a868cb67afba233d4a32fdb9c419c5d0c2e10cea9ace9b5e3e9eed79a344264932e9630331dd01b23d058bb9b412bed3
+  data.tar.gz: 9056eddf57601b9055f9a060c91ece977e8cbefd9ee1362e205d6f843fd407a7515232e96febee0a211d28dab17c8b0f7aebfe2ec95e1ae369fdcbf9b91d83e1

data/README.md

@@ -88,10 +88,7 @@ That's it. You're now ready to create and manage containers in your new Docker c
 | >= 1.6         | 0.1.0 - 0.2.0   |
 | >= 1.7         | 1.0.0+          |
 
-We will follow [Semantic Versioning 2.0.0](http://semver.org/spec/v2.0.0.html). This means:
-* MAJOR versions: will break compatibility with the latest supported Foreman version. For instance, foreman-docker 1.0 breaks Foreman 1.6 compatibility.
-* MINOR versions: will enhance foreman-docker with features in a backwards-compatible manner.
-* PATCH versions: will contain bugfixes for the latest minor version in a backwards-compatible manner.
+See extras/RELEASE.md for more detailed information on compatibility and releases.
 
 ## How to contribute?
 

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

@@ -69,9 +69,17 @@ module Api
       param_group :container, :as => :create
 
       def create
-        @container = Service::Containers.new.start_container!(set_wizard_state)
-        set_container_taxonomies
-        process_response @container.save
+        service = Service::Containers.new
+        @container = service.start_container!(set_wizard_state)
+        if service.errors.any?
+          render :json => { :errors => service.errors,
+                            :full_messages => service.full_messages
+                          },
+                 :status => :unprocessable_entity
+        else
+          set_container_taxonomies
+          process_response @container.save
+        end
       rescue ActiveModel::MassAssignmentSecurity::Error => e
         render :json => { :error  => _("Wrong attributes: %s") % e.message },
                :status => :unprocessable_entity

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

@@ -0,0 +1,65 @@
+module Api
+  module V2
+    class RegistriesController < ::Api::V2::BaseController
+      before_filter :find_resource, :except => %w(index create)
+
+      resource_description do
+        resource_id 'registries'
+        api_version 'v2'
+        api_base_url '/docker/api/v2'
+      end
+
+      def_param_group :registry do
+        param :registry, Hash, :required => true, :action_aware => true do
+          param :name, String, :required => true
+          param :url, String, :required => true
+          param :description, String
+          param :username, String
+          param :password, String
+        end
+      end
+
+      api :GET, '/registries/', N_('List all docker registries')
+      param_group :search_and_pagination, ::Api::V2::BaseController
+      def index
+        @registries = DockerRegistry.search_for(params[:search], :order => params[:order])
+                      .paginate(:page => params[:page])
+      end
+
+      api :GET, '/registries/:id', N_("Show a docker registry")
+      param :id, :identifier, :required => true
+      def show
+      end
+
+      api :POST, '/registries/', N_('Create a docker registry')
+      param_group :registry, :as => :create
+      def create
+        @registry = DockerRegistry.new(params[:registry])
+        process_response @registry.save
+      end
+
+      api :PUT, '/registries/:id', N_('Update a docker registry')
+      param :id, :identifier, :required => true
+      param_group :registry, :as => :update
+      def update
+        process_response @registry.update_attributes(params[:registry])
+      end
+
+      api :DELETE, '/registries/:id/', N_('Delete a docker registry')
+      param :id, :identifier, :required => true
+      def destroy
+        process_response @registry.destroy
+      end
+
+      private
+
+      def resource_class
+        DockerRegistry
+      end
+
+      def docker_registry_url(registry)
+        registry_url(registry)
+      end
+    end
+  end
+end

data/app/controllers/containers/steps_controller.rb

@@ -16,7 +16,11 @@ module Containers
 
     def update
       if step == wizard_steps.last
-        create_container
+        if process_resource!(@state).nil?
+          render_wizard @state
+        else
+          create_container
+        end
       else
         render_wizard @state
       end

data/app/models/container.rb

@@ -11,12 +11,25 @@ class Container < ActiveRecord::Base
   accepts_nested_attributes_for :environment_variables, :allow_destroy => true
   include ForemanDocker::ParameterValidators
 
+  has_many :exposed_ports,  :dependent  => :destroy, :foreign_key => :reference_id,
+                            :inverse_of => :container,
+                            :class_name => 'ExposedPort',
+                            :validate => true
+
+  has_many :dns,  :dependent  => :destroy, :foreign_key => :reference_id,
+                  :inverse_of => :container,
+                  :class_name => 'ForemanDocker::Dns',
+                  :validate => true
+
+  accepts_nested_attributes_for :exposed_ports, :allow_destroy => true
   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,
-                  :katello
+                  :katello, :exposed_ports_attributes, :dns
+
+  validates :name, :uniqueness => { :scope => :compute_resource_id }
 
   def repository_pull_url
     repo = tag.blank? ? repository_name : "#{repository_name}:#{tag}"
@@ -32,10 +45,18 @@ class Container < ActiveRecord::Base
       'AttachStdout' => attach_stdout,          'AttachStdin'  => attach_stdin,
       'AttachStderr' => attach_stderr,          'CpuShares'    => cpu_shares,
       'Cpuset'       => cpu_set,
-      'Env' => environment_variables.map { |env| "#{env.name}=#{env.value}" } }
+      'Env' => environment_variables.map { |env| "#{env.name}=#{env.value}" },
+      'ExposedPorts' => Hash[*exposed_ports.map { |v| [v.name + "/" + v.value, {}] }.flatten],
+      'HostConfig' => {
+        'Dns' => dns.map { |env| "#{env.name}" }
+      } }
   end
 
   def in_fog
     @fog_container ||= compute_resource.vms.get(uuid)
   end
+
+  def self.humanize_class_name(_name = nil)
+    _("Docker/Container")
+  end
 end

data/app/models/docker_container_wizard_state.rb

@@ -10,6 +10,8 @@ class DockerContainerWizardState < ActiveRecord::Base
 
   delegate :compute_resource_id,   :to => :preliminary
   delegate :environment_variables, :to => :environment
+  delegate :exposed_ports, :to => :environment
+  delegate :dns, :to => :environment
 
   def container_attributes
     { :repository_name     => image.repository_name,

data/app/models/docker_container_wizard_states/dns.rb

@@ -0,0 +1,18 @@
+module DockerContainerWizardStates
+  class Dns < Parameter
+    # The Parameter class from which this Dns class inherits,validates for the
+    # presence of an associated domain,  operating system, host or host group.
+    # We will have to reset those validations for the Dns class as they do not
+    # make any sense for the context in which this class is being used here.
+    Dns.reset_callbacks(:validate)
+
+    belongs_to :environment,  :foreign_key => :reference_id,
+                              :inverse_of => :dns,
+                              :class_name => 'DockerContainerWizardStates::Environment'
+    validates :name, :uniqueness => { :scope => :reference_id },
+                     :format => {
+                       :with => Regexp.union(Resolv::IPv4::Regex,
+                                             Resolv::IPv6::Regex,
+                                             /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}$/) }
+  end
+end

data/app/models/docker_container_wizard_states/environment.rb

@@ -13,7 +13,18 @@ module DockerContainerWizardStates
                                      :validate => false
     include ::ParameterValidators
 
+    has_many :exposed_ports,  :dependent  => :destroy, :foreign_key => :reference_id,
+                              :inverse_of => :environment,
+                              :class_name => 'DockerContainerWizardStates::ExposedPort',
+                              :validate => true
+    has_many :dns,  :dependent  => :destroy, :foreign_key => :reference_id,
+                    :inverse_of => :environment,
+                    :class_name => 'DockerContainerWizardStates::Dns',
+                    :validate => true
+
     accepts_nested_attributes_for :environment_variables, :allow_destroy => true
+    accepts_nested_attributes_for :exposed_ports, :allow_destroy => true
+    accepts_nested_attributes_for :dns, :allow_destroy => true
 
     def parameters_symbol
       :environment_variables

data/app/models/docker_container_wizard_states/exposed_port.rb

@@ -0,0 +1,18 @@
+module DockerContainerWizardStates
+  class ExposedPort < Parameter
+    # The Parameter class from which ExposedPort class inherits,validates for the
+    # presence of an  associated domain, operating system, host or host group. We
+    # will have to reset those validations for the  ExposedPort class as  they do
+    # not make any sense for the context in which this class is being used here.
+    ExposedPort.reset_callbacks(:validate)
+
+    belongs_to :environment,  :foreign_key => :reference_id, :inverse_of => :exposed_ports,
+                              :class_name => 'DockerContainerWizardStates::Environment'
+    validates :name,  :uniqueness => { :scope => :reference_id },
+                      :numericality => { :only_integer => true,
+                                         :greater_than => 0,
+                                         :less_than_or_equal_to => 655_35 }
+    validates :value, :presence => true,
+                      :inclusion => { :in => %w(tcp udp) }
+  end
+end

data/app/models/docker_registry.rb

@@ -29,4 +29,8 @@ class DockerRegistry < ActiveRecord::Base
     uri = URI(url)
     "#{uri.hostname}:#{uri.port}/#{image_name}"
   end
+
+  def self.humanize_class_name(_name = nil)
+    _("Docker/Registry")
+  end
 end

data/app/models/exposed_port.rb

@@ -0,0 +1,19 @@
+class ExposedPort < Parameter
+  # The Parameter class from which ExposedPort class inherits,validates for the
+  # presence of an  associated domain, operating system, host or host group. We
+  # will have to reset those validations for the  ExposedPort class as  they do
+  # not make any sense for the context in which this class is being used here.
+  ExposedPort.reset_callbacks(:validate)
+
+  belongs_to :container, :foreign_key => :reference_id, :inverse_of => :exposed_ports
+  audited :except => [:priority], :associated_with => :container, :allow_mass_assignment => true
+  validates :name,  :uniqueness => { :scope => :reference_id }
+  validates :name,  :numericality => { :only_integer => true,
+                                       :greater_than => 0,
+                                       :less_than_or_equal_to => 655_35,
+                                       :message => "%{value} is not a valid port number" }
+
+  validates :value, :presence => true,
+                    :inclusion => { :in => %w(tcp udp),
+                                    :message => "%{value} is not a valid protocol" }
+end

data/app/models/foreman_docker/dns.rb

@@ -0,0 +1,20 @@
+module ForemanDocker
+  class Dns < Parameter
+    # The Parameter class from which this Dns class inherits,validates for the
+    # presence of an associated domain,  operating system, host or host group.
+    # We will have to reset those validations for the Dns class as they do not
+    # make any sense for the context in which this class is being used here.
+    ForemanDocker::Dns.reset_callbacks(:validate)
+
+    belongs_to :container, :foreign_key => :reference_id,
+                           :inverse_of => :dns,
+                           :class_name => "Container"
+
+    audited :except => [:priority], :associated_with => :container, :allow_mass_assignment => true
+    validates :name, :uniqueness => { :scope => :reference_id },
+                     :format => {
+                       :with => Regexp.union(Resolv::IPv4::Regex,
+                                             Resolv::IPv6::Regex,
+                                             /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}$/) }
+  end
+end

data/app/models/service/containers.rb

@@ -7,19 +7,24 @@ module Service
     def start_container!(wizard_state)
       ActiveRecord::Base.transaction do
         container = Container.new(wizard_state.container_attributes) do |r|
-          # eagerly load environment variables
-          state = DockerContainerWizardState.includes(:environment => [:environment_variables])
-                  .find(wizard_state.id)
-          state.environment_variables.each do |environment_variable|
-            r.environment_variables.build :name     => environment_variable.name,
-                                          :value    => environment_variable.value,
-                                          :priority => environment_variable.priority
-          end
+          # eagerly load environment variables and exposed ports configuration
+          state = DockerContainerWizardState.includes(
+            :environment => [:environment_variables, :exposed_ports]).find(wizard_state.id)
+
+          load_environment_variables(state, r)
+          load_exposed_ports(state, r)
+          load_dns(state, r)
         end
+
         Taxonomy.enabled_taxonomies.each do |taxonomy|
           container.send(:"#{taxonomy}=", wizard_state.preliminary.send(:"#{taxonomy}"))
         end
 
+        unless container.valid?
+          @errors = container.errors
+          fail ActiveRecord::Rollback
+        end
+
         fail ActiveRecord::Rollback unless pull_image(container) && start_container(container)
 
         container.save!
@@ -46,5 +51,32 @@ module Service
       wizard_state.destroy
       DockerContainerWizardState.destroy_all(["updated_at < ?", (Time.now - 24.hours)])
     end
+
+    def load_environment_variables(state, r)
+      state.environment_variables.each do |environment_variable|
+        r.environment_variables.build :name     => environment_variable.name,
+                                      :value    => environment_variable.value,
+                                      :priority => environment_variable.priority
+      end
+    end
+
+    def load_exposed_ports(state, r)
+      state.exposed_ports.each do |e|
+        r.exposed_ports.build :name => e.name,
+                              :value => e.value,
+                              :priority => e.priority
+      end
+    end
+
+    def load_dns(state, r)
+      state.dns.each do |e|
+        r.dns.build :name => e.name,
+                    :priority => e.priority
+      end
+    end
+
+    def full_messages
+      @errors.respond_to?(:full_messages) ? @errors.full_messages : @errors
+    end
   end
 end

data/app/views/api/v2/registries/base.json.rabl

@@ -0,0 +1,3 @@
+object @registry
+
+attributes :id, :name

data/app/views/api/v2/registries/index.json.rabl

@@ -0,0 +1,3 @@
+collection @registries
+
+extends 'api/v2/registries/main'

data/app/views/api/v2/registries/main.json.rabl

@@ -0,0 +1,6 @@
+object @registry
+
+extends 'api/v2/registries/base'
+
+attributes :url, :description, :created_at, :updated_at
+

data/app/views/api/v2/registries/show.json.rabl

@@ -0,0 +1,7 @@
+object @registry
+
+extends "api/v2/registries/main"
+
+node do |container|
+  partial("api/v2/taxonomies/children_nodes", :object => container)
+end

data/app/views/containers/show.html.erb

@@ -41,8 +41,26 @@
             </tr>
             <tr>
               <td><%= _('Exposed ports') %></td>
-              <td><%= @container.in_fog.exposed_ports %> </td>
+              <td>
+                <table id="exposed_ports" class="table table-bordered" style="table-layout:fixed; word-wrap: break-word">
+                  <% (@container.in_fog.exposed_ports || []).each do |exposed_port| %>
+                  <% pair = exposed_port.first.split("/") %>
+                    <tr>
+                      <td><b><%= pair.first %></b></td>
+                      <td><i><%= pair.second %></i></td>
+                    </tr>
+                  <% end %>
+                </table>
+              </td>
             </tr>
+            <tr>
+              <td><%= _('DNS') %></td>
+              <td>
+                  <% (@container.in_fog.attributes['host_config_dns'] || []).each do |dns| %>
+                    <%= dns %><br/>
+                  <% end %>
+                </td>
+            </tr>            
             <tr>
               <td><%= _('Environment Variables') %></td>
               <td>

data/app/views/containers/steps/environment.html.erb

@@ -15,6 +15,19 @@
         <% end %>
         <%= link_to_add_fields(_("Add environment variable"), f, :environment_variables,
                                'foreman_docker/common_parameters/environment_variable') %>
+
+        <h3><%= _("Exposed Ports") %></h3>
+        <%= f.fields_for :exposed_ports, @docker_container_wizard_states_environment.exposed_ports do |builder| %>
+          <%= render 'foreman_docker/common_parameters/exposed_ports', :f => builder %>
+        <% end %>
+        <%= link_to_add_fields(_("Add Exposed Port"), f, :exposed_ports,
+                               'foreman_docker/common_parameters/exposed_ports') %>
+        <h3><%= _("DNS") %></h3>
+        <%= f.fields_for :dns, @docker_container_wizard_states_environment.dns do |builder| %>
+          <%= render 'foreman_docker/common_parameters/dns', :f => builder %>
+        <% end %>
+        <%= link_to_add_fields(_("Add DNS"), f, :dns,
+                               'foreman_docker/common_parameters/dns') %>                               
       </div>
    </div>
    <%= render :partial => 'form_buttons' %>

data/app/views/containers/steps/image.html.erb

@@ -6,7 +6,7 @@
       <% if defined? Katello -%>
         <li class="<%= tab_class(:katello)%>"><a href="#katello" data-toggle="tab" id="katello_tab">
           <span class="glyphicon glyphicon-tower"></span>
-          <%= _("Katello") %>
+          <%= _("Content View") %>
         </a></li>
       <% end -%>
 

data/app/views/foreman_docker/common_parameters/_dns.erb

@@ -0,0 +1,16 @@
+<div class='fields'>
+  <table class="table table-bordered table-hover table-striped">
+    <tr class="form-group <%= 'has-error' if f.object.errors.any? %>">
+      <td><%= f.text_field(:name,  :class => "form-control",
+                                   :placeholder => _("DNS e.g: 8.8.8.8")) %></td>
+      <td style='vertical-align: middle' class='text-center'>
+        <span class="help-block">
+          <%= link_to_remove_fields('', f) %>
+        </span>
+      </td>
+      <span class="help-block">
+        <%= f.object.errors.full_messages.to_sentence %>
+      </span>
+    </tr>
+  </table>
+</div>

data/app/views/foreman_docker/common_parameters/_exposed_ports.erb

@@ -0,0 +1,17 @@
+<div class='fields'>
+  <table class="table table-bordered table-hover table-striped">
+    <tr class="form-group <%= 'has-error' if f.object.errors.any? %>">
+      <td><%= f.text_field(:name,  :class => "form-control",
+                                   :placeholder => _("Port Number e.g: 22")) %></td>
+      <td><%= f.select :value, [['TCP','tcp'],['UDP','udp']]  %></td>
+      <td style='vertical-align: middle' class='text-center'>
+        <span class="help-block">
+          <%= link_to_remove_fields('', f) %>
+        </span>
+      </td>
+      <span class="help-block">
+        <%= f.object.errors.full_messages.to_sentence %>
+      </span>
+    </tr>
+  </table>
+</div>

data/config/routes.rb

@@ -38,6 +38,7 @@ Rails.application.routes.draw do
             end
           end
         end
+        resources :registries, :except => [:new, :edit]
       end
     end
   end

data/lib/foreman_docker/engine.rb

@@ -58,32 +58,47 @@ module ForemanDocker
 
         security_block :containers do
           permission :view_containers,
-                     :containers          => [:index, :show],
-                     :'api/v2/containers' => [:index, :show, :logs]
-          permission :commit_containers, :containers => [:commit]
+                     { :containers          => [:index, :show],
+                       :'api/v2/containers' => [:index, :show, :logs] },
+                     :resource_type => 'Container'
+          permission :commit_containers, { :containers => [:commit] },
+                     :resource_type => 'Container'
           permission :create_containers,
-                     :'containers/steps'  => [:show, :update],
-                     :containers          => [:new],
-                     :'api/v2/containers' => [:create, :power]
+                     { :'containers/steps'  => [:show, :update],
+                       :containers          => [:new],
+                       :'api/v2/containers' => [:create, :power] },
+                     :resource_type => 'Container'
           permission :destroy_containers,
-                     :containers          => [:destroy],
-                     :'api/v2/containers' => [:destroy]
+                     { :containers          => [:destroy],
+                       :'api/v2/containers' => [:destroy] },
+                     :resource_type => 'Container'
           permission :power_compute_resources_vms,
-                     :containers          => [:power],
-                     :'api/v2/containers' => [:create, :power]
+                     { :containers          => [:power],
+                       :'api/v2/containers' => [:create, :power] },
+                     :resource_type => 'ComputeResource'
         end
 
         security_block :registries do
-          permission :view_registries,    :registries         => [:index, :show]
-          permission :create_registries,  :registries         => [:new, :create, :update, :edit]
-          permission :destroy_registries, :registries         => [:destroy]
+          permission :view_registries,
+                     { :registries => [:index, :show],
+                       :'api/v2/registries' => [:index, :show] },
+                     :resource_type => 'DockerRegistry'
+          permission :create_registries,
+                     { :registries  => [:new, :create, :update, :edit],
+                       :'api/v2/registries' => [:create, :update] },
+                     :resource_type => 'DockerRegistry'
+          permission :destroy_registries,
+                     { :registries => [:destroy],
+                       :'api/v2/registries' => [:destroy] },
+                     :resource_type => 'DockerRegistry'
         end
 
         security_block :image_search do
           permission :search_repository_image_search,
-                     :image_search => [:auto_complete_repository_name,
-                                       :auto_complete_image_tag,
-                                       :search_repository]
+                     { :image_search => [:auto_complete_repository_name,
+                                         :auto_complete_image_tag,
+                                         :search_repository] },
+                     :resource_type => 'Docker/ImageSearch'
         end
 
         # apipie API documentation

data/lib/foreman_docker/version.rb

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

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

@@ -119,6 +119,15 @@ module Api
                                         :tag => tag }
           assert_response :created
         end
+
+        test 'creation fails with invalid container name' do
+          post :create, :container => { :compute_resource_id => @container.compute_resource_id,
+                                        :name => @container.name,
+                                        :registry_id => @registry.id,
+                                        :repository_name => 'centos',
+                                        :tag => 'latest' }
+          assert_response :unprocessable_entity
+        end
       end
     end
   end

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

@@ -0,0 +1,56 @@
+require 'test_plugin_helper'
+
+module Api
+  module V2
+    class RegistriesControllerTest < ActionController::TestCase
+      setup do
+        @registry = FactoryGirl.create(:docker_registry)
+      end
+
+      test 'index returns a list of all containers' do
+        get :index, {}, set_session_user
+        assert_response :success
+        assert_template 'index'
+      end
+
+      test 'index can be filtered by name' do
+        %w(thomas clayton wolfe).each do |name|
+          FactoryGirl.create(:docker_registry, :name => name)
+        end
+        get :index, { :search => 'name = thomas' }, set_session_user
+        assert_response :success
+        assert_equal 1, assigns(:registries).length
+      end
+
+      test 'creates a new registry with valid params' do
+        docker_attrs = FactoryGirl.attributes_for(:docker_registry)
+        post :create, :registry => docker_attrs
+        assert_response :success
+      end
+
+      test 'does not create a new registry with invalid params' do
+        docker_attrs = FactoryGirl.attributes_for(:docker_registry)
+        docker_attrs.delete(:name)
+        post :create, :registry => docker_attrs
+        assert_response 422
+      end
+
+      test 'shows a docker registry' do
+        get :show, :id => @registry.id
+        assert_response :success
+      end
+
+      test 'update a docker registry' do
+        put :update, :id => @registry.id, :registry => { :name => 'hello_world' }
+        assert_response :success
+        assert DockerRegistry.exists?(:name => 'hello_world')
+      end
+
+      test 'deletes a docker registry' do
+        delete :destroy, :id => @registry.id
+        assert_response :success
+        refute DockerRegistry.exists?(@registry.id)
+      end
+    end
+  end
+end

data/test/functionals/containers_steps_controller_test.rb

@@ -35,5 +35,52 @@ module Containers
       end
       assert_equal state.image, docker_image
     end
+
+    test 'new container respects exposed_ports configuration' do
+      state = DockerContainerWizardState.create!
+      environment_options = {
+        :docker_container_wizard_state_id => state.id
+      }
+      state.environment = DockerContainerWizardStates::Environment.create!(environment_options)
+      state.environment.exposed_ports.create!(:name => '1654', :value => 'tcp')
+      state.environment.exposed_ports.create!(:name => '1655', :value => 'udp')
+      get :show, { :wizard_state_id => state.id, :id => :environment }, set_session_user
+      assert response.body.include?("1654")
+      assert response.body.include?("1655")
+
+      # Load ExposedPort variables into container
+      state.environment.exposed_ports.each do |e|
+        @container.exposed_ports.build :name => e.name,
+                                       :value => e.value,
+                                       :priority => e.priority
+      end
+      # Check if parametrized value of container matches Docker API's expectations
+      assert @container.parametrize.key? "ExposedPorts"
+      assert @container.parametrize["ExposedPorts"].key? "1654/tcp"
+      assert @container.parametrize["ExposedPorts"].key? "1655/udp"
+    end
+
+    test 'new container respects dns configuration' do
+      state = DockerContainerWizardState.create!
+      environment_options = {
+        :docker_container_wizard_state_id => state.id
+      }
+      state.environment = DockerContainerWizardStates::Environment.create!(environment_options)
+      state.environment.dns.create!(:name => '18.18.18.18')
+      state.environment.dns.create!(:name => '19.19.19.19')
+      get :show, { :wizard_state_id => state.id, :id => :environment }, set_session_user
+      assert response.body.include?("18.18.18.18")
+      assert response.body.include?("19.19.19.19")
+
+      # Load Dns variables into container
+      state.environment.dns.each do |e|
+        @container.dns.build :name => e.name,
+                             :priority => e.priority
+      end
+      # Check if parametrized value of container matches Docker API's expectations
+      assert @container.parametrize.key? "HostConfig"
+      assert @container.parametrize["HostConfig"].key? "Dns"
+      assert @container.parametrize["HostConfig"].value? ["18.18.18.18", "19.19.19.19"]
+    end
   end
 end

data/test/units/docker_registry_test.rb

@@ -18,7 +18,9 @@ class DockerRegistryTest < ActiveSupport::TestCase
   end
 
   test 'password is stored encrypted' do
-    registry = as_admin { FactoryGirl.create(:docker_registry) }
+    registry = as_admin { FactoryGirl.build(:docker_registry) }
+    registry.password = 'encrypted-whatever'
+    DockerRegistry.any_instance.expects(:encryption_key).at_least_once.returns('fakeencryptionkey')
     assert registry.is_decryptable?(registry.password_in_db)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -52,6 +52,7 @@ files:
 - app/assets/stylesheets/foreman_docker/autocomplete.css.scss
 - app/assets/stylesheets/foreman_docker/terminal.css.scss
 - app/controllers/api/v2/containers_controller.rb
+- app/controllers/api/v2/registries_controller.rb
 - app/controllers/concerns/foreman_docker/find_container.rb
 - app/controllers/containers/steps_controller.rb
 - app/controllers/containers_controller.rb
@@ -66,12 +67,16 @@ files:
 - app/models/container.rb
 - app/models/docker_container_wizard_state.rb
 - app/models/docker_container_wizard_states/configuration.rb
+- app/models/docker_container_wizard_states/dns.rb
 - app/models/docker_container_wizard_states/environment.rb
 - app/models/docker_container_wizard_states/environment_variable.rb
+- app/models/docker_container_wizard_states/exposed_port.rb
 - app/models/docker_container_wizard_states/image.rb
 - app/models/docker_container_wizard_states/preliminary.rb
 - app/models/docker_registry.rb
 - app/models/environment_variable.rb
+- app/models/exposed_port.rb
+- app/models/foreman_docker/dns.rb
 - app/models/foreman_docker/docker.rb
 - app/models/foreman_docker/taxonomy_extensions.rb
 - app/models/service/containers.rb
@@ -82,6 +87,10 @@ files:
 - app/views/api/v2/containers/index.json.rabl
 - app/views/api/v2/containers/main.json.rabl
 - app/views/api/v2/containers/show.json.rabl
+- app/views/api/v2/registries/base.json.rabl
+- app/views/api/v2/registries/index.json.rabl
+- app/views/api/v2/registries/main.json.rabl
+- app/views/api/v2/registries/show.json.rabl
 - app/views/compute_resources/form/_docker.html.erb
 - app/views/compute_resources/show/_docker.html.erb
 - app/views/compute_resources_vms/form/_docker.html.erb
@@ -97,7 +106,9 @@ files:
 - app/views/containers/steps/environment.html.erb
 - app/views/containers/steps/image.html.erb
 - app/views/containers/steps/preliminary.html.erb
+- app/views/foreman_docker/common_parameters/_dns.erb
 - app/views/foreman_docker/common_parameters/_environment_variable.html.erb
+- app/views/foreman_docker/common_parameters/_exposed_ports.erb
 - app/views/image_search/_repository_search_results.html.erb
 - app/views/images/form/_docker.html.erb
 - app/views/registries/_form.html.erb
@@ -130,6 +141,7 @@ files:
 - test/factories/containers.rb
 - test/factories/docker_registry.rb
 - test/functionals/api/v2/containers_controller_test.rb
+- test/functionals/api/v2/registries_controller_test.rb
 - test/functionals/containers_controller_test.rb
 - test/functionals/containers_steps_controller_test.rb
 - test/functionals/image_search_controller_test.rb
@@ -166,6 +178,7 @@ specification_version: 4
 summary: Provision and manage Docker containers and images from Foreman
 test_files:
 - test/functionals/api/v2/containers_controller_test.rb
+- test/functionals/api/v2/registries_controller_test.rb
 - test/functionals/containers_steps_controller_test.rb
 - test/functionals/image_search_controller_test.rb
 - test/functionals/containers_controller_test.rb