netdot-restclient 1.4 → 2.0.0

data/spec/spec_helper.rb

@@ -11,5 +11,5 @@ def connect
     ssl_verify: false
   }
   @netdot = Netdot::RestClient.new(args) if @netdot.nil?
-  return @netdot
+  @netdot
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netdot-restclient
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &79226940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
+  version_requirements: *79226940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &79224860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *79224860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &79027910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
+  version_requirements: *79027910
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &79027320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *79027320
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &79026340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,12 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *79026340
 description: Talk to Netdot via REST with Ruby
 email:
 - cvicente@gmail.com
@@ -99,21 +74,25 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop-bbatsov-default.yml
+- .rubocop-bbatsov-disabled.yml
+- .rubocop-bbatsov-enabled.yml
+- .rubocop.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/netdot.rb
 - lib/netdot/host.rb
+- lib/netdot/ipblock.rb
 - lib/netdot/restclient.rb
 - lib/netdot/restclient/version.rb
-- lib/netdot/subnet.rb
 - netdot-restclient.gemspec
-- sample/host.rb
+- sample/sample.rb
 - spec/host_spec.rb
+- spec/ipblock_spec.rb
 - spec/restclient_spec.rb
 - spec/spec_helper.rb
-- spec/subnet_spec.rb
 homepage: ''
 licenses:
 - Apache-2.0
@@ -135,12 +114,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: RESTful API client for Netdot
 test_files:
 - spec/host_spec.rb
+- spec/ipblock_spec.rb
 - spec/restclient_spec.rb
 - spec/spec_helper.rb
-- spec/subnet_spec.rb
+has_rdoc: 

data/lib/netdot/subnet.rb

@@ -1,107 +0,0 @@
-module Netdot
-  class Subnet
-    attr_accessor :connection
-
-    def initialize(argv = {})
-      [:connection].each do |k|
-        raise ArgumentError, "Missing required argument '#{k}'" unless argv[k]
-      end
-
-      argv.each { |k,v| instance_variable_set("@#{k}", v) }
-    end
-
-    # Get next available subnet in given container
-    #
-    # Arguments:
-    #    IP container block (string)
-    #    CIDR subnet size (optional integer)
-    #    description (optional string)
-    # Returns:
-    #    New subnet ID when successful
-    #
-    def allocate(container, prefix=24, description=nil)
-
-      # Netdot currently only supports /24 prefixes
-      raise ArgumentError, "Prefix size #{prefix} is not currently supported (must be 24)" unless prefix==24
-
-      # Search for container and get its ID
-      cont_id = get_ipblock_id(container)
-
-      # Get container's children blocks
-      begin
-        resp = @connection.get("Ipblock?parent=#{cont_id}")
-      rescue Exception => e
-        # Not Found is ok, otherwise re-raise
-        raise unless (e.message =~ /404/)
-      end
-
-      # store existing subnets in hash (if any)
-      subnets = Hash.new
-      if ( resp )
-        resp.values.each do |b|
-          b.each do |k,v|
-            address = v['address']
-            subnets[address] = 1
-          end
-        end
-      end
-
-      # Iterate over all possible subnets
-      # This assumes that subnets are /24
-      spref = container.split('/')[0]
-      spref.gsub!(/(\d+\.\d+)\..*/, '\1')
-
-      (1..255).each do |n|
-        saddr = spref.dup
-        saddr = spref + ".#{n}.0"
-        if !subnets.empty? && subnets.key?(saddr)
-          next # subnet exists
-        end
-
-        # Create subnet
-        args = { 'address' => saddr, 'prefix' => prefix.to_s, 'status' => 'Subnet' }
-        args['description'] = description unless description.nil?
-        resp = @connection.post("Ipblock", args)
-        return resp['address'] + '/' + resp['prefix']
-      end
-
-      raise "Could not allocate subnet in #{container}"
-    end
-
-    ######################################################################
-    # Delete subnet and all its records
-    #
-    # Arguments:
-    #    subnet address (CIDR)
-    # Returns:
-    #    True if successful
-    #
-    def delete(subnet)
-      resp = @connection.get("host?subnet=#{subnet}")
-
-      if ! resp.empty?
-        resp['Ipblock'].keys.each do |id|
-          @connection.delete("Ipblock/#{id}")
-        end
-      end
-
-      sid = get_ipblock_id(subnet)
-      @connection.delete("Ipblock/#{sid}")
-    end
-
-    private
-    ######################################################################
-    # Get Ipblock ID given its address in CIDR format
-    #
-    # Arguments:
-    #    subnet address (CIDR)
-    # Returns:
-    #    ID (number)
-    #
-    def get_ipblock_id(cidr)
-      (address, prefix) = cidr.split('/')
-      resp = @connection.get("Ipblock?address=#{address}&prefix=#{prefix}")
-      resp['Ipblock'].keys[0]
-    end
-  end
-end

data/sample/host.rb

@@ -1,36 +0,0 @@
-#
-# Example: Use the special-purpose 'host' resource 
-# to allocate a new IP and assign DNS records
-#
-#
-require 'netdot/restclient'
-
-require 'pp'
-
-netdot = Netdot::RestClient.new(
-                                :server   => 'http://localhost/netdot',
-                                :username => 'admin',
-                                :password => 'admin',
-                                )
-# Add 
-# This allocates the first available IP in the given subnet
-# and creates A and PTR records, assuming that the subnet
-# is associated with the appropriate forward and reverse zones
-netdot.post('host', { 'name' => 'testhost1', 'subnet' => '192.168.1.0/24'})
-
-# Find
-resp = netdot.get('host?name=testhost1.defaultdomain')
-
-pp resp
-
-ipid = resp['Ipblock'].keys[0]
-
-# Delete DNS records associated with new IP
-netdot.delete("host?ipid=#{ipid}")
-
-# Notice that the above does not delete the Ipblock object, but
-# marks it as "available"
-# If user has admin privileges and really wants to delete the 
-# Ipblock, then they can do:
-
-netdot.delete("Ipblock/#{ipid}")

data/spec/subnet_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-describe Netdot::Subnet do
-
-  before :all do
-    @netdot = connect
-    @subnet = Netdot::Subnet.new(:connection => @netdot) if @subnet.nil?
-  end
-
-  context 'when creating a new Subnet instance' do
-    it 'creates a new instance' do
-      expect {
-        subnet = Netdot::Subnet.new(:connection => @netdot)
-      }.not_to raise_error
-    end
-
-    it 'raises an exception for invalid arguments' do
-      expect {
-        subnet = Netdot::Subnet.new
-      }.to raise_error(ArgumentError)
-    end
-  end
-
-  context 'creating a new subnet' do
-    it 'allocates a new subnet' do
-      subnet_id = @subnet.allocate('10.0.0.0/8', 24, 'test')
-      expect(subnet_id).to match('10.0.*.0/24') 
-    end
-
-    it 'throws an exception if the prefix is not /24' do
-      expect {
-        subnet_id = @subnet.allocate('10.0.0.0/8', 26)
-      }.to raise_error(ArgumentError)
-    end
-  end
-
-  context 'deleting a subnet' do
-    let(:subnet_id) do
-      @subnet.allocate('10.0.0.0/8', 24)
-    end
-
-    it 'deletes a subnet' do
-      expect(@subnet.delete(subnet_id)).to be_truthy
-    end
-  end
-end