brocadesan 0.4.8 → 0.4.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWQzNDA4YmVhZmJiYzgxZWMyYjRjYTRjZmFkZWJmOTljMDQwNGQzNQ==
-  data.tar.gz: !binary |-
-    MDM5MGY3YWUyOTQ1OGNkYTI3MjY1MmQ5ZDdmM2U1ZjY5YTkzYmY3MA==
+SHA256:
+  metadata.gz: aef8b620b4e0fbca42ee4c51b5f64ee264d7175a38c5fbf262bb66f9a9b12020
+  data.tar.gz: 90a702907e54d1971eab7b5318e048994da666023247df6f28e985b2c0e26a40
 SHA512:
-  metadata.gz: !binary |-
-    MmUxN2I2ZDdmNjg5MzA1OTdlYTRkZjMxNmEyNDFjZDYzMzgwNjc3ZDQ1NGUx
-    ODIzNDA5YjdkYjFiYzE3ZWU1YjhlYTNjZjIwZjEzODUxMGQ2YzVjMmJiYTQ2
-    ZjU4NTAzNjMyMjNhMjI5ZGRiMTNlYThjYTlhOTc5ODU3NTVhNWM=
-  data.tar.gz: !binary |-
-    M2YwYTczYTRiZTBiZjVmNDhiOTNkMDM3NzZiZjliYzk5NjkwNzQzMDA4YTM2
-    YjIwNzE3MzM5NmIzYjVjMWIyMTBjYjNkNzY2NTM3NTkyYWRjN2VjODMwZDcw
-    OTBhZGExMWI2MzAzNGE2ZGNkNjEwYTBlNjc3OTY2YTNlMTUwYWU=
+  metadata.gz: 96141627e8c4aa91d1c0a3377a64c704b6bdb46daf666d2c892be3631b683bbaeb89b8fc053b52bc0c6eeb1b16b9351ba2996e3c6a8ae42a04b0576a4c6e7f29
+  data.tar.gz: f68424ce8550ad91dc54081c77ea15c67cf4271b57c4c8486f8995ee32a60a6f923c8625063e016de8451706f34a36d5241f7fced6276d5d19137d964eb2fc54

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rake/testtask'
-require 'rake/notes/rake_task'
+#require 'rake/notes/rake_task'
 require 'rdoc/task'
 require 'yaml'
 

data/brocadesan.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'brocadesan'
-  s.version     = '0.4.8'
-  s.date        = '2016-02-26'
+  s.version     = '0.4.11'
+  s.date        = '2023-03-06'
   s.summary     = "Brocade SAN library"
   s.description = "Gem to manipulate FABOS based devices"
   s.authors     = ["Tomas Trnecka"]

data/lib/brocadesan/config/brocade/san/switch_cmd_mapping.yml

@@ -81,7 +81,7 @@
 :dls:
     :cmd: "dlsshow"
     :attr: dlsshow
-    :format: string
+    :format: array
 :iod:
     :cmd: "iodshow"
     :attr: iodshow

data/lib/brocadesan/config/parser_mapping.yml

@@ -4,7 +4,7 @@
 :lscfg: simple
 :aptpolicy: simple
 :chassisname: oneline
-:dlsshow: oneline
+:dlsshow: simple
 :iodshow: oneline
 :switchstatusshow: multiline
 :mapsdb: multiline

data/lib/brocadesan/switch.rb

@@ -412,16 +412,18 @@ module SAN
           
           
         # storing defined
-        @configuration[:defined_configuration][:cfg].each do |config,members|
-   
-          effective =  @configuration[:effective_configuration][:cfg].keys[0]==config ? true : false
-          
-          cfg=ZoneConfiguration.new(config,:effective=>effective)
-          members.each do |member|
-            cfg.add_member member
+        if !@configuration[:defined_configuration][:cfg].nil?
+          @configuration[:defined_configuration][:cfg].each do |config,members|
+     
+            effective =  @configuration[:effective_configuration][:cfg].keys[0]==config ? true : false
+            
+            cfg=ZoneConfiguration.new(config,:effective=>effective)
+            members.each do |member|
+              cfg.add_member member
+            end
+            
+            tmp_cfg[:zone_configurations]<<cfg
           end
-          
-          tmp_cfg[:zone_configurations]<<cfg
         end
         
         if full
@@ -575,7 +577,7 @@ module SAN
       
       def parse_line(line)
         return if line.empty?
-        # we detect which command output we parse - commands start with defined prompt on the XML line
+        # we detect which command output we parse - commands start with defined prompt on the CMD line
         @parsed[:parsing_position] = case
           # stripping fosexec, all pipes and ' to get pure command 
           when line.match(/^#{@prompt}/) then line.gsub(/(fosexec --fid \d+ -cmd \')|\'$|\' \|.*$/,"").split(" ")[1]
@@ -622,6 +624,9 @@ module SAN
       
       # parser used to parse commands with 1 line output
       def parse_oneline(line)
+        # do not process comment lines put there by fosexec
+        return if line.match(/"#{@parsed[:parsing_position]}"/)
+        return if line.match(/^-+$/)
         @parsed[@parsed[:parsing_position].to_sym]=line
       end
       
@@ -655,6 +660,8 @@ module SAN
             @parsed[:cfg_transaction][:id] = $1
           when line.match(/It is(.+)abortable$/) && @parsed[:parsing_position]=="cfgtransshow"
             @parsed[:cfg_transaction][:abortable] = $1.match(/not/) ? false : true
+          # FOS 9 fosexec is adding some more output lines
+          when line.match("-----") || line.match(@parsed[:parsing_position])
           else
             #supportshow
             @parsed[@parsed[:parsing_position].to_sym]||=""
@@ -737,6 +744,9 @@ module SAN
                                     :qos => l[8..-1].include?("QOS"),
                                     :cr_recov => l[8..-1].include?("CR_RECOV")
                                     }
+          when line.match("DLS is") || line.match("E_Port Balance")
+            @parsed[@parsed[:parsing_position].to_sym]||=[]
+            @parsed[@parsed[:parsing_position].to_sym]<<line
           #default handling if it doesno match specialized match
           # parse lines formated like 
           # param: value
@@ -871,6 +881,7 @@ module SAN
       # trunk parser
       def parse_trunk(line)
         return if line.match(/No trunking/i)
+        return if !line.match(/->/)
         @parsed[:trunk_links]||=[]
         l_tricky, l_simple = line.split("->")
         l_t = l_tricky.split(":")

data/lib/meta_methods.rb

@@ -215,12 +215,30 @@ class Brocade::SAN::Switch
 #
 # Returns value in (string) format
 
+##
+# :method: maps_status
+# :call-seq:
+#   maps_status(forced=true)
+#
+# If called with +true+ argument it will get the current_switch_policy_status from the switch instead of cache
+#
+# Returns value in (string) format
+
+##
+# :method: maps_status_details
+# :call-seq:
+#   maps_status_details(forced=true)
+#
+# If called with +true+ argument it will get the maps_summary from the switch instead of cache
+#
+# Returns value in (string) format
+
 ##
 # :method: ip
 # :call-seq:
 #   ip(forced=true)
 #
-# If called with +true+ argument it will get the ip_address from the switch instead of cache
+# If called with +true+ argument it will get the ethernet_ip_address from the switch instead of cache
 #
 # Returns value in (string) format
 

data/test/outputs/agshow_1.txt

@@ -1,4 +1,10 @@
 > agshow
+
+---------------------------------------------------
+
+"agshow" on FID 128:
+
+
 Worldwide Name            Ports   Enet IP Addr    Firmware                        Local/Remote   Name
 ------------------------------------------------------------------------------------------------------
 10:00:00:11:0a:00:84:a2    24     15.84.68.94      v6.1.0_uth8                    remote         VCFC2CN8314D00X

data/test/outputs/apt_policy_1.txt

@@ -1,4 +1,9 @@
 > aptpolicy
+
+---------------------------------------------------
+
+"aptpolicy" on FID 128:
+
  Current Policy: 3
 
  3 : Default Policy

data/test/outputs/cfgtransshow_1.txt

@@ -1,2 +1,6 @@
 > cfgtransshow
+---------------------------------------------------
+
+"cfgtransshow" on FID 128:
+
 There is no outstanding zoning transaction

data/test/outputs/chassisname_1.txt

@@ -1,2 +1,7 @@
 > chassisname
+
+---------------------------------------------------
+
+"chassisname" on FID 128:
+
 IDAA1C01_chass

data/test/outputs/dlsshow_1.txt

@@ -1,4 +1,13 @@
 > dlsshow
 
-DLS is set by default with current routing policy
+---------------------------------------------------
+
+"dlsshow" on FID 128:
+
+
+DLS is set with Lossless enabled, Two-hop Lossless disabled
+
+
+E_Port Balance Priority is not set
+
 

data/test/outputs/dlsshow_1.yml

@@ -1,4 +1,4 @@
-:dlsshow: 'DLS is set by default with current routing policy'
+:dlsshow: ["DLS is set with Lossless enabled, Two-hop Lossless disabled", "E_Port Balance Priority is not set"]
 :parsing_position: end
 
 

data/test/outputs/dlsshow_2.txt

@@ -1,4 +1,8 @@
 > dlsshow
 
+---------------------------------------------------
+
+"dlsshow" on FID 128:
+
 DLS is not set
 

data/test/outputs/dlsshow_2.yml

@@ -1,4 +1,4 @@
-:dlsshow: 'DLS is not set'
+:dlsshow: ["DLS is not set"]
 :parsing_position: end
 
 

data/test/outputs/fabricprincipal_1.txt

@@ -1,3 +1,8 @@
 > fabricprincipal
+
+---------------------------------------------------
+
+"fabricprincipal" on FID 128:
+
 Principal Selection Mode: Enable
 Principal Switch Selection Priority: 0x1

data/test/outputs/fabricshow_1.txt

@@ -1,4 +1,9 @@
 > fabricshow
+
+---------------------------------------------------
+
+"fabricshow" on FID 128:
+
 Switch ID   Worldwide Name           Enet IP Addr    FC IP Addr      Name
 -------------------------------------------------------------------------
   1: fffc01 10:00:00:05:1e:4c:24:00 15.187.118.17   0.0.0.0        >"IDAA1C01"
@@ -7,4 +12,4 @@ Switch ID   Worldwide Name           Enet IP Addr    FC IP Addr      Name
 132: fffc84 10:00:00:05:33:25:12:00 15.187.119.38   0.0.0.0         "GREA1C02"
 
 The Fabric has 4 switches
-
+Fabric Name: ENV2 VPC Lab - Fab B

data/test/outputs/fabricshow_1.yml

@@ -31,4 +31,5 @@
   :eth_ip: 15.187.119.38
   :fc_ip: 0.0.0.0
   :name: GREA1C02
-  :local: false
+  :local: false
+:fabric_name: "ENV2 VPC Lab - Fab B"

data/test/outputs/iodshow_1.txt

@@ -1,4 +1,9 @@
 > iodshow
 
+---------------------------------------------------
+
+"iodshow" on FID 128:
+
+
 IOD is set
 

data/test/outputs/ipaddrshow_1.txt

@@ -1,5 +1,9 @@
 > ipaddrshow
 
+---------------------------------------------------
+
+"ipaddrshow" on FID 128:
+
 SWITCH
 Ethernet IP Address: 10.200.1.112
 Ethernet Subnetmask: 255.255.0.0

data/test/outputs/ipaddrshow_2.txt

@@ -1,5 +1,9 @@
 > ipaddrshow
 
+---------------------------------------------------
+
+"ipaddrshow" on FID 128:
+
 CHASSIS
 Ethernet IP Address: 10.200.0.153
 Ethernet Subnetmask: 255.255.0.0

data/test/outputs/islshow_1.txt

@@ -1,4 +1,9 @@
 > islshow
+
+---------------------------------------------------
+
+"islshow" on FID 128:
+
   1:  0->  0 10:00:00:05:33:23:86:00   1 H2C04R065-U03-A sp:  8.000G bw: 64.000G TRUNK QOS
   2:  8-> 17 10:00:00:05:33:c6:f7:23  29 H4C11R218-U02-I sp:  8.000G bw:  8.000G
  17: 32-> 64 10:00:00:27:f8:34:f7:00  41 DXS-898-U03-A01 sp:  4.000G bw:  4.000G CR_RECOV

data/test/outputs/islshow_2.txt

@@ -1,2 +1,7 @@
 > islshow
+
+---------------------------------------------------
+
+"islshow" on FID 128:
+
 No ISL found

data/test/outputs/lscfg_show_1.txt

@@ -1,5 +1,10 @@
 > lscfg --show
 
+---------------------------------------------------
+
+"lscfg" on FID 128:
+
+
 Created switches:  128(ds)  99
 Slot      1     2     3     4     5     6     7     8     9    10    11    12
 -------------------------------------------------------------------------------

data/test/outputs/mapsdbshow_1.txt

@@ -1,5 +1,10 @@
 > mapsdb --show
 
+---------------------------------------------------
+
+"mapsdb" on FID 128:
+
+
 1 Dashboard Information:
 =======================
 

data/test/outputs/ns_1.txt

@@ -78,3 +78,8 @@ Switch entry for 129
         Device Shared in Other AD: No
         Redirect: No 
         Partial: No
+The Local Name Server has 62 entries }
+---------------------------------------------------
+
+"nsshow" on FID 128:
+

data/test/outputs/ns_2.txt

@@ -34,4 +34,9 @@
     Partial: No
 > nscamshow -t
 nscam show for remote switches:
-No entry is found!
+No entry is found!
+
+---------------------------------------------------
+
+"nscamshow" on FID 128:
+

data/test/outputs/switch_1.txt

@@ -1,4 +1,9 @@
 > switchshow
+
+---------------------------------------------------
+
+"switchshow" on FID 128:
+
 switchName:     IDAA1C01
 switchType:     62.3
 switchState:    Online

data/test/outputs/switch_2.txt

@@ -1,4 +1,9 @@
 > switchshow
+
+---------------------------------------------------
+
+"switchshow" on FID 128:
+
 switchName:     H4C11R218-U02-ICB04
 switchType:     72.3
 switchState:    Online

data/test/outputs/switch_3.txt

@@ -1,4 +1,9 @@
 > switchshow
+
+---------------------------------------------------
+
+"switchshow" on FID 128:
+
 switchName:     H4C13R253-U02-ICB03
 switchType:     72.3
 switchState:    Online

data/test/outputs/trunkshow_1.txt

@@ -1,4 +1,9 @@
 > trunkshow
+
+---------------------------------------------------
+
+"trunkshow" on FID 128:
+
   1:  0->  0 10:00:00:05:33:23:86:00   1 deskew 149 MASTER
       1->  1 10:00:00:05:33:23:86:00   1 deskew 15
       6->116 10:00:00:05:33:9b:d2:00   2 deskew 96

data/test/outputs/trunkshow_2.txt

@@ -1,2 +1,7 @@
 > trunkshow
+
+---------------------------------------------------
+
+"trunkshow" on FID 128:
+
 No trunking links

data/test/outputs/version_1.txt

@@ -1,4 +1,9 @@
 > version
+
+---------------------------------------------------
+
+"version" on FID 128:
+
 Kernel:     2.6.14.2
 Fabric OS:  v6.4.3b
 Made on:    Tue Sep 4 22:03:15 2012

data/test/outputs/vf_switch_1.txt

@@ -1,4 +1,9 @@
 > fosexec --fid 99 -cmd 'switchshow'
+
+---------------------------------------------------
+
+"switchshow" on FID 128:
+
 switchName:     IDAA1C01
 switchType:     62.3
 switchState:    Online

data/test/switch_test.rb

@@ -513,4 +513,8 @@ class SwitchResponseTest < MiniTest::Test
   end
 end
 
-end; end
+end; end
+
+class TestDevice
+  include SshDevice
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: brocadesan
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.11
 platform: ruby
 authors:
 - Tomas Trnecka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake-notes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 description: Gem to manipulate FABOS based devices
@@ -157,17 +157,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 3.3.13
 signing_key: 
 specification_version: 4
 summary: Brocade SAN library