smart_proxy_dns_infoblox 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f067a373f17dd6adba9aea33e3084c5e005d3b26
-  data.tar.gz: 6e19878e4ac1cd475a30da5a23632cf35e245ab6
+  metadata.gz: 93913c19fdbb004b2265f61341b782c234eb4b7d
+  data.tar.gz: 063e1118acfb2a85593c2b774d382663239493dc
 SHA512:
-  metadata.gz: 0f67055c0fb692c6380c6bcda4b1f56c046d9b39c5c526f80622256b9e31a937efa3c5485b14f9589890e85a2d8322e8f9a52df0d0c09aefd623cba28f0cc410
-  data.tar.gz: 422837060375ce89e38fbedbf5f98ea48c515c21e2c961fb70d57a30391ea659bd9add9e3ab21eae78824dd0f189556ad08a974a4230241c716ee60edbf21efb
+  metadata.gz: 9fd8344ceffca0e6344b0ba7c2b86fd540df89fc2089f51e32d11e3179092f6dcf5137b46673c9a8e73a53acadd644bdc275bb8a32ca9412b661d64c22fea612
+  data.tar.gz: 90300ea7cc4e2083ed376fe7138c93e00352287847494ab020bbd0cc0eda8668d1be9138631cfc2d9c28fc03c049d00e19e30c5463dcdc68198ecb113e6e855b

data/bundler.d/dns_infoblox.rb

@@ -1,2 +1,5 @@
 gem 'smart_proxy_dns_infoblox'
-gem 'infoblox'
+
+group :dns_infoblox do
+  gem 'infoblox'
+end

data/lib/smart_proxy_dns_infoblox/dns_infoblox_main.rb

@@ -8,51 +8,74 @@ module Proxy::Dns::Infoblox
       super(host, ttl)
     end
 
-    def create_a_record(fqdn, ip)
-      case a_record_conflicts(fqdn, ip) #returns -1, 0, 1
-      when 1
-        raise(Proxy::Dns::Collision, "'#{fqdn} 'is already in use")
-      when 0 then
-        return nil
-      else
-        do_create(Infoblox::Arecord, :connection => connection, :name => fqdn, :ipv4addr => ip)
-      end
+    def do_create(name, value, type)
+      method = "ib_create_#{type.downcase}_record".to_sym
+      raise(Proxy::Dns::Error, "Creation of #{type} records not implemented") unless respond_to?(method, true)
+      send(method, name, value)
     end
 
-    def create_ptr_record(fqdn, ptr)
-      case ptr_record_conflicts(fqdn, ptr_to_ip(ptr)) #returns -1, 0, 1
-      when 1
-        raise(Proxy::Dns::Collision, "'#{fqdn} 'is already in use")
-      when 0 then
-        return nil
-      else
-        do_create(Infoblox::Ptr, :connection => connection, :ptrdname => fqdn, :ipv4addr => ptr_to_ip(ptr))
-      end
-      # FIXME: add a reverse 'PTR' record with ip, fqdn
+    def do_remove(name, type)
+      method = "ib_remove_#{type.downcase}_record".to_sym
+      raise(Proxy::Dns::Error, "Deletion of #{type} records not implemented") unless respond_to?(method, true)
+      send(method, name)
     end
 
-    def remove_a_record(fqdn)
-      do_delete(Infoblox::Arecord.find(connection, :name => fqdn, :_max_results => 1).first, fqdn)
+    private
+
+    def ib_create_a_record(fqdn, address)
+      ib_create(Infoblox::Arecord, :name => fqdn, :ipv4addr => address)
     end
 
-    def remove_ptr_record(ptr)
-      ptr_record = Infoblox::Ptr.find(connection, :ipv4addr => ptr_to_ip(ptr), :_max_results => 1).first
-      unless ptr_record.nil?
-        ptr_record.ipv6addr = nil
-        ptr_record.view = nil
-      end
+    def ib_remove_a_record(fqdn)
+      ib_delete(Infoblox::Arecord, :name => fqdn)
+    end
 
-      do_delete(ptr_record, ptr)
-      # FIXME: remove the reverse 'PTR' record with ip
+    def ib_create_aaaa_record(fqdn, address)
+      ib_create(Infoblox::AAAArecord, :name => fqdn, :ipv6addr => address)
     end
 
-    def do_create(clazz, params)
-      clazz.new(params).post
+    def ib_remove_aaaa_record(fqdn)
+      ib_delete(Infoblox::AAAArecord, :name => fqdn)
     end
 
