staypuft 0.5.2 → 0.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzJhYzdmNWIxZTJmZjYwZmMzZTRiY2NmY2EzNjY0MzRjYjc1NWQ5Nw==
+    ZGUyNWNiM2M0NjZkMTZiMDRiN2ExNjdmNTEzYTU3MDQwY2EzYThlZQ==
   data.tar.gz: !binary |-
-    MjJiZTgxMWZkNjY4YjI3N2EzOGE1MjYxOGY3ZGUyM2U4NmI3Y2I1Yw==
+    NzI0ZTY4Y2UzZGM3MzI2MTU3OTkzMjE0NTU5MmVlMmM5YzU5MTYyMw==
 SHA512:
   metadata.gz: !binary |-
-    Y2Y0ZWU4NDUzMDg3MDA2ZTQzODNlMzE4MmMzNGZlODY0MDI3NTkyZTcwNTlj
-    Mzg2OWNiYjBmNjRlZDVlNWFjZGRiYjQyY2YzMzRjZTM4MGEwYjFkYjMxMmFi
-    MWE2ZTI4YjUyOTI2Yzk4MzJjNGMzNWRlY2Y5ODQ2Mzk4MGIzOGY=
+    NTEzNjU2YzIyY2JiNDc1MTYzNGZhYzBlNjFkZGI4ZGI5YmY1YTc3MTdjMDBj
+    MTJmZTExNjMwZjZkNGRkMWUzZTM1NzJkZDZkMmRmMWQzZjIxNTI2MWJhZTlk
+    ODU4MWJlYjk5ODEyZTZkM2IzNTBlZGE2ZDc5ZGJhNmMwMTgyYjY=
   data.tar.gz: !binary |-
-    ZDZlMDQwY2M4MTUxNzk4NmY2ZDAzOTVkZGQ0NGZlYTgxNzM2ZTY5NzUwYTBj
-    NTRkMjY4ZTVkNWMxOWZlMDRlYzkzZmUzN2U3ZTY5MjQzNGQ0MmFjMGRmOWQ5
-    ZTA2OGYxNjM2MjNiOTNlNTlhM2M4YTRhMTE3MjllODFiMTcwNTU=
+    MmRlYTkyMDkyOTY1MWViYzgyNDliNzM5ZTdhODYxMmU5NzYwMTE2NGIxYWI2
+    M2JlNGNlZjRhOWI4MTY5MWMwN2ZkMzcwODdlNmJlZTQwYmQxOTA5MjRjZTdh
+    Y2UxNmZiYzZhNzlhYWQ3NWQxN2YwMmIzMjI1YWI4ZTg0YWZiMWQ=

data/app/models/staypuft/deployment/cinder_service.rb

@@ -31,10 +31,15 @@ module Staypuft
       HUMAN       = N_('NFS URI:')
       HUMAN_AFTER = Deployment::GlanceService::NFS_HELP
     end
+
+    class NfsUriValueValidator < ActiveModel::EachValidator
+      include Staypuft::Deployment::NfsUriValidator
+    end
+
     validates :nfs_uri,
-              :presence => true,
-              :if       => :nfs_backend?
-    # TODO: uri validation
+              :presence      => true,
+              :if            => :nfs_backend?,
+              :nfs_uri_value => true
 
     module SanIp
       HUMAN       = N_('SAN IP Addr:')

data/app/models/staypuft/deployment/glance_service.rb

@@ -28,10 +28,14 @@ module Staypuft
       HUMAN_AFTER = NFS_HELP
     end
 
+    class NfsNetworkPathValueValidator < ActiveModel::EachValidator
+      include Staypuft::Deployment::NfsUriValidator
+    end
+
     validates :nfs_network_path,
-              :presence => true,
-              :if       => :nfs_backend?
-    # TODO: network_path validation
+              :presence               => true,
+              :if                     => :nfs_backend?,
+              :nfs_network_path_value => true
 
     class Jail < Safemode::Jail
       allow :driver_backend, :pcmk_fs_type, :pcmk_fs_device, :pcmk_fs_options, :backend,

data/app/models/staypuft/deployment/ip_address_validator.rb

@@ -1,30 +1,10 @@
 module Staypuft
   module Deployment::IpAddressValidator
-    NOT_RANGE_MSG = N_("Specify single IP address, not range")
-    INVALID_IP_OR_FQDN_MSG = N_("Invalid IP address or FQDN supplied")
+    include Staypuft::Deployment::IpCheck
 
     def validate_each(record, attribute, value)
       return if value.empty?
