staypuft 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17db35905779581497986043c56782829969ded1
-  data.tar.gz: 8110916cfe794b3531fd11532e4ff800882aafce
+  metadata.gz: 83e1ee0be60733db0950f62e2787bd4d9d12a663
+  data.tar.gz: 941b4f0986b8b9ab6ca8ee6099de86b4757a143b
 SHA512:
-  metadata.gz: 29f22381981d26709e8c81bbd7505947a4951d48a5508690ef7261bf47afc2662cac7f838b76d140a3fa8980fb9cc605ca73c6204181bc1636e06f4e2777814c
-  data.tar.gz: ed56ecce9c8713e1a30199c379b96984894c6a15b95ed8d6e036fbf74078d6729d3752bd87164c14bea2f50577154df6bc924faac10011b49456bb04273a6bc8
+  metadata.gz: da3b904af0ab6b1dc03af6a54f71443a0703282cb8f26c912cc4abbd6b1fb1c559eeab28f7f5404dd7ba284922760a59081bc5a50f84b4ff90cc4c0eead751f4
+  data.tar.gz: 075e84a0bf11038a7662cc2ed9d3e4ebb988141dbd4a980b01eb9d4431dbeef9dcf36808acc30dbe1acc020f8774e5361ea4f3d739bc0f3ca4e237dd7e25b8d8

data/app/models/staypuft/concerns/host_fencing_extensions.rb

@@ -10,7 +10,7 @@ module Staypuft
       included do
         define_method :fencing do
           instance_variable_get(:@fencing_config) or
-            instance_variable_set(:@fencing_config, ::Staypuft::Host::Fencing.new(self))
+            instance_variable_set(:@fencing_config, ::Staypuft::Fencing.new(self))
         end
 
         define_method :fencing= do |value|

data/app/models/staypuft/fencing.rb

@@ -0,0 +1,53 @@
+module Staypuft
+  class Fencing
+    include ActiveModel::Validations
+
+    FENCING_ATTRS = {
+      'general' => ['fencing_enabled',
+                    'fencing_type'],
+      'fence_ipmilan' => ['fence_ipmilan_address',
+                          'fence_ipmilan_username',
+                          'fence_ipmilan_password',
+                          'fence_ipmilan_expose_lanplus',
+                          'fence_ipmilan_lanplus_options']
+    }
+
+    validates :fencing_type, :presence => true, :if => Proc.new { |f|
+      f.fencing_enabled == '1' &&
+      @host.interfaces.any?{ |nic| nic.type == 'Nic::BMC' && !nic.marked_for_destruction? }
+    }
+
+    def initialize(host)
+      @host = host
+      FENCING_ATTRS.each do |key, attrs|
+        attrs.each do |name|
+          instance_var_name  = :"@#{name}"
+          value = host.bmc_nic.attrs[name] if host.bmc_nic && host.bmc_nic.attrs.has_key?(name)
+          self.class.send(:define_method, name) do
+            instance_variable_get(instance_var_name) or
+              instance_variable_set(instance_var_name, value)
+          end
+        end
+      end
+    end
+
+    def update(values)
+      values.each do |key, value|
+        instance_var_name  = :"@#{key}"
+        instance_variable_set(instance_var_name, value)
+      end
+
+      bmc_nics = @host.interfaces.select{ |interface| interface.type == "Nic::BMC" }
+      return if bmc_nics.empty?
+
+      bmc_nic = bmc_nics[0]
+      bmc_nic.attrs.merge!(values)
+      bmc_nic.save
+    end
+
+    # compatibility with validates_associated
+    def marked_for_destruction?
+      false
+    end
+  end
+end

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Staypuft team
@@ -99,6 +99,7 @@ files:
 - app/controllers/staypuft/interface_assignments_controller.rb
 - app/controllers/staypuft/steps_controller.rb
 - app/controllers/staypuft/deployments_controller.rb
+- app/models/staypuft/fencing.rb
 - app/models/staypuft/service/ui_params.rb
 - app/models/staypuft/layout_role.rb
 - app/models/staypuft/interface_assigner.rb
@@ -115,7 +116,6 @@ files:
 - app/models/staypuft/deployment/passwords.rb
 - app/models/staypuft/service_class.rb
 - app/models/staypuft/subnet_type.rb
-- app/models/staypuft/host/fencing.rb
 - app/models/staypuft/layout.rb
 - app/models/staypuft/concerns/vip_nic_scopes.rb
 - app/models/staypuft/concerns/hostgroup_extensions.rb

data/app/models/staypuft/host/fencing.rb

@@ -1,55 +0,0 @@
-module Staypuft
-  module Host
-    class Fencing
-      include ActiveModel::Validations
-
-      FENCING_ATTRS = {
-        'general' => ['fencing_enabled',
-                      'fencing_type'],
-        'fence_ipmilan' => ['fence_ipmilan_address',
-                            'fence_ipmilan_username',
-                            'fence_ipmilan_password',
-                            'fence_ipmilan_expose_lanplus',
-                            'fence_ipmilan_lanplus_options']
-      }
-
-      validates :fencing_type, :presence => true, :if => Proc.new { |f|
-        f.fencing_enabled == '1' &&
-          @host.interfaces.any?{ |nic| nic.type == 'Nic::BMC' && !nic.marked_for_destruction? }
-      }
-
-      def initialize(host)
-        @host = host
-        FENCING_ATTRS.each do |key, attrs|
-          attrs.each do |name|
-            instance_var_name  = :"@#{name}"
-            value = host.bmc_nic.attrs[name] if host.bmc_nic && host.bmc_nic.attrs.has_key?(name)
-            self.class.send(:define_method, name) do
-              instance_variable_get(instance_var_name) or
-                instance_variable_set(instance_var_name, value)
-            end
-          end
-        end
-      end
-
-      def update(values)
-        values.each do |key, value|
-          instance_var_name  = :"@#{key}"
-          instance_variable_set(instance_var_name, value)
-        end
-
-        bmc_nics = @host.interfaces.select{ |interface| interface.type == "Nic::BMC" }
-        return if bmc_nics.empty?
-
-        bmc_nic = bmc_nics[0]
-        bmc_nic.attrs.merge!(values)
-        bmc_nic.save
-      end
-
-      # compatibility with validates_associated
-      def marked_for_destruction?
-        false
-      end
-    end
-  end
-end