-    def do_delete(record, id)
-      raise Proxy::Dns::NotFound, "Cannot find DNS entry for #{id}" if record.nil?
-      record.delete || (raise Proxy::Dns::NotFound, "Cannot find DNS entry for #{id}")
+    def ib_create_cname_record(fqdn, target)
+      ib_create(Infoblox::Cname, :name => fqdn, :canonical => target)
+    end
+
+    def ib_remove_cname_record(fqdn)
+      ib_delete(Infoblox::Cname, :name => fqdn)
+    end
+
+    def ib_create_ptr_record(ptr, fqdn)
+      ip = IPAddr.new(ptr_to_ip(ptr))
+
+      params = {
+        :ptrdname => fqdn,
+        :name => ptr
+      }
+      params["ipv#{ip.ipv4? ? 4 : 6}addr".to_sym] = ip.to_s
+
+      ib_create(Infoblox::Ptr, params)
+    end
+
+    def ib_remove_ptr_record(ptr)
+      ip = IPAddr.new(ptr_to_ip(ptr))
+
+      params = {}
+      params["ipv#{ip.ipv4? ? 4 : 6}addr".to_sym] = ip.to_s
+
+      ib_delete(Infoblox::Ptr, params)
+    end
+
+    def ib_create(clazz, params)
+      clazz.new({ :connection => connection }.merge(params)).post
+    end
+
+    def ib_delete(clazz, params)
+      record = clazz.find(connection, params.merge(:_max_results => 1)).first
+
+      raise Proxy::Dns::NotFound, "Cannot find #{clazz.class.name} entry for #{params}" if record.nil?
+      record.delete || (raise Proxy::Dns::NotFound, "Cannot find #{clazz.class.name} entry for #{params}")
     end
   end
 end

data/lib/smart_proxy_dns_infoblox/dns_infoblox_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module Dns
     module Infoblox
-      VERSION = '0.0.4'
+      VERSION = '0.0.6'
     end
   end
 end

data/test/infoblox_test.rb

@@ -10,35 +10,31 @@ class InfobloxTest < Test::Unit::TestCase
   end
 
   def setup
-    @connection = Object.new
-    @record = DummyRecord.new
-    @provider = Proxy::Dns::Infoblox::Record.new('a_host', @connection, 999)
+    @provider = Proxy::Dns::Infoblox::Record.new('a_host', nil, 999)
   end
 
   def test_create_a
     fqdn = 'test.example.com'
     ip = '10.1.1.1'
 
-    @provider.expects(:a_record_conflicts).with(fqdn, ip).returns(-1)
-    @provider.expects(:do_create).with(Infoblox::Arecord, :connection => @connection, :name => fqdn, :ipv4addr => ip)
-
-    @provider.create_a_record(fqdn, ip)
+    @provider.expects(:ib_create).with(Infoblox::Arecord, :name => fqdn, :ipv4addr => ip)
+    @provider.do_create(fqdn, ip, 'A')
   end
 
-  def test_create_a_conflicting_record
+  def test_create_aaaa
     fqdn = 'test.example.com'
-    ip = '10.1.1.1'
+    ip = '2002:fc80::2'
 
-    @provider.expects(:a_record_conflicts).with(fqdn, ip).returns(1)
-    assert_raises(Proxy::Dns::Collision) { @provider.create_a_record(fqdn, ip) }
+    @provider.expects(:ib_create).with(Infoblox::AAAArecord, :name => fqdn, :ipv6addr => ip)
+    @provider.do_create(fqdn, ip, 'AAAA')
   end
 
-  def test_create_a_already_exists
+  def test_create_cname
     fqdn = 'test.example.com'
-    ip = '10.1.1.1'
+    target = 'test-2.example.com'
 
-    @provider.expects(:a_record_conflicts).with(fqdn, ip).returns(0)
-    assert_nil @provider.create_a_record(fqdn, ip)
+    @provider.expects(:ib_create).with(Infoblox::Cname, :name => fqdn, :canonical => target)
+    @provider.do_create(fqdn, target, 'CNAME')
   end
 
   def test_create_ptr
@@ -46,70 +42,53 @@ class InfobloxTest < Test::Unit::TestCase
     ptr = '1.1.1.10.in-addr.arpa'
     ip = '10.1.1.1'
 
-    @provider.expects(:ptr_record_conflicts).with(fqdn, ip).returns(-1)
-    @provider.expects(:do_create).with(Infoblox::Ptr, :connection => @connection, :ptrdname => fqdn, :ipv4addr => ip)
-
-    @provider.create_ptr_record(fqdn, ptr)
+    @provider.expects(:ib_create).with(Infoblox::Ptr, :name => ptr, :ptrdname => fqdn, :ipv4addr => ip)
+    @provider.do_create(ptr, fqdn, 'PTR')
   end
 
-  def test_create_ptr_conflicting_record
+  def test_create_ptr_v6
     fqdn = 'test.example.com'
-    ptr = '1.1.1.10.in-addr.arpa'
-    ip = '10.1.1.1'
+    ptr = '8.0.0.0.7.0.0.0.6.0.0.0.5.0.0.0.4.0.0.0.3.0.0.0.2.0.0.0.1.0.0.0.ip6.arpa'
+    ip = '1:2:3:4:5:6:7:8'
 
