netaddr 1.5.1 → 2.0.1

data/test/ipv6net_test.rb

@@ -0,0 +1,146 @@
+#!/usr/bin/ruby
+
+require_relative "../lib/netaddr.rb"
+require 'test/unit'
+
+class TestIPv6Net < Test::Unit::TestCase
+	def test_new
+		ip = NetAddr::IPv6.parse("1::")
+		m128 = NetAddr::Mask128.new(24)
+		net = NetAddr::IPv6Net.new(ip,m128)
+		assert_equal("1::/24", net.to_s)
+
+		assert_equal("1::/64", NetAddr::IPv6Net.new(ip,nil).to_s)
+		
+		ip = NetAddr::IPv6.parse("::")
+		assert_equal("::/128", NetAddr::IPv6Net.new(ip,nil).to_s)
+	end
+	
+	def test_parse
+		assert_equal("1::/24", NetAddr::IPv6Net.parse("1::1/24").to_s)
+		assert_equal("::/128", NetAddr::IPv6Net.parse("::").to_s) # default /128
+		assert_equal("1::/64", NetAddr::IPv6Net.parse("1::1").to_s) # default /64
+	end
+	
+	def test_cmp
+		net1 = NetAddr::IPv6Net.parse("1:1::/32")
+		net2 = NetAddr::IPv6Net.parse("1::/32")
+		net3 =NetAddr::IPv6Net.parse("1:2::/32")
+		net4 = NetAddr::IPv6Net.parse("1:1::/33")
+		net5 = NetAddr::IPv6Net.parse("1:1::/32")
+		
+		assert_equal(1, net1.cmp(net2)) # ip less
+		assert_equal(-1, net1.cmp(net3))# ip greater
+		assert_equal(-1, net4.cmp(net1)) # ip eq, mask less
+		assert_equal(1, net1.cmp(net4)) # ip eq, mask greater
+		assert_equal(0, net1.cmp(net5)) # eq
+	end
+
+	def test_fill
+		parent = NetAddr::IPv6Net.parse("ff00::/8")
+		nets = []
+		["ff08::/14", "fe00::/7", "ff20::/11", "ff20::/12"].each do |net|
+			nets.push(NetAddr::IPv6Net.parse(net))
+		end
+		expect = ["ff00::/13", "ff08::/14", "ff0c::/14", "ff10::/12", "ff20::/11", "ff40::/10", "ff80::/9"]
+		i = 0
+		parent.fill(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+		
+		parent = NetAddr::IPv6Net.parse("ff00::/121")
+		nets = []
+		["ff00::/126", "ff00::/120"].each do |net|
+			nets.push(NetAddr::IPv6Net.parse(net))
+		end
+		expect = ["ff00::/126", "ff00::4/126", "ff00::8/125", "ff00::10/124", "ff00::20/123", "ff00::40/122"]
+		i = 0
+		parent.fill(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+	end
+	
+	def test_next
+		assert_equal("::2/127", NetAddr::IPv6Net.parse("::/127").next.to_s)
+		assert_equal("::8/125", NetAddr::IPv6Net.parse("::4/126").next.to_s)
+		assert_equal("0:0:0:2::/63", NetAddr::IPv6Net.parse("::1:8000:0:0:0/65").next.to_s)
+		assert_equal("0:0:0:3::/64", NetAddr::IPv6Net.parse("::2:8000:0:0:0/65").next.to_s)
+		assert_nil(NetAddr::IPv6Net.parse("ffff::/16").next)
+	end
+	
+	def test_next_sib
+		assert_equal("0:0:0:2::/65", NetAddr::IPv6Net.parse("::1:8000:0:0:0/65",).next_sib.to_s)
+		assert_equal("0:0:0:2::/64", NetAddr::IPv6Net.parse("0:0:0:1::/64",).next_sib.to_s)
+		assert_equal("2::/16", NetAddr::IPv6Net.parse("1::/16").next_sib.to_s)
+		assert_nil(NetAddr::IPv6Net.parse("ffff::/16").next_sib)
+	end
+	
+	def test_nth
+		assert_equal("1::", NetAddr::IPv6Net.parse("1::0/64").nth(0).to_s)
+		assert_equal("::", NetAddr::IPv6Net.parse("::/127").nth(0).to_s)
+		assert_equal("::1", NetAddr::IPv6Net.parse("::/127").nth(1).to_s)
+		assert_nil(NetAddr::IPv6Net.parse("::/127").nth(2))
+	end
+	
+	def test_nth_subnet
+		assert_equal("1::/30", NetAddr::IPv6Net.parse("1::/24").nth_subnet(30,0).to_s)
+		assert_nil(NetAddr::IPv6Net.parse("1::").nth_subnet(26,4))
+	end
+	
+	def test_prev
+		assert_equal("1::/125", NetAddr::IPv6Net.parse("1::8/126").prev.to_s)
+		assert_equal("f::/63", NetAddr::IPv6Net.parse("f:0:0:2::/63").prev.to_s)
+		assert_equal("e::/16", NetAddr::IPv6Net.parse("f::/63").prev.to_s)
+		assert_nil(NetAddr::IPv6Net.parse("::").prev)
+	end
+	
+	def test_prev_sib
+		assert_equal("0:0:0:1::/64", NetAddr::IPv6Net.parse("0:0:0:2::/64").prev_sib.to_s)
+		assert_equal("1::/16", NetAddr::IPv6Net.parse("2::/16").prev_sib.to_s)
+		assert_nil(NetAddr::IPv6Net.parse("::/64").prev_sib)
+	end
+	
+	def test_rel
+		net1 = NetAddr::IPv6Net.parse("1::/63")
+		net2 = NetAddr::IPv6Net.parse("1::/64")
+		net3 = NetAddr::IPv6Net.parse("1::/60")
+		net4 = NetAddr::IPv6Net.parse("1:0:0:1::/64")
+		net5 = NetAddr::IPv6Net.parse("2::/64")
+		assert_equal(1, net1.rel(net2)) # net eq, supernet
+		assert_equal(-1, net2.rel(net1)) # net eq, subnet
+		assert_equal(0, net2.rel(net2)) # eq
+		assert_equal(1, net3.rel(net4)) # net ne, supernet
+		assert_equal(-1, net4.rel(net3)) # net ne, subnet
+		assert_nil(net2.rel(net5)) # unrelated
+	end
+	
+	def test_resize
+		assert_equal("1::/64", NetAddr::IPv6Net.parse("1::/63").resize(64).to_s)
+	end
+	
+	def test_subnet_count
+		assert_equal(2, NetAddr::IPv6Net.parse("ff::/8").subnet_count(9))
+		assert_equal(4, NetAddr::IPv6Net.parse("ff::/8").subnet_count(10))
+		assert_equal(0, NetAddr::IPv6Net.parse("ff::/8").subnet_count(8))
+		assert_equal(0, NetAddr::IPv6Net.parse("::/0").subnet_count(128))
+	end
+	
+	def test_summ
+		net1 = NetAddr::IPv6Net.parse("1::/128")
+		net2 = NetAddr::IPv6Net.parse("1::1/128")
+		net3 = NetAddr::IPv6Net.parse("1::0/128")
+		net4 = NetAddr::IPv6Net.parse("1::/16")
+		net5 = NetAddr::IPv6Net.parse("2::/16")
+		net6 = NetAddr::IPv6Net.parse("10::/12")
+		net7 = NetAddr::IPv6Net.parse("20::/12")
+		net8 = NetAddr::IPv6Net.parse("8::/17")
+		assert_equal("1::/127", net1.summ(net2).to_s) # lesser to greater
+		assert_equal("1::/127", net2.summ(net3).to_s) # greater to lesser
+		assert_nil(net4.summ(net5)) # different nets
+		assert_nil(net6.summ(net7)) # consecutive but not within bit boundary
+		assert_nil(net4.summ(net8)) # within bit boundary, but not same size
+	end
+	
+end

data/test/mask128_test.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/ruby
+
+require_relative "../lib/netaddr.rb"
+require 'test/unit'
+
+class TestMask128 < Test::Unit::TestCase
+	def test_new
+		m128 = NetAddr::Mask128.new(24)
+		assert_equal("/24", m128.to_s)
+		assert_equal(0xffffff00000000000000000000000000, m128.mask)
+		
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask128.new(-1) }
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask128.new(129) }
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask128.new("/24") }
+	end
+	
+	def test_parse
+		m128 = NetAddr::Mask128.parse("/24")
+		assert_equal("/24", m128.to_s)
+		
+		m128 = NetAddr::Mask128.parse("24")
+		assert_equal("/24", m128.to_s)
+		
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask128.parse("/129") }
+	end
+	
+	def test_cmp
+		m = NetAddr::Mask128.new(24)
+		m2 = NetAddr::Mask128.new(25)
+		m3 = NetAddr::Mask128.new(23)
+		m4 = NetAddr::Mask128.new(24)
+		assert_equal(1, m.cmp(m2))
+		assert_equal(-1, m.cmp(m3))
+		assert_equal(0, m.cmp(m4))
+	end
+	
+	def test_len
+		m = NetAddr::Mask128.new(65)
+		assert_equal(2**(128-65), m.len())
+		
+		m = NetAddr::Mask128.new(64)
+		assert_equal(0, m.len())
+	end
+
+end

