iblox 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 678b86b0e1c03bb31eb8ffcd9367b8e7af450ca0
-  data.tar.gz: 35dbd2fb53c1b7ace8a96cf8ff18564bbf241598
+  metadata.gz: 36ea496cb3bfc27dba8fc1cdeacc0d2d1490d1d3
+  data.tar.gz: ba43ecca3274f223750e3c391faeb17ad3815583
 SHA512:
-  metadata.gz: af467ec41f2b56d39e0329f28cbd008f0116bb1d90b77c828c76bcacfe9a3473fb8e119984b4198bb2df84b40abc5f0077fd7c23f66324ce9a95694652da3d43
-  data.tar.gz: a35ef0aac5f869c6c3189dda3899a3a5220e092adcbb1198e259d425b4d5106cb10eb3ccef20ea579906bd3eb218a953e81625ec141985aa39d6b1d18bccb4cd
+  metadata.gz: 870d2ec8098b69d2fb132d8496013603e971b35389a2880d3ee317034440462cb35c6811632844f0ebc2c4049dd71b72708165d76afa0259e92138132f2c50b0
+  data.tar.gz: 87f025a668f38821fb1b390e114e63fd1a37fd14a2e9a5925eec8cdc92120839733ea3d5c05c1b08db3e64567912673c69ffcff244a89e05be4ecc8a0e60c406

data/bin/iblox

@@ -2,15 +2,15 @@
 require 'infoblox'
 require 'pp'
 require 'yaml'
+require 'json'
 require 'ipaddr'
 require 'optparse'
-require 'blox'
+require 'iblox'
 
-ENV['WAPI_VERSION']='2.0'
 options = Hash.new
 
 OptionParser.new do |opts|
-  opts.banner = "Usage infoblox <Facility (dns|dhcp)> <action>(add|update|delete) [options]"
+  opts.banner = "Usage iblox <Facility (dns|dhcp)> <action>(add|update|delete) [options]"
   opts.on("-c", "--config /path/to/infoblox.yaml",String, "use custom config path (~/.infoblox.yaml, /etc/infoblox.yaml)") do |config |
     options.merge!(Hash[YAML::load(open(config)).map { |k, v| [k.to_sym, v] }])
     options[:config] = config
@@ -36,10 +36,21 @@ OptionParser.new do |opts|
   opts.on("-p", "--new-mac 00:05:67:45:32:02",String,"New Mac Address to use") do |new_mac|
     options[:new_mac] = new_mac
   end
+  opts.on("-a", "--api 2.0",String,"WAPI Version") do |api|
+    options[:wapi_version] = api
+  end
+  opts.on("-r", "--range","Use a DHCP range when finding addresses") do |range|
+    options[:range] = range
+  end
 
   opts.on("-v","--verbose", "Be verbose") do |v|
     options[:verbose] = v
   end
+
+  opts.on("-b", "--batch /path/to/batch_file",String,"Turn on Batch mode") do |batch|
+    options[:batch] = batch
+  end
+
   opts.parse!
 end
 
@@ -69,62 +80,97 @@ else
   end
 end
 
-#dns and dhc have different requirements for options and functions.
+#dns and dhcp have different requirements for options and functions.
 
 case options[:facility]
 when "dns"
-  if options[:ip] == nil or options[:fqdn] == nil
-    raise "Both IP and FQDN are required for DNS actions"
+  #are we doing batch mode?
+  if options[:batch] != nil
+    batch_data=Iblox.batch_dns_load(options[:batch])
+  else
+    if options[:ip] == nil or options[:fqdn] == nil
+      raise "Both IP and FQDN are required for DNS actions"
+    end
+    #lets load batch_data with our one item so we can just "loop" that in either case
+    batch_data=[]
+    single_item={}
+    single_item[:fqdn] = options[:fqdn]
+    single_item[:ip] = options[:ip]
+    batch_data.push(single_item)
   end
