netdot-restclient 2.0.1 → 2.0.3

data/lib/netdot/host.rb

@@ -51,6 +51,28 @@ module Netdot
       @connection.post('host', 'name' => name, 'address' => ip)
     end
 
+    # Creates a DNS A record for the specified name, using the next
+    # available IP address in the given subnet.
+    # Will also create PTR record if .arpa zone exists.
+    # @param name [String]
+    # @param subnet [String]
+    # @return [String] IP address allocated
+    def create_next(name, subnet)
+      Netdot.logger.debug("Creating new DNS records with name:#{name}" \
+      " and in subnet:#{subnet}")
+      host = @connection.post('host', 'name' => name, 'subnet' => subnet)
+      r = find_by_name(host['name'])
+      # The issue here is that the response only gives us the RR
+      # which can have both IPv4 and IPv6 addresses, so we need to
+      # try to pick the right one to return
+      r['Ipblock'].keys.each do |id|
+        if (r['Ipblock'][id]['parent'] == subnet)
+          return r['Ipblock'][id]['address']
+        end
+      end
+      fail 'Failed to find the allocated address'
+    end
+
     # Updates the DNS A record for the sepcified name and IP.
     # Will also create PTR record if .arpa zone exists.
     # @param name [String]

data/lib/netdot/ipblock.rb

@@ -21,9 +21,8 @@ module Netdot
     # @return [String] new Ipblock id, or nil
     def allocate(container, prefix = 24, description = nil)
       # Netdot currently only supports /24 prefixes
-      fail ArgumentError,
-           "Prefix size #{prefix} is not currently supported (must be 24)" \
-        unless prefix == 24
+      fail ArgumentError, "Prefix size #{prefix} is not currently supported \
+                          (must be 24)" unless prefix == 24
 
       # Search for container and get its ID
       cont_id = find_by_addr(container)
@@ -111,8 +110,8 @@ module Netdot
     # @return [Array<Ipblock>]
     def find_by_descr(descr)
       @connection.get("Ipblock?description=#{descr}")['Ipblock']
-      rescue => e
-        raise unless e.message =~ /404/
+    rescue => e
+      raise unless e.message =~ /404/
     end
   end
 end

data/lib/netdot/restclient/version.rb

@@ -2,7 +2,7 @@
 module Netdot
   # RestClient
   class RestClient
-    VERSION = '2.0.1'
+    VERSION = '2.0.3'
 
     def version
       VERSION

data/spec/host_spec.rb

@@ -3,10 +3,14 @@ require 'spec_helper'
 describe Netdot::Host do
   before :all do
     @netdot = connect
+    @ipblock = Netdot::Ipblock.new(connection: @netdot)
     @host = Netdot::Host.new(connection: @netdot) if @host.nil?
-    pblock = Netdot::Ipblock.new(connection: @netdot)
-    cidr = pblock.allocate('10.0.0.0/8', 24, 'rspec-Ipblock-host')
-    @cidr = NetAddr::CIDR.create(cidr)
+    @test_net = '198.18.254.0/24' # RFC 2544
+    @test_6net = '2001:db8:ffff::/64' # RFC 3839
+    @netdot.post('Ipblock', 'address' => @test_net, 'status' => 'Subnet')
+    @netdot.post('Ipblock', 'address' => @test_6net, 'status' => 'Subnet')
+    @cidr = NetAddr::CIDR.create(@test_net)
+    @cidr6 = NetAddr::CIDR.create(@test_6net)
   end
 
   context 'when creating a new Host instance' do
@@ -24,12 +28,24 @@ describe Netdot::Host do
   end
 
   context 'when creating a new host' do
-    it 'creates a new host allocation' do
+    it 'creates new records for given name and IP' do
       h = @host.create('rspec-test0-01-yyy', @cidr.nth(1))
       expect(h.key? 'name').to be_truthy
       expect(h['name']).to match('rspec-test0-01-yyy')
     end
 
