oxidized-script 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f33b06421d3e4c2ab37dd2532a68215b98991d34
-  data.tar.gz: e9349537593bfbc2b4194827381ce8f3f400ab8c
+  metadata.gz: e78a905befb0130e399d70d444d00433dd1d023e
+  data.tar.gz: 61e31fef4d16f550b35afb45dabc2b8200560540
 SHA512:
-  metadata.gz: 09dbc25da8a981abcadd591ffe630a037c4068c248ef7d5117c60d4272d40be424c5b4efc5e86df5a180541233ac1142237c57a8751ed95561a54b01e4a555b1
-  data.tar.gz: 39895ff7b8f342f1e7ff3470ee010b1ea0e9ada7200bee3ce2556ada7d743cc978672b894a652faeb762b3a8b383f929768689208fb814e1568c8eb9a9d8f7a1
+  metadata.gz: fe0c5a45af71afe30b680ac7e145333d4eddbe7bcd58e232ad0165fcae2711470df794f391d9dc56b05f195ed76add855f91cfacb34fb2117004366da85e1ab6
+  data.tar.gz: 52101b291edad1ec64c78e6a92926de01a949f58fcf8a63ded5fbc40950be2047320d1c1a4b1e08f9f0bb845d69f77092941c22c14d9084a4c2de5a6187cc1f3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.3.2
+- FEATURE on --ostype to get a list of nodes that match a particular OS Type (junos, routeros, ios) (by InsaneSplash)
+
 # 0.3.1
 - FEATURE on --dryrun to get a list of nodes without running a command (by @nertwork)
 - BUGFIX: errors with large config files running in ruby threads - forking instead (by @nertwork)

data/README.md

@@ -38,6 +38,7 @@ Name                             Default RD          Protocols   Interfaces
 [fisakytt@lan-login1 ~]% oxs --help
 Usage: oxs [options] hostname [command]
     -m, --model            host model (ios, junos, etc), otherwise discovered from Oxidized source
+    -o, --ostype           OS Type (ios, junos, etc)
     -x, --commands         commands file to be sent
     -u, --username         username to use
     -p, --password         password to use

data/lib/oxidized/script/cli.rb

@@ -9,7 +9,7 @@ module Oxidized
       class NothingToDo < ScriptError; end
 
       def run
-        if @group or @regex
+        if @group or @regex or @ostype
           nodes = get_hosts
           counter = @threads.to_i
           Signal.trap("CLD")  { counter += 1 }
@@ -57,14 +57,14 @@ module Oxidized
           @cmd_class.run :args=>@args, :opts=>@opts, :host=>@host, :cmd=>@cmd
           exit 0
         else
-          if @group or @regex
+          if @group or @regex or @ostype
             @cmd = @args.shift
           else
             @host = @args.shift
             @cmd  = @args.shift if @args
           end
           @oxs  = nil
-          raise NothingToDo, 'no host given' if not @host and not @group and not @regex
+          raise NothingToDo, 'no host given' if not @host and not @group and not @ostype and not @regex
           if @dryrun
             puts get_hosts
             exit
@@ -77,6 +77,7 @@ module Oxidized
         slop = Slop.new(:help=>true)
         slop.banner 'Usage: oxs [options] hostname [command]'
         slop.on 'm=', '--model',     'host model (ios, junos, etc), otherwise discovered from Oxidized source'
+        slop.on 'o=', '--ostype',    'OS Type (ios, junos, etc)'
         slop.on 'x=', '--commands',  'commands file to be sent'
         slop.on 'u=', '--username',  'username to use'
         slop.on 'p=', '--password',  'password to use'
@@ -102,6 +103,7 @@ module Oxidized
         end
         slop.parse
         @group = slop[:group]
+        @ostype = slop[:ostype]
         @threads = slop[:threads]
         @verbose = slop[:verbose]
         @dryrun= slop[:dryrun]
@@ -151,9 +153,17 @@ module Oxidized
           nodes_group = run_group @group
           nodes_regex = run_regex @regex
           return nodes_group & nodes_regex
+        elsif @group and @ostype
+          puts "running list for hosts in group: #{@group} and matching: #{@ostype}" if @verbose
+          nodes_group = run_group @group
+          nodes_ostype = run_ostype @ostype
+          return nodes_group & nodes_ostype
         elsif @regex
           puts 'running list for hosts matching: ' + @regex if @verbose
           return run_regex @regex
+        elsif @ostype
+          puts 'running list for hosts matching ostype: ' + @ostype if @verbose
+          return run_ostype @ostype
         else
           puts 'running list for hosts in group: ' + @group if @verbose
           return run_group @group
@@ -170,6 +180,18 @@ module Oxidized
         out
       end
 
+      def run_ostype ostype
+        Oxidized.mgr = Manager.new
+        out = []
+        Nodes.new.each do |node|
+          ostype.downcase # need to make sure they are both in lowercase
+          nodemodel = node.model.to_s.downcase # need to make sure they are both in lowercase
+          next unless nodemodel =~ /#{ostype}/ 
+          out << node.name
+        end
+        out
+      end
+
       def run_regex regex
         Oxidized.mgr = Manager.new
         out = []

data/lib/oxidized/script/script.rb

@@ -37,6 +37,7 @@ module Oxidized
     # @param [Hash] opts options for Oxidized::Script
     # @option opts [String]  :host      @hostname or ip address for Oxidized::Node
     # @option opts [String]  :model     node model (ios, junos etc) if defined, nodes are not loaded from source
+    # @option opts [String]  :ostype	OS Type (ios, junos, etc)
     # @option opts [Fixnum]  :timeout   oxidized timeout
     # @option opts [String]  :username  username for login
     # @option opts [String]  :passsword password for login
@@ -49,6 +50,7 @@ module Oxidized
     def initialize opts, &block
       @host       = opts.delete :host
       model       = opts.delete :model
+      ostype      = opts.delete :ostype
       timeout     = opts.delete :timeout
       username    = opts.delete :username
       password    = opts.delete :password

data/oxidized-script.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-script'
-  s.version           = '0.3.1'
+  s.version           = '0.4.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-script
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxidized
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oxidized-script
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: cli + library for scripting network devices