-  connection=Iblox.connect(options[:username],options[:password],options[:host])
-  if Iblox.ipv4check(options[:ip])
-    case options[:action]
-    when "add"
-      #Be smarter here, see if we exist, and if so don't #FAIL, just say so.
-      if !Iblox.dns_exists(options[:fqdn],options[:ip],options[:verbose],connection)
-        if options[:verbose] ==true
-          puts "record doesn't exist, adding"
+  pp batch_data
+  #connect once
+  connection=Iblox.connect(options[:username],options[:password],options[:host],options[:wapi_version])
+  batch_data.each do |item|
+    if Iblox.ipv4check(item[:ip])
+      case options[:action]
+      when "add"
+        #Be smarter here, see if we exist, and if so don't #FAIL, just say so.
+        if !Iblox.dns_exists(item[:fqdn],item[:ip],options[:verbose],connection)
+          if options[:verbose] ==true
+            puts "record doesn't exist, adding"
+          end
+          Iblox.dns_add(item[:fqdn],item[:ip],options[:verbose],connection)
+        else
+          if options[:verbose] ==true
+            puts "record exists! not adding"
+          end
         end
-        Iblox.dns_add(options[:fqdn],options[:ip],options[:verbose],connection)
-      else
-        if options[:verbose] ==true
-          puts "record exists! not adding"
+      when "update"
+        #if we're in batch ode, bail out, cause...well i haven't written that yet.
+        if options[:batch] != nil
+          raise "Update in Batch mode not supported yet"
+        else
+          #check we got the new values.
+          if ((options[:new_ip] != nil) or (options[:new_fqdn] != nil))
+            Iblox.dns_update(item[:fqdn],item[:ip],options[:new_fqdn],options[:new_ip],options[:verbose],connection)
+          else
+            raise "No new IP or FQDN provided for update action"
+          end
         end
+      when "delete"
+        Iblox.dns_delete(item[:fqdn],item[:ip],options[:verbose],connection)
       end
-    when "update"
-      #check we got the new values.
-      if ((options[:new_ip] != nil) or (options[:new_fqdn] != nil))
-        Iblox.dns_update(options[:fqdn],options[:ip],options[:new_fqdn],options[:new_ip],options[:verbose],connection)
-      else
-        raise "No new IP or FQDN provided for update action"
-      end
-    when "delete"
-      Iblox.dns_delete(options[:fqdn],options[:ip],options[:verbose],connection)
     end
   end
 
 when "dhcp"
-  if (options[:ip] == nil and options[:network] == nil) or options[:fqdn] == nil or options[:mac] ==nil
-    raise "IP or Network, and FQDN and MAC are required for DNS actions"
+  #are we doing batch mode?
+  if options[:batch] != nil
+    batch_data=Iblox.batch_dhcp_load(options[:batch])
+  else
+    if (options[:ip] == nil and options[:network] == nil) or options[:fqdn] == nil or options[:mac] ==nil
+      raise "IP or Network, and FQDN and MAC are required for DHCP actions"
+    end
+    #lets load batch_data with our one item so we can just "loop" that in either case
+    batch_data=[]
+    single_item={}
+    single_item[:fqdn] = options[:fqdn]
+    single_item[:ip] = options[:ip]
+    single_item[:mac] = options[:mac]
+    single_item[:network] = options[:network]
+    batch_data.push(single_item)
   end
-  connection=Iblox.connect(options[:username],options[:password],options[:host])
+  #connect once
+  connection=Iblox.connect(options[:username],options[:password],options[:host],options[:wapi_version])
   if options[:verbose] ==true
     puts "Connected to Infoblox"
   end
+  batch_data.each do |item|
     case options[:action]
     when "add"
       #if we have an ip, check for existing reservation
       # if not check get next avail
-      if (options[:ip] == nil and options[:network] != nil)
+      if (item[:ip] == nil and item[:network] != nil)
         #get net avail ip
-        options[:ip]=Iblox.dhcp_next(options[:network],options[:verbose],connection)
+        item[:ip]=Iblox.dhcp_next(item[:network],options[:verbose],connection,options[:range])
       end