data/test/mask32_test.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/ruby
+
+require_relative "../lib/netaddr.rb"
+require 'test/unit'
+
+class TestMask32 < Test::Unit::TestCase
+	def test_new
+		m32 = NetAddr::Mask32.new(24)
+		assert_equal("/24", m32.to_s)
+		assert_equal(0xffffff00, m32.mask)
+		
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask32.new(-1) }
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask32.new(33) }
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask32.new("/24") }
+	end
+	
+	def test_parse
+		m32 = NetAddr::Mask32.parse("255.255.255.0")
+		assert_equal("/24", m32.to_s)
+		
+		m32 = NetAddr::Mask32.parse("/24")
+		assert_equal("/24", m32.to_s)
+		
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask32.parse("255.248.255.0") }
+	end
+	
+	def test_cmp
+		m = NetAddr::Mask32.new(24)
+		m2 = NetAddr::Mask32.new(25)
+		m3 = NetAddr::Mask32.new(23)
+		m4 = NetAddr::Mask32.new(24)
+		assert_equal(1, m.cmp(m2))
+		assert_equal(-1, m.cmp(m3))
+		assert_equal(0, m.cmp(m4))
+	end
+	
+	def test_len
+		m = NetAddr::Mask32.new(24)
+		assert_equal(256, m.len())
+		
+		m = NetAddr::Mask32.new(26)
+		assert_equal(64, m.len())
+		
+		m = NetAddr::Mask32.new(32)
+		assert_equal(1, m.len())
+		
+		m = NetAddr::Mask32.new(0)
+		assert_equal(0, m.len())
+	end
+
+end