-
-      begin
-        ip_addr = IPAddr.new(value)
-        ip_range = ip_addr.to_range
-        if ip_range.begin == ip_range.end
-          true
-        else
-          record.errors.add attribute, NOT_RANGE_MSG
-          false
-        end
-      rescue
-        # not IP addr
-        # validating as fqdn
-        if /(?=^.{1,254}$)(^(((?!-)[a-zA-Z0-9-]{1,63}(?<!-))|((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63})$)/ =~ value
-          true
-        else
-          record.errors.add attribute, INVALID_IP_OR_FQDN_MSG
-          false
-        end
-      end
+      check_ip_or_hostname(record, attribute, value)
     end
   end
 end

data/app/models/staypuft/deployment/ip_check.rb

@@ -0,0 +1,28 @@
+module Staypuft
+  module Deployment::IpCheck
+    NOT_RANGE_MSG = N_("Specify single IP address, not range")
+    INVALID_IP_OR_FQDN_MSG = N_("Invalid IP address or FQDN supplied")
+
+    def check_ip_or_hostname(record, attribute, value)
+      begin
+        ip_addr = IPAddr.new(value)
+        ip_range = ip_addr.to_range
+        if ip_range.begin == ip_range.end
+          true
+        else
+          record.errors.add attribute, NOT_RANGE_MSG
+          false
+        end
+      rescue
+        # not IP addr
+        # validating as fqdn
+        if /(?=^.{1,254}$)(^(((?!-)[a-zA-Z0-9-]{1,63}(?<!-))|((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63})$)/ =~ value
+          true
+        else
+          record.errors.add attribute, INVALID_IP_OR_FQDN_MSG
+          false
+        end
+      end
+    end
+  end
+end

data/app/models/staypuft/deployment/nfs_uri_validator.rb

@@ -0,0 +1,17 @@
+module Staypuft
+  module Deployment::NfsUriValidator
+    include Staypuft::Deployment::IpCheck
+
+    INVALID_URI_MESSAGE = N_('Specify NFS URI as <server>:<local path>')
+    def validate_each(record, attribute, value)
+      return if value.empty?
+      match = /(.+):(.+)/.match(value)
+      if match
+        check_ip_or_hostname(record, attribute, match[1])
+      else
+        record.errors.add attribute, INVALID_URI_MESSAGE
+        false
+      end
+    end
+  end
+end

data/app/views/staypuft/deployments/_deployment_overview.html.erb

@@ -8,12 +8,12 @@
     <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
       <li>
         <div class="col-xs-2">
-          <% if child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? }.count > 0 %>
+          <% if child_hostgroup.hosts.select { |h| !@deployment.in_progress? && h.open_stack_deployed? }.count > 0 %>
             <a href="#<%= child_hostgroup.name.parameterize.underscore %>_deployed_hosts" data-toggle="tab" class="roles_list">
-              <span><%= child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? }.count %></span>
+              <span><%= child_hostgroup.hosts.select { |h| !@deployment.in_progress? && h.open_stack_deployed? }.count %></span>
             </a>
           <% else %>
-            <span><%= child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? }.count %></span>
+            <span><%= child_hostgroup.hosts.select { |h| !@deployment.in_progress? && h.open_stack_deployed? }.count %></span>
           <% end %>
         </div>
         <div class="col-xs-6">
@@ -22,14 +22,14 @@
           </div>
         </div>
         <div class="col-xs-2">
-          <% if child_hostgroup.hosts.select { |h| !(!ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed?) }.count > 0 %>
+          <% if child_hostgroup.hosts.select { |h| !(!@deployment.in_progress? && h.open_stack_deployed?) }.count > 0 %>
             <a href="#<%= child_hostgroup.name.parameterize.underscore %>_assigned_hosts" data-toggle="tab" class="roles_list">
-              <% unless @deployment.in_progress? %>
-                <i class="glyphicon glyphicon-time"></i>
-              <% else %>
+              <% if child_hostgroup.hosts.select { |h| (@deployment.in_progress? && h.open_stack_deployed?) }.count > 0 %>
                 <%= image_tag '/assets/spinner.gif' %>
+              <% else %>
+                <i class="glyphicon glyphicon-time"></i>
               <% end %>
-              <span><%= child_hostgroup.hosts.select { |h| !(!ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed?) }.count %></span>
+              <span><%= child_hostgroup.hosts.select { |h| !(!@deployment.in_progress? && h.open_stack_deployed?) }.count %></span>
             </a>
           <% end %>
         </div>
@@ -55,7 +55,7 @@
       <%= render 'deployed_hosts_table', :deployment => @deployment,
                  :hostgroup => @hostgroup,
                  :child_hostgroup => child_hostgroup,
-                 :hosts => child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? } %>
+                 :hosts => child_hostgroup.hosts.select { |h| !@deployment.in_progress? && h.open_stack_deployed? } %>
     <% end %>
     <%= render :partial => "deployment_summary", :locals => { :deployment => @deployment } %>
   </div>

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -160,8 +160,10 @@ files:
 - app/models/staypuft/deployment/cinder_service/equallogic.rb
 - app/models/staypuft/deployment/glance_service.rb
 - app/models/staypuft/deployment/ip_address_validator.rb
+- app/models/staypuft/deployment/ip_check.rb
 - app/models/staypuft/deployment/neutron_service.rb
 - app/models/staypuft/deployment/neutron_service/cisconexus.rb
+- app/models/staypuft/deployment/nfs_uri_validator.rb
 - app/models/staypuft/deployment/nova_service.rb
 - app/models/staypuft/deployment/passwords.rb
 - app/models/staypuft/deployment/vlan_range_values_validator.rb