foreman_docker 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12e42c771f843e87d2ee36bec11487a4c3336c90
-  data.tar.gz: a81664dbe8b7001f0a7fe7d90fe6ae4acbf5de58
+  metadata.gz: dc562486af7545e9340afe42f3742eae15811824
+  data.tar.gz: f538d659b2bec681e978a943de4a19fb4c9259c1
 SHA512:
-  metadata.gz: a1db2612e76589521267a1ba5ef5a01aaa8b9f865b1d3b5049ae5e13acdfc48f4dad97b5179f9d2d403202098123edb522bfcb71dd496ac665d6178736be0bd9
-  data.tar.gz: 07339351f2555cf31cf7f44d1c28fa14a200ed327da0e41d715228f30bf2fdddfdba7af37551252cb502ae0ad08e164a34ed864dc33c56277fa7ee4189ed3da1
+  metadata.gz: 305bcea8f11eb23bb65ffb2969696fc8d0e08319d433677747413a088cd688e142fd7dfda8c31547cf194b5166b15358254f5eff0b262b722ace97e0baa1213a
+  data.tar.gz: 1d886a2caa3a372445c8d5c5f1e554c0456f183701387928930b95dd9a4c143fa2da9994b65b4e9d00c808f6cc1b35fbfa4476e25f62a769df9768de5e086f53

data/app/assets/javascripts/foreman_docker/image_step.js

