junos-ez-stdlib 0.0.10 → 0.0.11

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# 2013-April
+
+  - 0.0.10: 2013-04-29
+  
+    Initial release of code into RubyGems.  Code tested on EX and SRX-branch.  Consider this code
+    as "early-adopter".  Comments/feedback is welcome and appreciated.
+    
+  - 0.0.11: 2013-04-29
+  
+    Updated Junos::Ez::RE::Utils.  #memory changed :procs from Hash to Array.  #users changed return from Hash to Array
+    

data/junos-ez-stdlib.gemspec

@@ -11,5 +11,5 @@ Gem::Specification.new do |s|
   s.authors = ["Jeremy Schulman"]
   s.email = 'jschulman@juniper.net'
   s.files = FileList[ '*', 'lib/**/*.rb', 'examples/**/*.rb', 'docs/**/*.md' ]
-  s.add_dependency('netconf')
+  s.add_dependency('netconf', ">= 0.2.5")
 end

data/lib/junos-ez/provider.rb

@@ -9,7 +9,7 @@ module Junos; end
   
 module Junos::Ez
   
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
   
   ### ---------------------------------------------------------------
   ### rpc_errors - decodes the XML into an array of error/Hash

data/lib/junos-ez/utils/re.rb

@@ -163,18 +163,19 @@ class Junos::Ez::RE::Provider < Junos::Ez::Provider::Parent
   
   def users
     got = @ndev.rpc.get_system_users_information
-    users_h = {}
+    users_a = []
     got.xpath('uptime-information/user-table/user-entry').each do |user|
       user_h = {}
-      user_name = user.xpath('user').text.strip
+      users_a << user_h
+      
+      user_h[:name] = user.xpath('user').text.strip
       user_h[:tty] = user.xpath('tty').text.strip
       user_h[:from] = user.xpath('from').text.strip
       user_h[:login_time] = user.xpath('login-time').text.strip
       user_h[:idle_time] = user.xpath('idel-time').text.strip
       user_h[:command] = user.xpath('command').text.strip
-      users_h[user_name] = user_h
     end
-    users_h
+    users_a
   end
 
   ### ---------------------------------------------------------------
@@ -348,18 +349,22 @@ class Junos::Ez::RE::Provider
       }
     }
     
-    as_h[:procs] = {}
+    # create an Array of process information.  The process-names are 
+    # not guaranteed to be unique, so do this as an Array vs. Hash
+    
+    as_h[:procs] = []
     as_xml.xpath('pmap-terse-information/pmap-terse-summary').each do |proc|
       proc_h = {}
-      proc_name = proc.xpath('map-name | process-name').text.strip
-      as_h[:procs][proc_name] = proc_h
+      as_h[:procs] << proc_h
       
+      proc_h[:name] = proc.xpath('map-name | process-name').text.strip 
       proc_h[:pid] = proc.xpath('pid').text.to_i
       proc_h[:size] = proc.xpath('size').text.to_i
       proc_h[:size_pct] = proc.xpath('size-percent').text.to_f
       proc_h[:resident] = proc.xpath('resident').text.to_i
       proc_h[:resident_pct] = proc.xpath('resident-percent').text.to_f
-    end    
+    end 
+    
   end
   
   def _alarm_info_to_h( alarm, alarm_h )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junos-ez-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,13 +26,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.5
 description: ! 'Automation Framework for Junos/NETCONF:  Facts, Providers, and Utils'
 email: jschulman@juniper.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - junos-ez-stdlib.gemspec
 - LICENSE
 - README.md