-      if Iblox.ipv4check(options[:ip])
-        if !Iblox.dhcp_exists(options[:mac],options[:verbose],connection)
+      if Iblox.ipv4check(item[:ip])
+        if !Iblox.dhcp_exists(item[:mac],options[:verbose],connection)
           if options[:verbose] ==true
             puts "record doesn't exist, adding"
           end
-          Iblox.dhcp_add(options[:fqdn],options[:ip],options[:mac],options[:verbose],connection)
+          Iblox.dhcp_add(item[:fqdn],item[:ip],item[:mac],options[:verbose],connection)
         else
           if options[:verbose] ==true
             puts "record exists! not adding"
@@ -132,13 +178,79 @@ when "dhcp"
         end
       end
     when "update"
-      if ((options[:new_ip] != nil) or (options[:new_fqdn] != nil) or (options[:new_mac] != nil ))
-        Iblox.dhcp_update(options[:fqdn],options[:ip],options[:mac],options[:new_fqdn],options[:new_ip],options[:new_mac],options[:verbose],connection)
+      if options[:batch] != nil
+        raise "Update in Batch mode not supported yet"
       else
-        raise "No new IP, MAC, od FQDN provided for update action"
+        if ((options[:new_ip] != nil) or (options[:new_fqdn] != nil) or (options[:new_mac] != nil ))
+          Iblox.dhcp_update(options[:fqdn],options[:ip],options[:mac],options[:new_fqdn],options[:new_ip],options[:new_mac],options[:verbose],connection)
+        else
+          raise "No new IP, MAC, od FQDN provided for update action"
+        end
       end
     when "delete"
-      Iblox.dhcp_delete(options[:fqdn],options[:ip],options[:mac],options[:verbose],connection)
+      Iblox.dhcp_delete(item[:fqdn],item[:ip],item[:mac],options[:verbose],connection)
     end
-    #when "both"
   end
+when "both"
+  #do both operations
+  #are we doing batch mode?
+  if options[:batch] != nil
+    #We can use the dhcp loader here since it loads all the info we need
+    batch_data=Iblox.batch_dhcp_load(options[:batch])
+  else
+    if (options[:ip] == nil and options[:network] == nil) or options[:fqdn] == nil or options[:mac] ==nil
+      raise "IP or Network, and FQDN and MAC are required for DHCP+DNS actions"
+    end
+    #lets load batch_data with our one item so we can just "loop" that in either case
+    batch_data=[]
+    single_item={}
+    single_item[:fqdn] = options[:fqdn]
+    single_item[:ip] = options[:ip]
+    single_item[:mac] = options[:mac]
+    single_item[:network] = options[:network]
+    batch_data.push(single_item)
+  end
+  #connect once
+  connection=Iblox.connect(options[:username],options[:password],options[:host],options[:wapi_version])
+  if options[:verbose] ==true
+    puts "Connected to Infoblox"
+  end
+  batch_data.each do |item|
+    case options[:action]
+    when "add"
+      #if we have an ip, check for existing reservation
+      # if not check get next avail
+      if (item[:ip] == nil and item[:network] != nil)
+        #get net avail ip
+        item[:ip]=Iblox.dhcp_next(item[:network],options[:verbose],connection,options[:range])
+      end
+      if Iblox.ipv4check(item[:ip])
+        if !Iblox.dhcp_exists(item[:mac],options[:verbose],connection)
+          if options[:verbose] ==true
+            puts "record doesn't exist, adding"
+          end
+          Iblox.dhcp_add(item[:fqdn],item[:ip],item[:mac],options[:verbose],connection)
+          if !Iblox.dns_exists(item[:fqdn],item[:ip],options[:verbose],connection)
+            if options[:verbose] ==true
+              puts "record doesn't exist, adding"
+            end
+            Iblox.dns_add(item[:fqdn],item[:ip],options[:verbose],connection)
+          else
+            if options[:verbose] ==true
+              puts "DNS record exists! not adding"
+            end
+          end
+        else
+          if options[:verbose] ==true
+            puts "DHCP record exists! not adding"
+          end
+        end
+      end
+    when "update"
+      raise "update not supported for BOTH mode right now"
+    when "delete"
+      Iblox.dhcp_delete(item[:fqdn],item[:ip],item[:mac],options[:verbose],connection)
+      Iblox.dns_delete(item[:fqdn],item[:ip],options[:verbose],connection)
+    end
+  end
+end

