iface 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6fa26ea8fbe2745f309e5c2690bca592b2457b
-  data.tar.gz: ec6a7071343fa410811212083862d1fc592e67b1
+  metadata.gz: fc2fdecabc038ea8a83b38920c8dff34d60a7f4d
+  data.tar.gz: afa9611dacfb1807fe1415d9ce3233a143a934db
 SHA512:
-  metadata.gz: b7697cbb1c54cf9e06ce114d43b42742137428bdeac500e4962e6625951a430d194498a709fe96f222ab8a94d7ad79bd821094d296a68537e201344f3f5773a9
-  data.tar.gz: 0d304fd04fb52aa4515a4047578e5d3d61f19a8a9124d7c6d74ebac1761d851d261a43d2f618709be610ac2add9a7cef79e1b348729887a4a8a6d9c0e72191b4
+  metadata.gz: 7dab1b175a9bd0e556529562aa060daabd8e56c3e830bfbade0c858ef99d9f0605650ba3879556b03b6c9240df4b8f9fb5a9cdeab502b1bb8e34c7b4cf8de2d8
+  data.tar.gz: 5bc90e93bfe86c604d6aadd650bed52a774056788ff5f94ba66a69403f1a9545beab65bc4b9128968b46a7b186a0abd4a5676ce244af7a80a138cd03a26ec50f

data/lib/iface.rb

@@ -2,3 +2,4 @@
 
 require_relative 'iface/config'
 require_relative 'iface/ip_address'
+require_relative 'iface/value_set'

data/lib/iface/config_file.rb

@@ -22,11 +22,10 @@ module Iface
     def self.create(filename, io)
       fname = File.split(filename).last
       device, range_num, clone_num = parse_filename(fname)
-      vars = ValueSet.new(io)
 
       FILE_TYPES.each do |klass|
-        if klass.recognize?(device, range_num, clone_num, vars)
-          return klass.new(filename, device, range_num, clone_num, vars)
+        if klass.recognize?(device, range_num, clone_num)
+          return klass.new(filename, device, range_num, clone_num, io)
         end
       end
 
@@ -40,7 +39,7 @@ module Iface
       [device, range_num&.to_i, clone_num&.to_i]
     end
 
-    def self.recognize?(_device, _range_num, _clone_num, _vars)
+    def self.recognize?(_device, _range_num, _clone_num)
       false
     end
 
@@ -48,10 +47,10 @@ module Iface
       name.split('::').last[0..-5].decamelize.to_sym if name.match?(/File\Z/)
     end
 
-    def initialize(filename, device, _range_num, _clone_num, vars)
+    def initialize(filename, device, _range_num, _clone_num, io)
       @filename = filename
       @device = device
-      @vars = vars
+      @vars = value_set_class.new(io)
     end
 
     def static?
@@ -61,32 +60,80 @@ module Iface
     def include?(_ip)
       raise NotImplementedError
     end
+
+    def value_set_class
+      ValueSet
+    end
+
+    def to_s
+      @vars.to_s
+    end
   end
 
   # Represents a primary config file (not loopback, range or clone file)
   #
   # These are files named like "ifcfg-eth0".
   class PrimaryFile < ConfigFile
-    attr_reader :ip_address, :ipv6_address, :ipv6_secondaries
-
-    def self.recognize?(device, range_num, clone_num, _vars)
+    def self.recognize?(device, range_num, clone_num)
       device != 'lo' && range_num.nil? && clone_num.nil?
     end
 
