junos-ez-stdlib 0.0.12 → 0.0.15

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

@@ -46,7 +46,7 @@ class Junos::Ez::RE::Provider < Junos::Ez::Provider::Parent
     status_h = {}
     got.xpath('//route-engine').each do |re|
       re_h = {}      
-      slot_id = re.xpath('slot').text.to_i
+      slot_id = "re" + re.xpath('slot').text
       status_h[slot_id] = re_h
       
       re_h[:model] = re.xpath('model').text.strip
@@ -173,6 +173,7 @@ class Junos::Ez::RE::Provider < Junos::Ez::Provider::Parent
       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[:idle_time] = nil if user_h[:idle_time].empty?
       user_h[:command] = user.xpath('command').text.strip
     end
     users_a
@@ -224,7 +225,16 @@ class Junos::Ez::RE::Provider < Junos::Ez::Provider::Parent
   ### ---------------------------------------------------------------
   
   def reboot!( opts = {} )    
-    got = @ndev.rpc.request_reboot            
+    arg_options = [:in, :at]
+    args = {}
+    opts.each do |k,v|
+      if arg_options.include? k
+        args[k] = v
+      else
+        raise ArgumentError, "unrecognized option #{k}"
+      end
+    end    
+    got = @ndev.rpc.request_reboot( args )
     got.xpath('request-reboot-status').text.strip
   end
 
@@ -233,10 +243,19 @@ class Junos::Ez::RE::Provider < Junos::Ez::Provider::Parent
   ### ---------------------------------------------------------------
   
   def shutdown!( opts = {} )
+    arg_options = [:in, :at]
+    args = {}
+    opts.each do |k,v|
+      if arg_options.include? k
+        args[k] = v
+      else
+        raise ArgumentError, "unrecognized option #{k}"
+      end
+    end        
     ## some Junos devices will throw an RPC error exception which is really
     ## a warning, and some do not.  So we need to trap that here.
     begin
-      got = @ndev.rpc.request_power_off
+      got = @ndev.rpc.request_power_off( args )
     rescue => e
       retmsg = e.rsp.xpath('//error-message').text.strip + "\n"  
       return retmsg + e.rsp.xpath('//request-reboot-status').text.strip

data/lib/junos-ez/vlans.rb

@@ -3,9 +3,10 @@ require "junos-ez/provider"
 module Junos::Ez::Vlans
 
   PROPERTIES = [
-     :vlan_id, 
-     :description, 
-     :no_mac_learning
+     :vlan_id,                  # Fixnum, [ 1 .. 4094 ]
+     :description,              # String, description
+     :no_mac_learning,          # [ true | nil ] - used to disable MAC-address learning
+     :interfaces,               # READ-ONLY, array of bound interface names
   ]  
 
   def self.Provider( ndev, varsym )        
@@ -21,6 +22,7 @@ module Junos::Ez::Vlans
   
   class Provider < Junos::Ez::Provider::Parent
     # common parenting goes here ...    
+    
   end
   
 end

data/lib/junos-ez/vlans/vlan.rb

@@ -25,6 +25,12 @@ class Junos::Ez::Vlans::Provider::VLAN < Junos::Ez::Vlans::Provider
     as_hash[:vlan_id] = as_xml.xpath('vlan-id').text.to_i
     xml_when_item(as_xml.xpath('description')){ |i| as_hash[:description] = i.text }
     xml_when_item(as_xml.xpath('no-mac-learning')){ as_hash[:no_mac_learning] = true }
+    
+    # get a brief list of the interfaces on this vlan
+    got = @ndev.rpc.get_vlan_information( :vlan_name => @name || as_xml.xpath('name').text )
+    as_hash[:interfaces] = got.xpath('//vlan-member-interface').collect{|ifs| ifs.text.strip }
+    as_hash[:interfaces] = nil if as_hash[:interfaces][0] == "None"
+    
     return true
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junos-ez-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netconf
@@ -59,7 +59,6 @@ files:
 - lib/junos-ez/system/syscfg.rb
 - lib/junos-ez/system/userauths.rb
 - lib/junos-ez/system/users.rb
-- lib/junos-ez/system/user_ssh_keys.rb
 - lib/junos-ez/system.rb
 - lib/junos-ez/utils/config.rb
 - lib/junos-ez/utils/fs.rb
@@ -78,18 +77,20 @@ files:
 - examples/st_hosts.rb
 - examples/user.rb
 - examples/vlans.rb
-- docs/Config_Utils.md
 - docs/Facts.md
-- docs/Filesys_Utils.md
-- docs/IPports.md
-- docs/L1ports.md
-- docs/L2ports.md
+- docs/Providers/IPports.md
+- docs/Providers/L1ports.md
+- docs/Providers/L2ports.md
+- docs/Providers/StaticHosts.md
+- docs/Providers/StaticRoutes.md
+- docs/Providers/UserAuths.md
+- docs/Providers/Users.md
+- docs/Providers/Vlans.md
 - docs/Providers_Resources.md
-- docs/RE_utils.md
-- docs/StaticHosts.md
-- docs/StaticRoutes.md
-- docs/Users.md
-- docs/Vlans.md
+- docs/README_FIRST.md
+- docs/Utils/Config.md
+- docs/Utils/Filesystem.md
+- docs/Utils/Routing-Engine.md
 homepage: https://github.com/jeremyschulman/ruby-junos-ez-stdlib
 licenses: []
 post_install_message: 

data/docs/Config_Utils.md

@@ -1,3 +0,0 @@
-# Configuration Utilities
-
-Docs comming soon ...