data/test/netaddr_test.rb

@@ -0,0 +1,127 @@
+#!/usr/bin/ruby
+
+require_relative "../lib/netaddr.rb"
+require 'test/unit'
+
+class TestNetAddr < Test::Unit::TestCase
+
+	def test_ipv4_prefix_len
+		assert_equal(32,NetAddr.ipv4_prefix_len(1))
+		assert_equal(27,NetAddr.ipv4_prefix_len(30))
+		assert_equal(24,NetAddr.ipv4_prefix_len(254))
+		assert_equal(16,NetAddr.ipv4_prefix_len(0xfffe))
+		assert_equal(8,NetAddr.ipv4_prefix_len(0xfffffe))
+		assert_equal(0,NetAddr.ipv4_prefix_len(0xffffffff))
+	end
+	
+	def test_sort_IPv4
+		ips = []
+		["10.0.0.0","1.1.1.1","0.0.0.0","10.1.10.1"].each do |net|
+			ips.push(NetAddr::IPv4.parse(net))
+		end
+		sorted = NetAddr.sort_IPv4(ips)
+		expect = [ips[2],ips[1],ips[0],ips[3]]
+		assert_equal(expect, sorted)
+	end
+	
+	def test_sort_IPv4Net
+		nets = []
+		["10.0.0.0/24", "1.0.0.0/24", "10.0.0.0/8", "192.168.1.0/26", "8.8.8.8/32"].each do |net|
+			nets.push(NetAddr::IPv4Net.parse(net))
+		end
+		sorted = NetAddr.sort_IPv4Net(nets)
+		expect = [nets[1],nets[4],nets[0],nets[2],nets[3]]
+		assert_equal(expect, sorted)
+	end
+	
+	def test_summ_IPv4Net
+		nets = []
+		["10.0.0.0/29", "10.0.0.8/30", "10.0.0.12/30", "10.0.0.16/28", "10.0.0.32/27", "10.0.0.64/26", "10.0.0.128/25"].each do |net|
+			nets.push(NetAddr::IPv4Net.parse(net))
+		end
+		expect = ["10.0.0.0/24"]
+		i = 0
+		NetAddr.summ_IPv4Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+		
+		nets = []
+		["10.0.0.0/24", "1.0.0.0/8", "3.4.5.6/32", "3.4.5.8/31", "0.0.0.0/0"].each do |net|
+			nets.push(NetAddr::IPv4Net.parse(net))
+		end
+		expect = ["0.0.0.0/0"]
+		i = 0
+		NetAddr.summ_IPv4Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+		
+		nets = []
+		["10.0.1.0/25", "10.0.1.0/26", "10.0.0.16/28", "10.0.0.32/27", "10.0.0.128/26", "10.0.0.192/26", "10.0.0.32/27"].each do |net|
+			nets.push(NetAddr::IPv4Net.parse(net))
+		end
+		expect = ["10.0.0.16/28", "10.0.0.32/27", "10.0.0.128/25", "10.0.1.0/25"]
+		i = 0
+		NetAddr.summ_IPv4Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+	end
+	
+	def test_sort_IPv6
+		ips = []
+		["1::", "3::", "2::", "::", "::1"].each do |net|
+			ips.push(NetAddr::IPv6.parse(net))
+		end
+		sorted = NetAddr.sort_IPv6(ips)
+		expect = [ips[3],ips[4],ips[0],ips[2],ips[1]]
+		assert_equal(expect, sorted)
+	end
+	
+	def test_sort_IPv6Net
+		nets = []
+		["1::/64", "2::/64", "1::/16", "::", "::1"].each do |net|
+			nets.push(NetAddr::IPv6Net.parse(net))
+		end
+		sorted = NetAddr.sort_IPv6Net(nets)
+		expect = [nets[3],nets[4],nets[0],nets[2],nets[1]] # ::/128 ::1/128 1::/64 1::/16 2::/64
+		assert_equal(expect, sorted)
+	end
+	
+	def test_summ_IPv6Net
+		nets = []
+		["ff00::/13", "ff08::/14", "ff0c::/14", "ff10::/12", "ff20::/11", "ff40::/10", "ff80::/9"].each do |net|
+			nets.push(NetAddr::IPv6Net.parse(net))
+		end
+		expect = ["ff00::/8"]
+		i = 0
+		NetAddr.summ_IPv6Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+		
+		nets = []
+		["2::/32", "::1", "fec0::/16", "1::/16", "::/0"].each do |net|
+			nets.push(NetAddr::IPv6Net.parse(net))
+		end
+		expect = ["::/0"]
+		i = 0
+		NetAddr.summ_IPv6Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+		
+		nets = []
+		["ff80::/9", "ff10::/12", "ff80::/10", "ff20::/12", "fff0::/16", "fff1::/16", "ff80::/10"].each do |net|
+			nets.push(NetAddr::IPv6Net.parse(net))
+		end
+		expect = ["ff10::/12", "ff20::/12", "ff80::/9", "fff0::/15"]
+		i = 0
+		NetAddr.summ_IPv6Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+	end
+
+end