-    @provider.expects(:ptr_record_conflicts).with(fqdn, ip).returns(1)
-    assert_raises(Proxy::Dns::Collision) { @provider.create_ptr_record(fqdn, ptr) }
+    @provider.expects(:ib_create).with(Infoblox::Ptr, :name => ptr, :ptrdname => fqdn, :ipv6addr => ip)
+    @provider.do_create(ptr, fqdn, 'PTR')
   end
 
-  def test_create_ptr_already_exists
+  def test_remove_a
     fqdn = 'test.example.com'
-    ptr = '1.1.1.10.in-addr.arpa'
-    ip = '10.1.1.1'
 
-    @provider.expects(:ptr_record_conflicts).with(fqdn, ip).returns(0)
-    assert_nil @provider.create_ptr_record(fqdn, ptr)
+    @provider.expects(:ib_delete).with(Infoblox::Arecord, :name => fqdn)
+    @provider.do_remove(fqdn, 'A')
   end
 
-  def test_remove_a
+  def test_remove_aaaa
     fqdn = 'test.example.com'
-    Infoblox::Arecord.expects(:find).with(@connection, :name => fqdn, :_max_results => 1).returns([@record])
-    @record.expects(:delete).returns(true)
-    @provider.remove_a_record(fqdn)
-  end
 
-  def test_remove_a_not_found
-    fqdn = 'test.example.com'
-    Infoblox::Arecord.expects(:find).with(@connection, :name => fqdn, :_max_results => 1).returns([])
-    assert_raises(Proxy::Dns::NotFound) { @provider.remove_a_record(fqdn) }
+    @provider.expects(:ib_delete).with(Infoblox::AAAArecord, :name => fqdn)
+    @provider.do_remove(fqdn, 'AAAA')
   end
 
-  def test_remove_a_returns_with_a_non_200_status
+  def test_remove_cname
     fqdn = 'test.example.com'
-    Infoblox::Arecord.expects(:find).with(@connection, :name => fqdn, :_max_results => 1).returns([@record])
-    @record.expects(:delete).returns(false)
-    assert_raises(Proxy::Dns::NotFound) { @provider.remove_a_record(fqdn) }
+
+    @provider.expects(:ib_delete).with(Infoblox::Cname, :name => fqdn)
+    @provider.do_remove(fqdn, 'CNAME')
   end
 
   def test_remove_ptr
     ptr = '1.1.1.10.in-addr.arpa'
     ip = '10.1.1.1'
-    Infoblox::Ptr.expects(:find).with(@connection, :ipv4addr => ip, :_max_results => 1).returns([@record])
-    @record.expects(:delete).returns(true)
-    @provider.remove_ptr_record(ptr)
-  end
 
-  def test_remove_ptr_not_found
-    ptr = '1.1.1.10.in-addr.arpa'
-    ip = '10.1.1.1'
-    Infoblox::Ptr.expects(:find).with(@connection, :ipv4addr => ip, :_max_results => 1).returns([])
-    assert_raises(Proxy::Dns::NotFound) { @provider.remove_ptr_record(ptr) }
+    @provider.expects(:ib_delete).with(Infoblox::Ptr, :ipv4addr => ip)
+    @provider.do_remove(ptr, 'PTR')
   end
 
-  def test_remove_ptr_returns_with_a_non_200_status
-    ptr = '1.1.1.10.in-addr.arpa'
-    ip = '10.1.1.1'
-    Infoblox::Ptr.expects(:find).with(@connection, :ipv4addr => ip, :_max_results => 1).returns([@record])
-    @record.expects(:delete).returns(false)
-    assert_raises(Proxy::Dns::NotFound) { @provider.remove_ptr_record(ptr) }
+  def test_remove_ptr_v6
+    ptr = '8.0.0.0.7.0.0.0.6.0.0.0.5.0.0.0.4.0.0.0.3.0.0.0.2.0.0.0.1.0.0.0.ip6.arpa'
+    ip = '1:2:3:4:5:6:7:8'
+
+    @provider.expects(:ib_delete).with(Infoblox::Ptr, :ipv6addr => ip)
+    @provider.do_remove(ptr, 'PTR')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dns_infoblox
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Matthew Nicholson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies: []
 description: Infoblox DNS provider plugin for Foreman's smart proxy
 email:
@@ -29,9 +29,9 @@ files:
 - test/configuration_test.rb
 - test/infoblox_test.rb
 - test/test_helper.rb
-homepage: https://github.com/sjoeboo/smart_proxy_dns_infoblox
+homepage: https://github.com/theforeman/smart_proxy_dns_infoblox
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -49,11 +49,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Infoblox DNS provider plugin for Foreman's smart proxy
 test_files:
-- test/configuration_test.rb
 - test/infoblox_test.rb
 - test/test_helper.rb
+- test/configuration_test.rb