+    it 'creates new records for given name in given v4 subnet' do
+      h = @host.create_next('rspec-test0-02-yyy', @cidr.to_s)
+      expect(h).to be_truthy
+      expect(h).to match(@cidr.nth(2))
+    end
+
+    it 'creates new records for given name in given v6 subnet' do
+      h = @host.create_next('rspec-test0-02-yyy', @cidr6.to_s(Short: true))
+      expect(h).to be_truthy
+      expect(h).to match(@cidr6.nth(1, Short: true))
+    end
+
     it 'updates an existing allocation' do
       h = @host.update('rspec-test0-01-zzz', @cidr.nth(1))
       expect(h.key? 'name').to be_truthy
@@ -56,4 +72,13 @@ describe Netdot::Host do
       end.not_to raise_error
     end
   end
+
+  context 'when cleaning up' do
+    it 'deletes test subnet and all its children' do
+      expect(@ipblock.delete(@test_net, true)).to be_truthy
+    end
+    it 'deletes test v6 subnet and all its children' do
+      expect(@ipblock.delete(@test_6net, true)).to be_truthy
+    end
+  end
 end

data/spec/ipblock_spec.rb

@@ -42,11 +42,11 @@ describe Netdot::Ipblock do
     it 'raises an exception for an improperly formatted name' do
       expect do
         @ipblock.find_by_descr('rspec-Ipblock-one&Foo=bar')
-      end.to raise_error
+      end.to raise_error(RuntimeError)
     end
 
-    it 'return nil for an empty string' do
-      expect(@ipblock.find_by_descr('')).to be_nil
+    it 'return nil for a non-existent string' do
+      expect(@ipblock.find_by_descr('21684dfgergscvfwr')).to be_nil
     end
 
     it 'return nil if not found' do

data/spec/restclient_spec.rb

@@ -24,7 +24,7 @@ describe Netdot::RestClient do
       }
       expect do
         Netdot::RestClient.new(args)
-      end.to raise_error
+      end.to raise_error(RuntimeError)
     end
 
     # The following two assume that local server has SSL
@@ -38,7 +38,7 @@ describe Netdot::RestClient do
       if ENV['SERVER'] =~ /^https:/
         expect do
           Netdot::RestClient.new(args)
-        end.to raise_error
+        end.to raise_error(RuntimeError)
       else
         STDERR.puts 'Warning: Skipping the following test' \
           ", as URL scheme is not 'https:'"
@@ -67,7 +67,7 @@ describe Netdot::RestClient do
     it 'invalid resource raises exception' do
       expect do
         @netdot.get('foobar')
-      end.to raise_error
+      end.to raise_error(RuntimeError)
     end
 
     it 'valid resource as hash' do
@@ -90,7 +90,7 @@ describe Netdot::RestClient do
     it 'fails to update invalid record' do
       expect do
         @netdot.post('Foobar/1', 'key' => 'value')
-      end.to raise_error
+      end.to raise_error(RuntimeError)
     end
 
     it 'creates new record' do
@@ -110,7 +110,7 @@ describe Netdot::RestClient do
                      'lastname' => 'Plumber',
                      'username' => 'joetubes'
                     )
-      end.to raise_error
+      end.to raise_error(RuntimeError)
     end
   end
 
@@ -118,7 +118,7 @@ describe Netdot::RestClient do
     it 'fails to delete invalid record' do
       expect do
         @netdot.delete('FooBar/1234')
-      end.to raise_error
+      end.to raise_error(RuntimeError)
     end
 
     it 'deletes exiting record' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netdot-restclient
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &81443330 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.9'
   type: :development
   prerelease: false
-  version_requirements: *81443330
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &81443080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *81443080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: netaddr
-  requirement: &81442850 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: *81442850
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &81442620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '10.4'
   type: :development
   prerelease: false
-  version_requirements: *81442620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &81442390 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: *81442390
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &81442160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: '2.99'
   type: :development
   prerelease: false
-  version_requirements: *81442160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: rubocop
-  requirement: &81441930 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: '0.31'
   type: :development
   prerelease: false
-  version_requirements: *81441930
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &81441700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *81441700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &81441470 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +149,15 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *81441470
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &81441240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +165,12 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *81441240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Talk to Netdot via REST with Ruby
 email:
 - cvicente@gmail.com
@@ -170,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: RESTful API client for Netdot