data/test/run_all.rb

@@ -0,0 +1,10 @@
+require_relative "examples.rb"
+require_relative "netaddr_test.rb"
+require_relative "eui48_test.rb"
+require_relative "eui64_test.rb"
+require_relative "ipv4_test.rb"
+require_relative "ipv4net_test.rb"
+require_relative "ipv6_test.rb"
+require_relative "ipv6net_test.rb"
+require_relative "mask32_test.rb"
+require_relative "mask128_test.rb"

metadata

@@ -1,42 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: netaddr
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Dustin Spinhirne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
 executables: []
 extensions: []
 extra_rdoc_files:
-- README
-- Errors
-- changelog
-- license
+- README.md
+- LICENSE
 files:
-- Errors
-- README
-- changelog
-- lib/cidr.rb
-- lib/cidr_shortcuts.rb
-- lib/eui.rb
-- lib/ip_math.rb
-- lib/methods.rb
+- LICENSE
+- README.md
+- lib/eui48.rb
+- lib/eui64.rb
+- lib/ipv4.rb
+- lib/ipv4net.rb
+- lib/ipv6.rb
+- lib/ipv6net.rb
+- lib/mask128.rb
+- lib/mask32.rb
 - lib/netaddr.rb
-- lib/tree.rb
-- lib/validation_shortcuts.rb
-- license
-- test/cidr_test.rb
-- test/eui_test.rb
-- test/methods_test.rb
-- test/tree_test.rb
-homepage: 
+- lib/util.rb
+- test/eui48_test.rb
+- test/eui64_test.rb
+- test/examples.rb
+- test/ipv4_test.rb
+- test/ipv4net_test.rb
+- test/ipv6_test.rb
+- test/ipv6net_test.rb
+- test/mask128_test.rb
+- test/mask32_test.rb
+- test/netaddr_test.rb
+- test/run_all.rb
+homepage: https://github.com/dspinhirne/netaddr-rb
 licenses:
 - Apache-2.0
 metadata: {}
@@ -56,8 +61,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A package for manipulating network addresses.
+summary: A Ruby library for performing calculations on IPv4 and IPv6 subnets.
 test_files: []