-    def initialize(filename, device, range_num, clone_num, vars)
-      super
-      return unless %w[static none].include?(vars['bootproto']) # RHEL6 uses "none"
-      @ip_address = vars['ipaddr']
-      @ipv6_address = vars['ipv6addr']
-      @ipv6_secondaries = vars['ipv6addr_secondaries']&.split(/\s+/)
+    def ip_address
+      @vars['ipaddr']
+    end
+
+    def ip_address=(new_ip)
+      @vars['ipaddr'] = new_ip
+      make_static
+      disable_nm
+    end
+
+    def ipv6_address
+      @vars['ipv6addr']
+    end
+
+    def ipv6_address=(new_ip)
+      @vars['ipv6addr'] = new_ip
+      make_static
+      disable_nm
+    end
+
+    def ipv6_secondaries
+      @vars['ipv6addr_secondaries']&.split(/\s+/)
+    end
+
+    def ipv6_secondaries=(new_ips)
+      @vars['ipv6addr_secondaries'] = new_ips
+      make_static
+      disable_nm
+    end
+
+    def value_set_class
+      PrimaryInterface
+    end
+
+    def make_static
+      @vars.make_static unless static?
+    end
+
+    def disable_nm
+      @vars.disable_nm
+    end
+
+    def nm_controlled?
+      @vars['nm_controlled'] == 'yes'
+    end
+
+    def use_ipv6
+      @vars.use_ipv6
     end
 
     def static?
-      !@ip_address.nil?
+      @vars['bootproto'] == 'none'
     end
 
     def include?(ip)
-      @ip_address == ip
+      ip_address == ip
     end
   end
 
@@ -96,11 +143,11 @@ module Iface
   class CloneFile < ConfigFile
     attr_reader :ip_address, :clone_num
 
-    def self.recognize?(_device, _range_num, clone_num, _vars)
+    def self.recognize?(_device, _range_num, clone_num)
       !clone_num.nil?
     end
 
-    def initialize(filename, device, _range_num, clone_num, vars)
+    def initialize(filename, device, _range_num, clone_num, io)
       super
       @ip_address = vars['ipaddr']
       @clone_num = clone_num
@@ -121,11 +168,11 @@ module Iface
   class RangeFile < ConfigFile
     attr_reader :start_clone_num
 
-    def self.recognize?(_device, range_num, _clone_num, _vars)
+    def self.recognize?(_device, range_num, _clone_num)
       !range_num.nil?
     end
 
-    def initialize(filename, device, range_num, clone_num, vars)
+    def initialize(filename, device, range_num, clone_num, io)
       super
       @start_ip_num = string_to_ip_num(vars['ipaddr_start'])
       @end_ip_num = string_to_ip_num(vars['ipaddr_end'])
@@ -156,11 +203,11 @@ module Iface
 
   # Represents a loopback file (device "lo")
   class LoopbackFile < ConfigFile
-    def self.recognize?(device, _range_num, _clone_num, _vars)
+    def self.recognize?(device, _range_num, _clone_num)
       device == 'lo'
     end
 
-    def initialize(filename, device, range_num, _clone_num, vars)
+    def initialize(filename, device, range_num, _clone_num, io)
       super
       @ip_address = vars['ipaddr']
     end

data/lib/iface/ip_address.rb

@@ -3,12 +3,97 @@
 require 'ipaddr'
 
 module Iface
-  # Represents an IP address including subnet mask
+  # Represents an IP address including prefix length
   class IpAddress
-    def initialize(*args)
-      @ipaddr = IPAddr.new(*args)
-      @_bitmask = @ipaddr.instance_eval { @mask_addr.to_s(2) }
+    def self.create(str)
+      ipaddr = IPAddr.new(str)
+      (ipaddr.ipv4? ? IpV4Address : IpV6Address).new(ipaddr)
+    end
+
+    def initialize(ip_address)
+      @ipaddr = ip_address.is_a?(IPAddr) ? ip_address : IPAddr.new(ip_address)
+      @mask_addr = @ipaddr.instance_eval { @mask_addr }
+      @_bitmask = @mask_addr.to_s(2)
       @inverse_mask_addr = @_bitmask.tr('01', '10').to_i(2)
     end