data/lib/iblox.rb

@@ -14,11 +14,83 @@ def self.config_find()
 end
 
 #Open infoblox connection object
-def self.connect (username, password, host)
+def self.connect (username, password, host, wapi_version)
+  ::Infoblox.wapi_version = "#{wapi_version}"
   connection = Infoblox::Connection.new(username: "#{username}",password: "#{password}", host: "#{host}")
   return connection
 end
 
+def self.batch_dns_load(batch_file)
+  #First, see if we're using .csv, .yaml/.yml, or .json
+  ext=batch_file.split('.')[-1]
+  if ext.match(/(csv|yaml|yml|json)/)
+    #make sure it exists
+    if (File.exist? File.expand_path batch_file)
+      batch_data=[]
+      case ext
+      when "csv"
+        batch_data=[]
+        f=File.open(batch_file)
+        f.each_line do|line|
+          entry = {}
+          entry[:fqdn] = line.split(',')[0].chomp
+          entry[:ip] = line.split(',')[1].chomp
+          batch_data.push(entry)
+        end
+      when "yaml","yml"
+        batch_data=YAML::load(File.open(batch_file))
+      when "json"
+        batch_data=JSON.parse(File.read(batch_file),{:symbolize_names => true})
+      else
+        raise ("Batch filetype #{ext} not supported")
+      end
+      return batch_data
+    else
+      raise "Batch file does not exist"
+    end
+  else
+    raise ("Batch filetype #{ext} not supported")
+  end
+end
+def self.batch_dhcp_load(batch_file)
+  ext=batch_file.split('.')[-1]
+  if ext.match(/(csv|yaml|yml|json)/)
+    #make sure it exists
+    if (File.exist? File.expand_path batch_file)
+      batch_data=[]
+      case ext
+      when "csv"
+        batch_data=[]
+        f=File.open(batch_file)
+        f.each_line do|line|
+          entry = {}
+          entry[:fqdn] = line.split(',')[0].chomp
+          #figure out if this entry is an ip or CIDR
+          if line.split(',')[1].chomp.match('/')
+            puts "CIDR"
+            entry[:network] = line.split(',')[1].chomp
+          else
+            puts "IP"
+            entry[:ip] = line.split(',')[1].chomp
+          end
+          entry[:mac] = line.split(',')[2].chomp
+          batch_data.push(entry)
+        end
+      when "yaml","yml"
+        batch_data=YAML::load(File.open(batch_file))
+      when "json"
+        batch_data=JSON.parse(File.read(batch_file),{:symbolize_names => true})
+      else
+        raise ("Batch filetype #{ext} not supported")
+      end
+      return batch_data
+    else
+      raise "Batch file does not exist"
+    end
+  else
+    raise ("Batch filetype #{ext} not supported")
+  end
+end
 #Check we got an IPv4 address
 def self.ipv4check (ip)
   ipaddr1 = IPAddr.new "#{ip}"
@@ -108,13 +180,17 @@ def self.dhcp_exists(mac,verbose,connection)
     return true
   end
 end
-def self.dhcp_next(network,verbose,connection)
+def self.dhcp_next(network,verbose,connection,range)
   if verbose == true
     puts "Getting next available IP address for network #{network}"
   end
-  #net = Infoblox::Network.find(connection, network: network).first
-  range = Infoblox::Range.find(connection, network: network).first
-  ip = range.next_available_ip[0]
+  if range == true
+    range = Infoblox::Range.find(connection, network: network).first
+    ip = range.next_available_ip[0]
+  else
+    net = Infoblox::Network.find(connection, network: network).first
+    ip = net.next_available_ip[0]
+  end
   return ip
 end
 def self.dhcp_add(fqdn,ip,mac,verbose,connection)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iblox
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Matthew Nicholson
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.5.3
 description: A simple Infoblox CLI wrapper
 email: matthew.a.nicholson@gmail.com
 executables: