[Netdevicelib-checkins] CVS: netdevicelib/src/netdevicelib devices.py,1.4,1.5

[<net...@li...>]

Update of /cvsroot/netdevicelib/netdevicelib/src/netdevicelib
In directory usw-pr-cvs1:/tmp/cvs-serv19452

Modified Files:
	devices.py 
Log Message:
- refactor common prompts and commands to the Device base class
- implement the PixOS device subclass
- tweak the regexps to handle both Pix and IOS (removed leading \n)


Index: devices.py
===================================================================
RCS file: /cvsroot/netdevicelib/netdevicelib/src/netdevicelib/devices.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** devices.py	2001/09/05 18:07:22	1.4
--- devices.py	2001/10/24 18:42:57	1.5
***************
*** 29,32 ****
--- 29,42 ----
                                      'enabledIndicator': ''}
  
+         # These are the default commands and prompts
+         self.setCommand( 'enable',        'enable' )
+         self.setCommand( 'disable',       'disable' )
+         self.setPrompt( 'login',    '[Ll]ogin[:\s]*$' )
+         self.setPrompt( 'username', '[Uu]sername[:\s]*$' )
+         self.setPrompt( 'password', '[Pp]assw(?:or)?d[:\s]*$' )
+         self.setPrompt( 'command',  '[\w().-]*[\$#>]\s?(?:\(enable\))?\s*$' )
+         self.setPrompt( 'enable',   '[Pp]assword[:\s]*$' )
+         self.setPrompt( 'enabledIndicator', '\#|enable' )
+ 
      def getPrompt( self, inKey=None ):
          """ Get the RE to match a given prompt on the device """
***************
*** 75,88 ****
          self.setCommand( 'enablePaging',  'terminal length 24' )
          self.setCommand( 'getConfig',     'show running-config' )
-         self.setCommand( 'enable',        'enable' )
-         self.setCommand( 'disable',       'disable' )
          
-         self.setPrompt( 'login',    '[Ll]ogin[:\s]*$' )
-         self.setPrompt( 'username', '[Uu]sername[:\s]*$' )
-         self.setPrompt( 'password', '[Pp]assw(?:or)?d[:\s]*$' )
-         self.setPrompt( 'command',  '\n[\w().-]*[\$#>]\s?(?:\(enable\))?\s*$' )
-         self.setPrompt( 'enable',   '[Pp]assword[:\s]*$' )
-         self.setPrompt( 'enabledIndicator', '\#|enable' )
- 
  class CatOSDevice( Device ):
      def __init__( self ):
--- 85,89 ----
***************
*** 96,101 ****
          self.setCommand( 'enablePaging',  'set length 24' )
          self.setCommand( 'getConfig',     'write term' )
-         self.setCommand( 'enable',        'enable' )
-         self.setCommand( 'disable',       'disable' )
          
  class PixDevice( Device ):
--- 97,100 ----
***************
*** 107,116 ****
          self._needsEnable = 1
          
!         self.setCommand( 'disablePagingCmd', 'no pager' )
!         self.setCommand( 'enablePagingCmd',  'pager' )
!         self.setCommand( 'getConfig',        'write term' )
!         self.setCommand( 'enable',           'enable' )
!         self.setCommand( 'disable',          'disable' )
!         
  class DeviceFactory:
      def createDevice( self, inClass=None ):
--- 106,113 ----
          self._needsEnable = 1
          
!         self.setCommand( 'disablePaging', 'no pager' )
!         self.setCommand( 'enablePaging',  'pager' )
!         self.setCommand( 'getConfig',     'write term' )
! 
  class DeviceFactory:
      def createDevice( self, inClass=None ):