@@ -27,27 +27,28 @@ function setupAutoComplete(registryType) {
 }
 
 function autoCompleteRepo(item) {
+  var registryType = $(item).data('registry'),
+      search_add_on = getImageConfirmation(registryType),
+      tag = getTag(registryType);
+
+  // Patternfly spinner uses 'float: left' and moves it to the left of the
+  // search button. Instead, we use FontAwesome's spinner to keep it at
+  // the right.
+  search_add_on.attr('class', 'fa fa-spin fa-circle-o-notch');
+
   $.ajax({
     type:'get',
     url: $(item).attr('data-url'),
     data: { search: item.val(), registry_id: $('#docker_container_wizard_states_image_registry_id').val() },
-    //data:'search=' + item.val(),
     success:function (result) {
-      var registryType = $(item).data('registry'),
-          search_add_on = getSearchAddOn(registryType),
-          tag = getTag(registryType);
-      if(result == 'true'){
+       if(result == 'true'){
         search_add_on.attr('title', 'Image found in the compute resource');
-        search_add_on.removeClass('glyphicon-remove');
-        search_add_on.css('color', 'lightgreen');
-        search_add_on.addClass('glyphicon-ok');
+        search_add_on.attr('class', 'pficon pficon-ok');
         setWaitingText('Image found: <strong>' + item.val() + '</strong>. Retrieving available tags, please wait...', registryType);
         setAutocompleteTags(registryType);
       } else {
         search_add_on.attr('title', 'Image NOT found in the compute resource');
-        search_add_on.removeClass('glyphicon-ok');
-        search_add_on.css('color', 'red');
-        search_add_on.addClass('glyphicon-remove');
+        search_add_on.attr('class', 'pficon pficon-error-circle-o');
         tag.autocomplete('option', 'source', []);
       }
     },
@@ -59,13 +60,13 @@ function autoCompleteRepo(item) {
 
 function setAutocompleteTags(registryType) {
   var tag = getTag(registryType);
-  tag.addClass('tags-autocomplete-loading');
+  tag.addClass('spinner-label');
   tag.val('');
   var source = [];
   $.getJSON( tag.data("url"), { search: getRepo(registryType).val(), registry_id: $('#docker_container_wizard_states_image_registry_id').val() },
       function(data) {
         getSearchSpinner(registryType).hide();
-        tag.removeClass('tags-autocomplete-loading');
+        tag.removeClass('spinner-label');
         $.each( data, function(index, value) {
           source.push({label: value.label, value: value.value});
         });
@@ -135,10 +136,10 @@ function getRepositorySearchResults(registryType) {
   return  $('form[data-registry="' + registryType + '"] [data-repository-search-results]:first');
 }
 
-function getSearchAddOn(registryType) {
-  return  $('form[data-registry="' + registryType + '"] [data-search-addon]:first');
+function getImageConfirmation(registryType) {
+  return  $('form[data-registry="' + registryType + '"] #image-confirmation');
 }
 
 function getWaitText(registryType) {
   return  $('form[data-registry="' + registryType + '"] [data-wait-text]:first');
-}
+}

data/app/assets/stylesheets/foreman_docker/autocomplete.css.scss

@@ -1,3 +1,3 @@
-.tags-autocomplete-loading {
-  background: white url('spinner.gif') right center no-repeat;
+#image-confirmation {
+  margin-left: 10px;
 }

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

@@ -12,7 +12,7 @@ module Api
 
       api :GET, '/containers/', N_('List all containers')
       api :GET, '/compute_resources/:compute_resource_id/containers/',
-          N_('List all containers in a compute resource')
+          N_('List all containers on a compute resource')
       param :compute_resource_id, :identifier
       param_group :search_and_pagination, ::Api::V2::BaseController
 
@@ -28,7 +28,7 @@ module Api
 
       api :GET, '/containers/:id/', N_('Show a container')
       api :GET, '/compute_resources/:compute_resource_id/containers/:id',
-          N_('Show container in a compute resource')
+          N_('Show container on a compute resource')
       param :id, :identifier, :required => true
       param :compute_resource_id, :identifier
 
@@ -40,13 +40,13 @@ module Api
           param :name, String
           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 :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')
+                                          :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')
+                              :desc => N_('Tag to use to create the container. e.g. latest')
           param :tty, :bool
           param :entrypoint, String
           param :command, String, :required => true
@@ -57,15 +57,15 @@ module Api
           param :attach_stdout, :bool
           param :attach_stdin, :bool
           param :attach_stderr, :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.')
+          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
 
       api :POST, '/containers/', N_('Create a container')
       api :POST, '/compute_resources/:compute_resource_id/containers/',
-          N_('Create container in a compute resource')
+          N_('Create container on a compute resource')
       param_group :container, :as => :create
 
       def create
@@ -87,17 +87,25 @@ module Api
 
       api :DELETE, '/containers/:id/', N_('Delete a container')
       api :DELETE, '/compute_resources/:compute_resource_id/containers/:id',
-          N_('Delete container in a compute resource')
+          N_('Delete container on a compute resource')
       param :id, :identifier, :required => true
       param :compute_resource_id, :identifier
 
       def destroy
-        process_response @container.destroy
+        deleted_identifier = ForemanDocker::ContainerRemover.remove_unmanaged(
+          @container.compute_resource_id,
+          @container.uuid)
+
+        if deleted_identifier
+          process_response @container.destroy
+        else
+          render :json => { :error => 'Could not delete container on Docker host' }, :status => :precondition_failed
+        end
       end
 
       api :GET, '/containers/:id/logs', N_('Show container logs')
       api :GET, '/compute_resources/:compute_resource_id/containers/:id/logs',
-          N_('Show logs from a container in a compute resource')
+          N_('Show logs from a container on a compute resource')
       param :id, :identifier, :required => true
       param :compute_resource_id, :identifier
       param :stdout, :bool
@@ -113,7 +121,7 @@ module Api
 
       api :PUT, '/containers/:id/power', N_('Run power operation on a container')
       api :PUT, '/compute_resources/:compute_resource_id/containers/:id/power',
-          N_('Run power operation on a container in a compute resource')
+          N_('Run power operation on a container on a compute resource')
       param :id, :identifier, :required => true
       param :compute_resource_id, :identifier
       param :power_action, String,

data/app/controllers/containers/steps_controller.rb

@@ -58,9 +58,9 @@ module Containers
       else
         @docker_container_wizard_states_environment = @state.environment
         process_error(
-          :error_msg => service.errors.full_messages.join(','),
-          :object => @state.environment,
-          :render => 'environment')
+          :redirect => containers_path,
+          :error_msg => service.full_messages.join(','),
+          :object => @state.environment)
       end
     end
   end

data/app/controllers/containers_controller.rb

@@ -20,12 +20,17 @@ class ContainersController < ::ApplicationController
   end
 
   def destroy
-    if container_deletion
+    if (deleted_identifier = container_deletion)
       process_success(:success_redirect => containers_path,
                       :success_msg => (_("Container %s is being deleted.") %
-                                            @deleted_identifier))
+                                       deleted_identifier))
     else
-      process_error(:redirect => containers_path)
+      error(_('Your container could not be deleted in Docker'))
+      if @container.present?
+        process_error(:redirect => containers_path)
+      else
+        redirect_to :back
+      end
     end
   rescue ActiveRecord::RecordNotFound
     not_found
@@ -94,25 +99,18 @@ class ContainersController < ::ApplicationController
   end
 
   def container_deletion
-    # Unmanaged container - only present in Compute Resource
     if params[:compute_resource_id].present?
-      @deleted_identifier = params[:id]
-      destroy_compute_resource_vm(params[:compute_resource_id], params[:id])
-    else # Managed container
+      compute_resource_id = params[:compute_resource_id]
+      container_uuid      = params[:id]
+    else
       find_container
-      @deleted_identifier = @container.name
-
-      destroy_compute_resource_vm(@container.compute_resource, @container.uuid) &&
-        @container.destroy
+      compute_resource_id = @container.compute_resource_id
+      container_uuid      = @container.uuid
     end
-  end
 
-  def destroy_compute_resource_vm(resource_id, uuid)
-    @container_resource = ComputeResource.authorized(:destroy_compute_resources_vms)
-                          .find(resource_id)
-    @container_resource.destroy_vm(uuid)
-  rescue => error
-    logger.error "#{error.message} (#{error.class})\n#{error.backtrace.join("\n")}"
-    false
+    deleted_identifier = ForemanDocker::ContainerRemover.remove_unmanaged(
+      compute_resource_id, container_uuid)
+    @container.destroy if @container.present?
+    deleted_identifier
   end
 end

data/app/helpers/container_steps_helper.rb

@@ -2,7 +2,7 @@ module ContainerStepsHelper
   def container_wizard(step)
     wizard_header(
       step,
-      *wizard_steps.map { |s| s.to_s.humanize }
+      *humanized_steps
     )
   end
 
@@ -18,6 +18,10 @@ module ContainerStepsHelper
     end
   end
 
+  def humanized_steps
+    [_('Preliminary'), _('Image'), _('Configuration'), _('Environment')]
+  end
+
   def last_step?
     step == wizard_steps.last
   end

data/app/helpers/containers_helper.rb

@@ -31,7 +31,9 @@ module ContainersHelper
     @compute_resource = container.compute_resource
     title_actions(
       button_group(
-        link_to(_('Commit'), '#commit-modal', :'data-toggle' => 'modal')
+        link_to(_('Commit'), '#commit-modal',
+                :'data-toggle' => 'modal',
+                :class => 'btn btn-default')
       ),
       button_group(container_power_action(container.in_fog)),
       button_group(
@@ -40,7 +42,8 @@ module ContainersHelper
                                   .merge(:auth_object => container,
                                          :auth_action => 'destroy',
                                          :authorizer  => authorizer),
-          :confirm     => _("Delete %s?") % container.name)
+          :confirm => _("Delete %s?") % container.name,
+          :class => 'btn btn-default')
       )
     )
   end
@@ -72,11 +75,6 @@ module ContainersHelper
                                                           :vm => vm }
   end
 
-  def auto_complete_docker_search(name, val, options = {})
-    addClass options, 'form-control'
-    text_field_tag(name, val, options)
-  end
-
   def processes(container)
     ForemanDocker::Docker.get_container(container).top
   end

data/app/models/concerns/fog_extensions/fogdocker/server.rb

@@ -36,7 +36,7 @@ module FogExtensions
       end
 
       def vm_description
-        _('%{cores} Cores and %{memory} memory') %
+        _('%{cores} cores and %{memory} memory') %
           { :cores => cpus, :memory => number_to_human_size(memory.to_i) }
       end
     end

data/app/models/docker_registry.rb

@@ -3,16 +3,17 @@ class DockerRegistry < ActiveRecord::Base
   include Taxonomix
   include Encryptable
 
-  attr_accessible :name, :url, :username, :password, :locations, :organizations
-
   has_many :containers, :foreign_key => "registry_id", :dependent => :destroy
   encrypts :password
 
-  attr_accessible :name, :url, :username, :password, :locations, :organizations
+  attr_accessible :name, :url, :username, :password, :locations, :organizations,
+    :description
 
   validates_lengths_from_database
   validates :name, :presence => true, :uniqueness => true
-  validates :url,  :presence => true, :uniqueness => true
+  validates :url,  :presence => true, :uniqueness => true,
+    :url_schema => ['http', 'https']
+  validate :attempt_login
 
   scoped_search :on => :name, :complete_value => true
   scoped_search :on => :url
@@ -37,4 +38,15 @@ class DockerRegistry < ActiveRecord::Base
   def self.humanize_class_name(_name = nil)
     _("Docker/Registry")
   end
+
+  private
+
+  def attempt_login
+    login_endpoint = RestClient::Resource.new(url + '/v1/users',
+                                              :user => username,
+                                              :password => password)
+    login_endpoint.get == "\"OK\""
+  rescue => e
+    errors.add(:base, _('Unable to log in to this Docker Registry - %s') % e)
+  end
 end

data/app/models/foreman_docker/docker.rb

@@ -5,6 +5,7 @@ module ForemanDocker
     attr_accessible :email
 
     validates :url, :format => { :with => URI.regexp }
+    validates :email, :format => { :with => /.+@.+\..+/i }, :allow_blank => true
 
     def self.model_name
       ComputeResource.model_name
@@ -16,7 +17,7 @@ module ForemanDocker
     end
 
     def capabilities
-      [:image]
+      []
     end
 
     def supports_update?

data/app/models/service/containers.rb

@@ -93,7 +93,7 @@ module Service
     end
 
     def full_messages
-      @errors.respond_to?(:full_messages) ? @errors.full_messages : @errors
+      errors.respond_to?(:full_messages) ? errors.full_messages : errors
     end
 
     def run_container(container)

data/app/overrides/remove_docker_from_compute_profiles.rb

@@ -0,0 +1,14 @@
+Deface::Override.new(
+  :virtual_path => 'compute_profiles/show',
+  :name => 'remove_docker_from_compute_profiles',
+  :replace => "erb[silent]:contains('ComputeResource.authorized(:view_compute_resources)')",
+  :text => "<% ComputeResource.where.not(:type => 'ForemanDocker::Docker').
+                 authorized(:view_compute_resources).each do |compute_resource| %>"
+)
+
+Deface::Override.new(
+  :virtual_path => 'compute_resources/show',
+  :name => 'remove_compute_profiles_tab',
+  :replace => 'a[href="#compute_profiles"]',
+  :text => "<%= link_to(_('Compute profiles'), '#compute_profiles', :'data-toggle' => 'tab') unless @compute_resource.type == 'ForemanDocker::Docker' %>"
+)

data/app/overrides/rename_virtual_machines_containers.rb

@@ -0,0 +1,10 @@
+Deface::Override.new(
+  :virtual_path => 'compute_resources/show',
+  :name => 'rename_virtual_machines_containers',
+  :replace => "erb[loud]:contains('Virtual Machines')",
+  :text => "<%= if @compute_resource.type == 'ForemanDocker::Docker'
+                  _('Containers')
+                else
+                  _('Virtual Machines')
+                end %>"
+)

data/app/services/foreman_docker/container_remover.rb

@@ -0,0 +1,20 @@
+module ForemanDocker
+  module ContainerRemover
+    module_function
+
+    def remove_unmanaged(compute_resource_id, uuid)
+      deleted_identifier = uuid
+
+      ComputeResource.
+        authorized(:destroy_compute_resources_vms).
+        find(compute_resource_id).
+        destroy_vm(uuid)
+
+      deleted_identifier
+    rescue => error
+      Rails.logger.
+        error "#{error.message} (#{error.class})\n#{error.backtrace.join("\n")}"
+      false
+    end
+  end
+end

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

@@ -1,16 +1,13 @@
 <% title _("Containers") %>
 
-<% if authorized? %>
-  <% title_actions button_group(link_to_if_authorized _("New container"), hash_for_new_container_path,
-                                                      :class => 'btn-success') %>
-<% end %>
+<%= title_actions(new_link(_("New container"))) %>
 
 <ul class="nav nav-tabs" data-tabs="tabs">
   <% @container_resources.each_with_index do |resource, i| %>
     <% if i == 0 %>
-      <li class="active"><a href="#<%= "primary" %>" data-toggle="tab"><%= _("#{resource.name}") %></a></li>
+      <li class="active"><a href="#<%= "primary" %>" data-toggle="tab"><%= resource.name %></a></li>
     <% else %>
-      <li><a href="#<%= resource.id %>" data-toggle="tab"><%= _("#{resource.name}") %></a></li>
+      <li><a href="#<%= resource.id %>" data-toggle="tab"><%= resource.name %></a></li>
     <% end %>
   <% end %>
 </ul>
@@ -33,4 +30,4 @@
     </div>
   <% end %>
   </div>
-</div>
+</div>