data/docs/Filesys_Utils.md

@@ -1,3 +0,0 @@
-# Filesystem Utilities
-
-Docs coming soon ...

data/docs/IPports.md

@@ -1,3 +0,0 @@
-# IP v4 Port Provider
-
-Docs comming soon...

data/docs/L1ports.md

@@ -1,3 +0,0 @@
-# Layer 1 Physical Port Provider
-
-Docs comming soon ...

data/docs/L2ports.md

@@ -1,3 +0,0 @@
-# Layer 2 Switching Port Provider
-
-Docs comming soon ...

data/docs/RE_utils.md

@@ -1,3 +0,0 @@
-# Routing-Engine Utilities
-
-Docs comming soon ...

data/docs/StaticHosts.md

@@ -1,3 +0,0 @@
-# Static Host Entry Provider
-
-Docs comming soon ...

data/docs/StaticRoutes.md

@@ -1,3 +0,0 @@
-# Static Routes Provider
-
-Docs comming soon ...

data/docs/Vlans.md

@@ -1,3 +0,0 @@
-# VLANs Provider
-
-Docs comming soon ...

data/lib/junos-ez/system/user_ssh_keys.rb

@@ -1,113 +0,0 @@
-=begin
-* Puppet Module  : junos-stdlib
-* Author         : Jeremy Schulman
-* File           : junos_user.rb
-* Version        : 2013-03-20
-* Platform       : All
-* Description    : 
-*
-*
-* Copyright (c) 2013  Juniper Networks. All Rights Reserved.
-*
-* YOU MUST ACCEPT THE TERMS OF THIS DISCLAIMER TO USE THIS SOFTWARE, 
-* IN ADDITION TO ANY OTHER LICENSES AND TERMS REQUIRED BY JUNIPER NETWORKS.
-* 
-* JUNIPER IS WILLING TO MAKE THE INCLUDED SCRIPTING SOFTWARE AVAILABLE TO YOU
-* ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS
-* DISCLAIMER. PLEASE READ THE TERMS AND CONDITIONS OF THIS DISCLAIMER
-* CAREFULLY.
-*
-* THE SOFTWARE CONTAINED IN THIS FILE IS PROVIDED "AS IS." JUNIPER MAKES NO
-* WARRANTIES OF ANY KIND WHATSOEVER WITH RESPECT TO SOFTWARE. ALL EXPRESS OR
-* IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY WARRANTY
-* OF NON-INFRINGEMENT OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR A
-* PARTICULAR PURPOSE, ARE HEREBY DISCLAIMED AND EXCLUDED TO THE EXTENT
-* ALLOWED BY APPLICABLE LAW.
-*
-* IN NO EVENT WILL JUNIPER BE LIABLE FOR ANY DIRECT OR INDIRECT DAMAGES, 
-* INCLUDING BUT NOT LIMITED TO LOST REVENUE, PROFIT OR DATA, OR
-* FOR DIRECT, SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES
-* HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY ARISING OUT OF THE 
-* USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF JUNIPER HAS BEEN ADVISED OF 
-* THE POSSIBILITY OF SUCH DAMAGES.
-=end
-
-require 'puppet/provider/junos/junos_parent'
-
-class Puppet::Provider::Junos::SSH_auth_key < Puppet::Provider::Junos
-  
-  ### --------------------------------------------------------------------
-  ### triggered by provider #exists? 
-  ### --------------------------------------------------------------------  
-  
-  def netdev_res_exists?     
-    
-    # cannot manage the 'active' parameter from the puppet manifest since the
-    # type definition is compiled on the server, and doesn't include this :-(
-    # so fake it here, set to true always.  this way if someone deactivated
-    # it apriori, then this puppet-run will make it active again.
-
-    return false unless (auth = get_junos_config)
-
-    got_key = auth.text.strip
-    got_key_skip = got_key.index(' ') + 1
-    got_key = got_key[ got_key_skip .. -1 ]
-    
-    @ndev_res[:key] = got_key
-    @ndev_res[:user] = resource[:user]
-    @ndev_res[:type] = resource[:type]
-    @ndev_res[:target] = resource[:target]
-    @ndev_res[:options] = resource[:options]
-    
-    return true    
-  end   
-  
-  ### ---------------------------------  
-  ### ---> override parent method <----
-  ### ---------------------------------
-  
-  def netdev_resxml_top( xml )
-    xml.user {
-      xml.name resource[:user]
-      xml.authentication {
-        xml.send(:'ssh-rsa') {
-          xml.name 'ssh-rsa ' + resource[:key]
-          return xml
-        }
-      }
-    }    
-  end  
-  
-  def get_junos_config
-    
-    @ndev_res ||= NetdevJunos::Resource.new( self, 'system/login', 'user' )   
-    @ndev_res[:unmanaged_active] = true
-    
-    return nil unless (ndev_config = @ndev_res.getconfig)    
-    return nil unless auth_config = ndev_config.xpath("//user/authentication/ssh-rsa")[0]                  
-    @ndev_res.set_active_state( auth_config )        
-    
-    return auth_config        
-  end
-  
-  
-  ##### ------------------------------------------------------------
-  ##### XML builder routines, one for each property
-  ##### ------------------------------------------------------------   
-  
-  def xml_change_type( xml ) 
-  end
-
-  def xml_change_key( xml )
-  end
-
-  def xml_change_user( xml )
-  end
-
-  def xml_change_target( xml ) 
-  end
-
-  def xml_change_options( xml )
-  end
-
-end