+
+    def cidr_mask
+      case diff = full_mask - @mask_addr
+      when 0
+        full_cidr_mask
+      when 1
+        full_cidr_mask - 1
+      else
+        full_cidr_mask - Math.log2(diff).ceil
+      end
+    end
+
+    def to_i
+      @ipaddr.to_i
+    end
+
+    def to_s
+      @ipaddr.to_s
+    end
+
+    def full_mask
+      raise NotImplementedError
+    end
+
+    def full_cidr_mask
+      raise NotImplementedError
+    end
+
+    def ==(other)
+      self.class == other.class && __state__ == other.__state__
+    end
+
+    protected
+
+    def __state__
+      @ipaddr
+    end
+  end
+
+  # Represents an IPv4 address
+  class IpV4Address < IpAddress
+    def self.from_numeric(numeric)
+      new(IPAddr.new_ntoh([numeric].pack('N')))
+    end
+
+    def initialize(ip_address)
+      super
+      raise ArgumentError, "Expected IPv4, got IPv6: #{ip_address}" unless @ipaddr.ipv4?
+    end
+
+    def full_mask
+      IPAddr::IN4MASK
+    end
+
+    def full_cidr_mask
+      32
+    end
+  end
+
+  # Represents an IPv6 address
+  class IpV6Address < IpAddress
+    MASK_32 = 0xffffffffffffffff
+
+    def self.from_numeric(numeric)
+      new(IPAddr.new_ntoh([(numeric >> 96), (numeric >> 64) & MASK_32, (numeric >> 32) & MASK_32, numeric & MASK_32].pack('N*')))
+    end
+
+    def initialize(ip_address)
+      super
+      raise ArgumentError, "Expected IPv6, got IPv4: #{ip_address}" unless @ipaddr.ipv6?
+    end
+
+    def full_mask
+      IPAddr::IN6MASK
+    end
+
+    def full_cidr_mask
+      128
+    end
   end
 end

data/lib/iface/value_set.rb

@@ -1,30 +1,16 @@
 # frozen_string_literal: true
 
+require_relative 'value_set/pair'
+
 module Iface
-  # Represents a set of NAME=value pairs
+  # Represents a generic set of NAME=value pairs
   class ValueSet
-    # Represents a NAME=value pair
-    class Pair
-      attr_reader :name, :value
-
-      def initialize(line)
-        match = line.match(/(^[A-Z0-9_]+)="?(.*?)"?$/)
-        raise ArgumentError, "Expected pattern NAME=value; got #{line.inspect}" unless match
-        @name = match[1]
-        @value = match[2]&.sub(/^"/, '')&.sub(/"$/, '')
-      end
-
-      def to_s
-        "#{@name}=\"#{@value}\""
-      end
-    end
-
     def initialize(io)
       @vars = {}
       io.each_line do |line|
         edited_line = line.sub(/#.*$/, '').strip
         next if edited_line.empty?
-        pair = Pair.new(edited_line)
+        pair = Pair.create(edited_line, value_set: self)
         @vars[pair.name] = pair
       end
     end
@@ -33,13 +19,42 @@ module Iface
       @vars[name.upcase]&.value
     end
 
+    def []=(name, value)
+      key = name.upcase
+      if @vars.key?(key)
+        @vars[key].value = value
+      else
+        @vars[key] = Pair.create(key, value, value_set: self)
+      end
+    end
+
+    def fetch_raw(name)
+      @vars[name.upcase]&.raw_value
+    end
+
     def key?(name)
       @vars.key?(name.upcase)
     end
     alias has_key? key?
 
     def to_s
-      @vars.values.map(&:to_s).join("\n")
+      "#{@vars.values.map(&:to_s).join("\n")}\n"
+    end
+  end
+
+  # Represents a set of NAME=value pairs that would appear in a primary
+  # interface file, e.g. one named "ifcfg-eth0"
+  class PrimaryInterface < ValueSet
+    def make_static
+      self['BOOTPROTO'] = 'none'
+    end
+
+    def disable_nm
+      self['NM_CONTROLLED'] = 'no'
+    end
+
+    def use_ipv6
+      self['IPV6INIT'] = 'yes'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iface
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jim Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: camelotjim@jcain.net