brocadesan 0.4.1 → 0.4.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWQzNDA4YmVhZmJiYzgxZWMyYjRjYTRjZmFkZWJmOTljMDQwNGQzNQ==
+  data.tar.gz: !binary |-
+    MDM5MGY3YWUyOTQ1OGNkYTI3MjY1MmQ5ZDdmM2U1ZjY5YTkzYmY3MA==
+SHA512:
+  metadata.gz: !binary |-
+    MmUxN2I2ZDdmNjg5MzA1OTdlYTRkZjMxNmEyNDFjZDYzMzgwNjc3ZDQ1NGUx
+    ODIzNDA5YjdkYjFiYzE3ZWU1YjhlYTNjZjIwZjEzODUxMGQ2YzVjMmJiYTQ2
+    ZjU4NTAzNjMyMjNhMjI5ZGRiMTNlYThjYTlhOTc5ODU3NTVhNWM=
+  data.tar.gz: !binary |-
+    M2YwYTczYTRiZTBiZjVmNDhiOTNkMDM3NzZiZjliYzk5NjkwNzQzMDA4YTM2
+    YjIwNzE3MzM5NmIzYjVjMWIyMTBjYjNkNzY2NTM3NTkyYWRjN2VjODMwZDcw
+    OTBhZGExMWI2MzAzNGE2ZGNkNjEwYTBlNjc3OTY2YTNlMTUwYWU=

data/brocadesan.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name        = 'brocadesan'
-  s.version     = '0.4.1'
-  s.date        = '2015-02-10'
+  s.version     = '0.4.8'
+  s.date        = '2016-02-26'
   s.summary     = "Brocade SAN library"
   s.description = "Gem to manipulate FABOS based devices"
   s.authors     = ["Tomas Trnecka"]
   s.email       = 'trnecka@gmail.com'
   s.files       = `git ls-files`.split("\n") 
   s.homepage    = 'http://rubygems.org/gems/brocadesan'
-  s.add_runtime_dependency "net-ssh", ">= 2.9.2"
-  s.add_development_dependency "minitest",[">= 5.0.0"]
-  s.add_development_dependency "rake-notes",[">= 0.2.0"]
+  s.add_runtime_dependency "net-ssh", "~> 2.9"
+  s.add_development_dependency "minitest",["~> 5.0"]
+  s.add_development_dependency "rake-notes",["~> 0.2"]
 end

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

@@ -10,6 +10,10 @@
     :cmd: switchshow
     :attr: switch_mode
     :format: string
+:type: 
+    :cmd: switchshow
+    :attr: switch_type
+    :format: string
 :role: 
     :cmd: switchshow
     :attr: switch_role
@@ -90,9 +94,17 @@
     :cmd: "switchstatusshow"
     :attr: switchstatusshow
     :format: string
+:maps_status:
+    :cmd: "mapsdb --show"
+    :attr: current_switch_policy_status
+    :format: string
+:maps_status_details:
+    :cmd: "mapsdb --show"
+    :attr: maps_summary
+    :format: string
 :ip:
-    :cmd: "switchstatusshow"
-    :attr: ip_address
+    :cmd: "ipaddrshow"
+    :attr: ethernet_ip_address
     :format: string
 :supportshow:
     :cmd: "supportshow"
@@ -113,4 +125,12 @@
 :cfg_transaction:
     :cmd: "cfgtransshow"
     :attr: cfg_transaction
-    :format: hash
+    :format: hash
+:principal_mode:
+    :cmd: fabricprincipal
+    :attr: principal_selection_mode
+    :format: string
+:principal_priority:
+    :cmd: fabricprincipal
+    :attr: principal_switch_selection_priority
+    :format: string

data/lib/brocadesan/config/parser_mapping.yml

@@ -7,6 +7,7 @@
 :dlsshow: oneline
 :iodshow: oneline
 :switchstatusshow: multiline
+:mapsdb: multiline
 :supportshow: multiline
 :cfgshow: cfgshow
 :nsshow: ns
@@ -18,4 +19,6 @@
 :trunkshow: trunk
 :cfgtransshow: multiline
 :zoneshow: cfgshow
-:alishow: cfgshow
+:alishow: cfgshow
+:fabricprincipal: multiline
+:ipaddrshow: ipaddrshow

data/lib/brocadesan/provisioning.rb

@@ -34,6 +34,9 @@ module Provisioning
     # Checks as well if the switch is virtual fabric enabled since that defines the way it will be queried further.
     def self.create(*params)
       agent=new(*params)
+      #TODO revisit this once the v7.3 is installed
+      agent.override_vf
+      agent
     end
     
     # Queries the agent for ongoing transaction.
@@ -748,9 +751,9 @@ module Provisioning
       when "delete"
         ""
       when "create"
-        ", \"#{obj.members.join(";")}\""
+        ", \'#{obj.members.join(";")}\'"
       when "remove","add"
-        ", \"#{member}\""
+        ", \'#{member}\'"
       else
         ""
       end
@@ -803,7 +806,7 @@ module Provisioning
       cmd_part = get_cmd klass, word
       object_member_part = get_member_part obj, word, member
       response = script_mode do
-        query("#{cmd_part} \"#{obj}\"#{object_member_part}")
+        query("#{cmd_part} \'#{obj}\'#{object_member_part}")
       end
       validate_and_save(response)
     end

data/lib/brocadesan/switch.rb

@@ -130,6 +130,12 @@ module SAN
       @fid = fid.to_i==0 ? 128 : fid.to_i
     end
     
+    # override VF settings
+    # all commands will run only on base switch
+    # this is to allow to run certain commands on VF enabled switches untill the fosexec is fixed 
+    def override_vf
+      @configuration[:override_vf]=true
+    end
     # gets the +attr+
     #
     # +attr+ has to be speficied in the CMD_MAPPING
@@ -380,7 +386,11 @@ module SAN
     end
     
     def query(*cmds) #:nodoc
-      cmds.map! {|cmd| fullcmd(cmd)}
+      if get_mode=="interactive"
+        cmds[0]=fullcmd(cmds[0])
+      else
+        cmds.map! {|cmd| fullcmd(cmd)}
+      end
       super(*cmds)
     end
     
@@ -496,12 +506,12 @@ module SAN
     end
     
     def fullcmd(cmd)
-      if @configuration[:vf]=="enabled" && @fid
+      if @configuration[:vf]=="enabled" && @fid && !@configuration[:override_vf]
         cmds = cmd.split("|") 
         if cmds.size>1
-          "fosexec --fid #{@fid} \'#{cmds.shift}\' |#{cmds.join("|")}"
+          "fosexec --fid #{@fid} -cmd \'#{cmds.shift}\' |#{cmds.join("|")}"
         else
-          "fosexec --fid #{@fid} \'#{cmds.shift}\'"
+          "fosexec --fid #{@fid} -cmd \'#{cmds.shift}\'"
         end
       else
         cmd
@@ -568,7 +578,7 @@ module SAN
         # we detect which command output we parse - commands start with defined prompt on the XML line
         @parsed[:parsing_position] = case
           # stripping fosexec, all pipes and ' to get pure command 
-          when line.match(/^#{@prompt}/) then line.gsub(/(fosexec --fid \d+ \')|\'$|\' \|.*$/,"").split(" ")[1]
+          when line.match(/^#{@prompt}/) then line.gsub(/(fosexec --fid \d+ -cmd \')|\'$|\' \|.*$/,"").split(" ")[1]
           else @parsed[:parsing_position]
         end
         #some default processing
@@ -605,6 +615,8 @@ module SAN
             parse_ns(line)
           when @parsed[:parsing_position].match(/#{PARSER_MAPPING.map{ |k,v| v=='trunk' ? k : nil }.compact.join("|")}/i)
             parse_trunk(line)
+          when @parsed[:parsing_position].match(/#{PARSER_MAPPING.map{ |k,v| v=='ipaddrshow' ? k : nil }.compact.join("|")}/i)
+            parse_ipaddrshow(line)
         end
       end
       
@@ -615,24 +627,48 @@ module SAN
       
       # parser used to parse commands with multi lines output
       def parse_multiline(line)
-        # switchstatusshow
-        case
-        when line.match(/^\s*[a-z]+.*:/i)
-          arr = line.split(":")
-          @parsed[arr[0].strip.gsub(/\s+/,"_").gsub(/([a-z])([A-Z])/,'\1_\2').downcase.to_sym]=arr[1..-1].join(":").strip
-        when line.match(/^There is no outstanding/) && @parsed[:parsing_position]=="cfgtransshow"
-          @parsed[:cfg_transaction] = {:id=>-1, :abortable=>nil, :msg => "no transaction"}
-        when line.match(/^Current transaction token is (.+)$/) && @parsed[:parsing_position]=="cfgtransshow"
-          @parsed[:cfg_transaction][:id] = $1
-        when line.match(/It is(.+)abortable$/) && @parsed[:parsing_position]=="cfgtransshow"
-          @parsed[:cfg_transaction][:abortable] = $1.match(/not/) ? false : true
+        case @parsed[:parsing_position]
+        when "mapsdb"
+          case
+          when line.match(/^Current Switch Policy Status/)
+            arr = line.split(":")
+            @parsed[arr[0].strip.gsub(/\s+/,"_").gsub(/([a-z])([A-Z])/,'\1_\2').downcase.to_sym]=arr[1..-1].join(":").strip
+          when line.match(/Summary Report/)
+            @in_maps_summary = true
+          when line.match(/Rules Affecting Health/)
+            @in_maps_summary = false
+            #@parsed[:maps_summary].gsub!(/\n$/,"")
+          when @in_maps_summary == true
+            return nil if line.match(/^=/)
+            @parsed[:maps_summary]||=""
+            @parsed[:maps_summary]+=line+"\n"
+          end
         else
-          #supportshow
-          @parsed[@parsed[:parsing_position].to_sym]||=""
-          @parsed[@parsed[:parsing_position].to_sym]+=line+"\n"
+          # switchstatusshow
+          case
+          when line.match(/^\s*[a-z]+.*:/i)
+            arr = line.split(":")
+            @parsed[arr[0].strip.gsub(/\s+/,"_").gsub(/([a-z])([A-Z])/,'\1_\2').downcase.to_sym]=arr[1..-1].join(":").strip
+          when line.match(/^There is no outstanding/) && @parsed[:parsing_position]=="cfgtransshow"
+            @parsed[:cfg_transaction] = {:id=>-1, :abortable=>nil, :msg => "no transaction"}
+          when line.match(/^Current transaction token is (.+)$/) && @parsed[:parsing_position]=="cfgtransshow"
+            @parsed[:cfg_transaction][:id] = $1
+          when line.match(/It is(.+)abortable$/) && @parsed[:parsing_position]=="cfgtransshow"
+            @parsed[:cfg_transaction][:abortable] = $1.match(/not/) ? false : true
+          else
+            #supportshow
+            @parsed[@parsed[:parsing_position].to_sym]||=""
+            @parsed[@parsed[:parsing_position].to_sym]+=line+"\n"
+          end
         end
       end
       
+      #parser for ipaddrshow
+      def parse_ipaddrshow(line)
+          if @parsed[:ethernet_ip_address].nil? && line.match(/Ethernet IP Address/)
+            @parsed[:ethernet_ip_address] = line.split(":")[1].strip
+          end
+      end
       # parser for multiline output where each line is independent
       def parse_simple(line)
         case

data/lib/meta_methods.rb

@@ -26,6 +26,15 @@ class Brocade::SAN::Switch
 #
 # Returns value in (string) format
 
+##
+# :method: type
+# :call-seq:
+#   type(forced=true)
+#
+# If called with +true+ argument it will get the switch_type from the switch instead of cache
+#
+# Returns value in (string) format
+
 ##
 # :method: role
 # :call-seq:
@@ -260,4 +269,22 @@ class Brocade::SAN::Switch
 #
 # Returns value in (hash) format
 
+##
+# :method: principal_mode
+# :call-seq:
+#   principal_mode(forced=true)
+#
+# If called with +true+ argument it will get the principal_selection_mode from the switch instead of cache
+#
+# Returns value in (string) format
+
+##
+# :method: principal_priority
+# :call-seq:
+#   principal_priority(forced=true)
+#
+# If called with +true+ argument it will get the principal_switch_selection_priority from the switch instead of cache
+#
+# Returns value in (string) format
+
 end

data/test/outputs/fabricprincipal_1.txt

@@ -0,0 +1,3 @@
+> fabricprincipal
+Principal Selection Mode: Enable
+Principal Switch Selection Priority: 0x1

data/test/outputs/fabricprincipal_1.yml

@@ -0,0 +1,3 @@
+:principal_selection_mode: Enable
+:principal_switch_selection_priority: '0x1'
+:parsing_position: end

data/test/outputs/fabricprincipal_2.txt

@@ -0,0 +1,3 @@
+> fabricprincipal
+Principal Selection Mode: Disable
+Principal Switch Selection Priority: 0

data/test/outputs/fabricprincipal_2.yml

@@ -0,0 +1,3 @@
+:principal_selection_mode: Disable
+:principal_switch_selection_priority: '0'
+:parsing_position: end

data/test/outputs/fabricprincipal_3.txt

@@ -0,0 +1,3 @@
+> fosexec --fid 128 -cmd 'fabricprincipal'
+Principal Selection Mode: Disable
+Principal Switch Selection Priority: 0

data/test/outputs/fabricprincipal_3.yml

@@ -0,0 +1,3 @@
+:principal_selection_mode: Disable
+:principal_switch_selection_priority: '0'
+:parsing_position: end

data/test/outputs/ipaddrshow_1.txt

@@ -0,0 +1,7 @@
+> ipaddrshow
+
+SWITCH
+Ethernet IP Address: 10.200.1.112
+Ethernet Subnetmask: 255.255.0.0
+Gateway IP Address: 10.200.0.1
+DHCP: Off

data/test/outputs/ipaddrshow_1.yml

@@ -0,0 +1,4 @@
+:ethernet_ip_address: 10.200.1.112
+:parsing_position: end
+
+

data/test/outputs/ipaddrshow_2.txt

@@ -0,0 +1,21 @@
+> ipaddrshow
+
+CHASSIS
+Ethernet IP Address: 10.200.0.153
+Ethernet Subnetmask: 255.255.0.0
+
+CP0
+Ethernet IP Address: 10.200.0.151
+Ethernet Subnetmask: 255.255.0.0
+Host Name: PLNPOD2N2ECS001-mgmt06
+Gateway IP Address: 10.200.0.1
+
+CP1
+Ethernet IP Address: 10.200.0.152
+Ethernet Subnetmask: 255.255.0.0
+Host Name: PLNPOD2N2ECS001-mgmt07
+Gateway IP Address: 10.200.0.1
+IPv6 Autoconfiguration Enabled: Yes
+Local IPv6 Addresses:
+IPv6 Gateways:
+DHCPv6: Off

data/test/outputs/ipaddrshow_2.yml

@@ -0,0 +1,4 @@
+:ethernet_ip_address: 10.200.0.153
+:parsing_position: end
+
+

data/test/outputs/mapsdbshow_1.txt

@@ -0,0 +1,32 @@
+> mapsdb --show
+
+1 Dashboard Information:
+=======================
+
+DB start time:                  Mon Jan 25 11:00:04 2016
+Active policy:                  dflt_base_policy
+Configured Notifications:       None
+Quarantined Ports :             None
+
+2 Switch Health Report:
+=======================
+
+Current Switch Policy Status: HEALTHY
+
+
+3.1 Summary Report:
+===================
+
+Category                 |Today                     |Last 7 days               
+--------------------------------------------------------------------------------
+Fru Health               |No Errors                 |No Errors                 
+Switch Resource          |No Errors                 |No Errors                 
+
+
+3.2 Rules Affecting Health:
+===========================
+
+Category(Rule Count)|RepeatCount|Rule Name                  |Execution Time   |Object           |Triggered Value(Units)|
+------------------------------------------------------------------------------------------------------------------------
+
+MAPS is not Licensed. MAPS extended features are available ONLY with License

data/test/outputs/mapsdbshow_1.yml

@@ -0,0 +1,7 @@
+:current_switch_policy_status:    HEALTHY
+:maps_summary: |
+ Category                 |Today                     |Last 7 days               
+ --------------------------------------------------------------------------------
+ Fru Health               |No Errors                 |No Errors                 
+ Switch Resource          |No Errors                 |No Errors                 
+:parsing_position: end

data/test/outputs/vf_switch_1.txt

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

data/test/provisioning_test.rb

@@ -21,6 +21,7 @@ class ProvisioningTest < MiniTest::Test
   def test_device_setup
     assert_instance_of Provisioning::Agent, @agent
     assert_equal nil, @agent.instance_variable_get(:@transaction)
+    assert @agent.instance_variable_get(:@configuration)[:override_vf]
     
     # this hack ensures I can test verify false inside create
     Provisioning::Agent.class_eval do 
@@ -342,12 +343,12 @@ class ProvisioningTest < MiniTest::Test
         :cmd => "cfgcreate",
         :member_name => "Zone",
         :error=>Provisioning::Agent::Error::CFG_BAD,:method=>:cfg_create,
-        :msg_invalid => "> cfgcreate \"test-04\",\"koza; byk\"\nInvalid name\n",
+        :msg_invalid => "> cfgcreate \'test-04\',\'koza; byk\'\nInvalid name\n",
         :resp_invalid => "Invalid name",
-        :msg_ok => "> cfgcreate \"test\",\"koza; byk\"\n",
+        :msg_ok => "> cfgcreate \'test\',\'koza; byk\'\n",
         :resp_ok => "",
-        :msg_duplicate => "> cfgcreate cfg1, zone1\n\"cfg1\" duplicate name\n",
-        :resp_duplicate => "\"cfg1\" duplicate name",
+        :msg_duplicate => "> cfgcreate cfg1, zone1\n\'cfg1\' duplicate name\n",
+        :resp_duplicate => "\'cfg1\' duplicate name",
         :members => zones.map {|z| z.to_s}
        },
        {:obj=>Zone.new("zonetest"), 
@@ -355,12 +356,12 @@ class ProvisioningTest < MiniTest::Test
         :cmd => "zonecreate",
         :member_name => "Alias",
         :error => Provisioning::Agent::Error::ZONE_BAD,:method=>:zone_create,
-        :msg_invalid => "> zonecreate \"test-04\",\"koza; byk\"\nInvalid name\n",
+        :msg_invalid => "> zonecreate \'test-04\',\'koza; byk\'\nInvalid name\n",
         :resp_invalid => "Invalid name",
-        :msg_ok => "> zonecreate \"test\",\"koza; byk\"\n",
+        :msg_ok => "> zonecreate \'test\',\'koza; byk\'\n",
         :resp_ok => "",
-        :msg_duplicate => "> zonecreate WYN_vls1_node3_fc0, 5B:49:9B:AF:F0:93:00:13\n\"WYN_vls1_node3_fc0\" duplicate name\n",
-        :resp_duplicate => "\"WYN_vls1_node3_fc0\" duplicate name",
+        :msg_duplicate => "> zonecreate WYN_vls1_node3_fc0, 5B:49:9B:AF:F0:93:00:13\n\'WYN_vls1_node3_fc0\' duplicate name\n",
+        :resp_duplicate => "\'WYN_vls1_node3_fc0\' duplicate name",
         :members => als.map {|a| a.to_s}
         },
        {:obj=>Alias.new("aliastest"), 
@@ -368,12 +369,12 @@ class ProvisioningTest < MiniTest::Test
         :cmd => "alicreate",
         :member_name => "Wwn", 
         :error => Provisioning::Agent::Error::ALIAS_BAD,:method=>:alias_create,
-        :msg_invalid => "> alicreate \"test\",\"50:00; 50:02\"\nInvalid alias\n",
+        :msg_invalid => "> alicreate \'test\',\'50:00; 50:02\'\nInvalid alias\n",
         :resp_invalid => "Invalid alias",
-        :msg_ok => "> alicreate \"test\",\"50:00; 50:02\"\n",
+        :msg_ok => "> alicreate \'test\',\'50:00; 50:02\'\n",
         :resp_ok => "",
-        :msg_duplicate => "> alicreate WYN_vls1_node3_fc0, 5B:49:9B:AF:F0:93:00:13\n\"WYN_vls1_node3_fc0\" duplicate name\n",
-        :resp_duplicate => "\"WYN_vls1_node3_fc0\" duplicate name",
+        :msg_duplicate => "> alicreate WYN_vls1_node3_fc0, 5B:49:9B:AF:F0:93:00:13\n\'WYN_vls1_node3_fc0\' duplicate name\n",
+        :resp_duplicate => "\'WYN_vls1_node3_fc0\' duplicate name",
         :members => wwns.map {|w| w.to_s}
         }
      ]
@@ -432,7 +433,7 @@ class ProvisioningTest < MiniTest::Test
               @agent.query_stub do
                 assert_equal obj[:obj], @agent.send(:obj_create,obj[:obj],obj[:klass])
                 # checks the cmd sent to query
-                assert_equal "#{obj[:cmd]} \"#{obj[:obj].name}\", \"#{obj[:obj].members.join(";")}\"", @agent.instance_variable_get(:@query_string)
+                assert_equal "#{obj[:cmd]} \'#{obj[:obj].name}\', \'#{obj[:obj].members.join(";")}\'", @agent.instance_variable_get(:@query_string)
               end
             end
             
@@ -485,9 +486,9 @@ class ProvisioningTest < MiniTest::Test
         :member_name => "Zone",
         :error=>Provisioning::Agent::Error::CFG_BAD,
         :method=>:cfg_delete,
-        :msg_not_found => "> cfgdelete \"test\"\nnot found\n",
+        :msg_not_found => "> cfgdelete \'test\'\nnot found\n",
         :resp_not_found => "not found",
-        :msg_ok => "> cfgedelete \"test\"\n",
+        :msg_ok => "> cfgedelete \'test\'\n",
         :resp_ok => ""
        },
        {:obj=>Zone.new("zonetest"), 
@@ -496,9 +497,9 @@ class ProvisioningTest < MiniTest::Test
         :member_name => "Alias",
         :error => Provisioning::Agent::Error::ZONE_BAD,
         :method=>:zone_delete,
-        :msg_not_found => "> zonedelete \"test\"\nnot found\n",
+        :msg_not_found => "> zonedelete \'test\'\nnot found\n",
         :resp_not_found => "not found",
-        :msg_ok => "> zonedelete \"test\"\n",
+        :msg_ok => "> zonedelete \'test\'\n",
         :resp_ok => ""
         },
        {:obj=>Alias.new("aliastest"), 
@@ -507,9 +508,9 @@ class ProvisioningTest < MiniTest::Test
         :member_name => "Wwn", 
         :error => Provisioning::Agent::Error::ALIAS_BAD,
         :method=>:alias_delete,
-        :msg_not_found => "> alidelete \"test\"\nnot found\n",
+        :msg_not_found => "> alidelete \'test\'\nnot found\n",
         :resp_not_found => "not found",
-        :msg_ok => "> alidelete \"test\"\n",
+        :msg_ok => "> alidelete \'test\'\n",
         :resp_ok => ""
         }
      ]
@@ -554,7 +555,7 @@ class ProvisioningTest < MiniTest::Test
           @agent.query_stub do 
             assert_equal obj[:obj], @agent.send(:obj_delete,obj[:obj],obj[:klass])
             # checks the cmd sent to query
-            assert_equal "#{obj[:cmd]} \"#{obj[:obj].name}\"", @agent.instance_variable_get(:@query_string)
+            assert_equal "#{obj[:cmd]} \'#{obj[:obj].name}\'", @agent.instance_variable_get(:@query_string)
           end
         end
       end
@@ -576,7 +577,7 @@ class ProvisioningTest < MiniTest::Test
        :method => :alias_change
        }
     ]
-    @response.data="> alidelete \"test\"\n"
+    @response.data="> alidelete \'test\'\n"
     objs.each do |obj|
       @agent.multistub [
         [:check_for_running_transaction, false],
@@ -590,11 +591,11 @@ class ProvisioningTest < MiniTest::Test
         @agent.query_stub do
           assert_equal obj[:obj], @agent.send(:obj_change,obj[:obj],obj[:klass])
           # checks the cmd sent to query
-          assert_equal "#{obj[:queries][0]} \"#{obj[:obj].name}\"#{obj[:queries][1]} \"#{obj[:obj].name}\", \"#{obj[:obj].members.join(";")}\"", @agent.instance_variable_get(:@query_string)
+          assert_equal "#{obj[:queries][0]} \'#{obj[:obj].name}\'#{obj[:queries][1]} \'#{obj[:obj].name}\', \'#{obj[:obj].members.join(";")}\'", @agent.instance_variable_get(:@query_string)
           @agent.instance_variable_set(:@query_string,"")
           # test wrapper method
           @agent.send obj[:method],obj[:obj]
-          assert_equal "#{obj[:queries][0]} \"#{obj[:obj].name}\"#{obj[:queries][1]} \"#{obj[:obj].name}\", \"#{obj[:obj].members.join(";")}\"", @agent.instance_variable_get(:@query_string)
+          assert_equal "#{obj[:queries][0]} \'#{obj[:obj].name}\'#{obj[:queries][1]} \'#{obj[:obj].name}\', \'#{obj[:obj].members.join(";")}\'", @agent.instance_variable_get(:@query_string)
         end
       end
     end
@@ -612,9 +613,9 @@ class ProvisioningTest < MiniTest::Test
         :error=>Provisioning::Agent::Error::CFG_BAD,
         :error_member => Provisioning::Agent::Error::ZONE_BAD,
         :method=>:cfg_remove,
-        :msg_not_found => "> cfgremove \"zctest\",\"zonetest\"\nnot found\n",
+        :msg_not_found => "> cfgremove \'zctest\',\'zonetest\'\nnot found\n",
         :resp_not_found => "not found",
-        :msg_ok => "> cfgremove \"zctest\",\"zonetest\"\n",
+        :msg_ok => "> cfgremove \'zctest\',\'zonetest\'\n",
         :resp_ok => ""
        },
        {:obj=>Zone.new("zonetest"), 
@@ -627,9 +628,9 @@ class ProvisioningTest < MiniTest::Test
         :error => Provisioning::Agent::Error::ZONE_BAD,
         :error_member => Provisioning::Agent::Error::MEMBER_BAD,
         :method=>:zone_remove,
-        :msg_not_found => "> zoneremove \"zonename\",\"aliastest\"\nnot found\n",
+        :msg_not_found => "> zoneremove \'zonename\',\'aliastest\'\nnot found\n",
         :resp_not_found => "not found",
-        :msg_ok => "> zoneremove \"zonename\",\"aliastest\"\n",
+        :msg_ok => "> zoneremove \'zonename\',\'aliastest\'\n",
         :resp_ok => ""
         },
        {:obj=>Alias.new("aliastest"), 
@@ -642,9 +643,9 @@ class ProvisioningTest < MiniTest::Test
         :error => Provisioning::Agent::Error::ALIAS_BAD,
         :error_member => Provisioning::Agent::Error::ALIAS_MEMBER_BAD,
         :method=>:alias_remove,
-        :msg_not_found => "> aliremove \"aliastest\",\"50:00; 50:02\"\nnot found\n",
+        :msg_not_found => "> aliremove \'aliastest\',\'50:00; 50:02\'\nnot found\n",
         :resp_not_found => "not found",
-        :msg_ok => "> aliremove \"aliastest\",\"50:00; 50:02\"\n",
+        :msg_ok => "> aliremove \'aliastest\',\'50:00; 50:02\'\n",
         :resp_ok => ""
         }
      ]
@@ -697,11 +698,11 @@ class ProvisioningTest < MiniTest::Test
           @agent.query_stub do
             obj[:members_ok].each do |mem_ok|
               assert_equal obj[:obj], @agent.send(:obj_remove,obj[:obj],obj[:klass],mem_ok)
-              assert_equal "#{obj[:cmd]} \"#{obj[:obj].name}\", \"#{mem_ok}\"", @agent.instance_variable_get(:@query_string)
+              assert_equal "#{obj[:cmd]} \'#{obj[:obj].name}\', \'#{mem_ok}\'", @agent.instance_variable_get(:@query_string)
               @agent.instance_variable_set(:@query_string,"")
               # test wrapper method
               @agent.send obj[:method],obj[:obj],mem_ok
-              assert_equal "#{obj[:cmd]} \"#{obj[:obj].name}\", \"#{mem_ok}\"", @agent.instance_variable_get(:@query_string)
+              assert_equal "#{obj[:cmd]} \'#{obj[:obj].name}\', \'#{mem_ok}\'", @agent.instance_variable_get(:@query_string)
               @agent.instance_variable_set(:@query_string,"")
             end       
           end
@@ -735,9 +736,9 @@ class ProvisioningTest < MiniTest::Test
         :error=>Provisioning::Agent::Error::CFG_BAD,
         :error_member => Provisioning::Agent::Error::ZONE_BAD,
         :method=>:cfg_add,
-        :msg_not_found => "> cfgadd \"zctest\",\"zonetest\"\nnot found\n",
+        :msg_not_found => "> cfgadd \'zctest\',\'zonetest\'\nnot found\n",
         :resp_not_found => "not found",
-        :msg_ok => "> cfgadd \"zctest\",\"zonetest\"\n",
+        :msg_ok => "> cfgadd \'zctest\',\'zonetest\'\n",
         :resp_ok => ""
        },
        {:obj=>Zone.new("zonetest"), 
@@ -750,9 +751,9 @@ class ProvisioningTest < MiniTest::Test
         :error => Provisioning::Agent::Error::ZONE_BAD,
         :error_member => Provisioning::Agent::Error::MEMBER_BAD,
         :method=>:zone_add,
-        :msg_not_found => "> zoneadd \"zonename\",\"aliastest\"\nnot found\n",
+        :msg_not_found => "> zoneadd \'zonename\',\'aliastest\'\nnot found\n",
         :resp_not_found => "not found",
-        :msg_ok => "> zoneadd \"zonename\",\"aliastest\"\n",
+        :msg_ok => "> zoneadd \'zonename\',\'aliastest\'\n",
         :resp_ok => ""
         },
        {:obj=>Alias.new("aliastest"), 
@@ -765,9 +766,9 @@ class ProvisioningTest < MiniTest::Test
         :error => Provisioning::Agent::Error::ALIAS_BAD,
         :error_member => Provisioning::Agent::Error::ALIAS_MEMBER_BAD,
         :method=>:alias_add,
-        :msg_not_found => "> aliadd \"aliastest\",\"50:00; 50:02\"\nnot found\n",
+        :msg_not_found => "> aliadd \'aliastest\',\'50:00; 50:02\'\nnot found\n",
         :resp_not_found => "not found",
-        :msg_ok => "> aliadd \"aliastest\",\"50:00; 50:02\"\n",
+        :msg_ok => "> aliadd \'aliastest\',\'50:00; 50:02\'\n",
         :resp_ok => ""
         }
      ]
@@ -820,11 +821,11 @@ class ProvisioningTest < MiniTest::Test
           @agent.query_stub do
             obj[:members_ok].each do |mem_ok|
               assert_equal obj[:obj], @agent.send(:obj_add,obj[:obj],obj[:klass],mem_ok)
-              assert_equal "#{obj[:cmd]} \"#{obj[:obj].name}\", \"#{mem_ok}\"", @agent.instance_variable_get(:@query_string)
+              assert_equal "#{obj[:cmd]} \'#{obj[:obj].name}\', \'#{mem_ok}\'", @agent.instance_variable_get(:@query_string)
               @agent.instance_variable_set(:@query_string,"")
               # test wrapper method
               @agent.send obj[:method],obj[:obj],mem_ok
-              assert_equal "#{obj[:cmd]} \"#{obj[:obj].name}\", \"#{mem_ok}\"", @agent.instance_variable_get(:@query_string)
+              assert_equal "#{obj[:cmd]} \'#{obj[:obj].name}\', \'#{mem_ok}\'", @agent.instance_variable_get(:@query_string)
               @agent.instance_variable_set(:@query_string,"")
             end     
           end
@@ -878,7 +879,7 @@ class ProvisioningTest < MiniTest::Test
         }
      ]
      # some ok response
-     @response.data="> alidelete \"test\"\n"
+     @response.data="> alidelete \'test\'\n"
      objs.each do |obj|
        @agent.multistub [
           [:check_for_running_transaction, false],
@@ -893,11 +894,11 @@ class ProvisioningTest < MiniTest::Test
          @agent.query_stub do
            assert_equal obj[:obj], @agent.send(:obj_purge,obj[:obj],obj[:klass])
            # checks the cmd sent to query
-           assert_equal "#{obj[:queries][0]} \"#{obj[:parents][0]}\", \"#{obj[:obj]}\"#{obj[:queries][1]} \"#{obj[:obj]}\"", @agent.instance_variable_get(:@query_string)
+           assert_equal "#{obj[:queries][0]} \'#{obj[:parents][0]}\', \'#{obj[:obj]}\'#{obj[:queries][1]} \'#{obj[:obj]}\'", @agent.instance_variable_get(:@query_string)
            @agent.instance_variable_set(:@query_string,"")
            # test wrapper method
            @agent.send obj[:method],obj[:obj]
-           assert_equal "#{obj[:queries][0]} \"#{obj[:parents][0]}\", \"#{obj[:obj]}\"#{obj[:queries][1]} \"#{obj[:obj]}\"", @agent.instance_variable_get(:@query_string)
+           assert_equal "#{obj[:queries][0]} \'#{obj[:parents][0]}\', \'#{obj[:obj]}\'#{obj[:queries][1]} \'#{obj[:obj]}\'", @agent.instance_variable_get(:@query_string)
          end
        end
      end
@@ -1040,4 +1041,4 @@ class ProvisioningTest < MiniTest::Test
   end
 end
 
-end; end
+end; end

data/test/switch_test.rb

@@ -6,6 +6,7 @@ module Brocade module SAN
   
 class SwitchTest < MiniTest::Test
   include OutputReader
+  include SshStoryWriter
   include Mock::Net::SSH
   patch_set
     
@@ -17,6 +18,11 @@ class SwitchTest < MiniTest::Test
     @device = Switch.new("test","test","test")
   end
   
+  def test_override_vf
+    @device.override_vf
+    assert @device.instance_variable_get(:@configuration)[:override_vf]
+  end
+  
   def test_query
     response=@device.query("test")
     assert_instance_of Switch::Response, response
@@ -33,6 +39,24 @@ class SwitchTest < MiniTest::Test
     end
   end
   
+  def test_interactive_query
+    cmds = ["fosexec --fid 99 -cmd 'cfgsave'","y"]
+    replies = ["confirm? [y,n]"]
+    exp_response = write_interactive_story(cmds,replies,TestDevice::DEFAULT_QUERY_PROMPT)
+    
+    @device.set_mode("interactive")
+    @device.set_context 99
+    # connection is net/ssh/test method
+    @device.instance_variable_set(:@session,connection)
+    
+    response=nil
+    assert_scripted do
+      response=@device.query("cfgsave","y")
+      assert_equal exp_response, response.data
+    end    
+    
+  end
+  
   def test_device_setup
     assert_instance_of Switch, @device
   end
@@ -138,15 +162,21 @@ class SwitchTest < MiniTest::Test
     
     #vf enabled and fid given
     @device.set_context 99
-    assert_equal "fosexec --fid 99 \'test\'", @device.send(:fullcmd,"test")
+    assert_equal "fosexec --fid 99 -cmd \'test\'", @device.send(:fullcmd,"test")
     
     #vf enabled and fid given and piped commnad
     @device.set_context 99
-    assert_equal "fosexec --fid 99 \'test\' |grep shit", @device.send(:fullcmd,"test|grep shit")
+    assert_equal "fosexec --fid 99 -cmd \'test\' |grep shit", @device.send(:fullcmd,"test|grep shit")
     
     #vf enabled and fid given and piped commnad
     @device.set_context 99
-    assert_equal "fosexec --fid 99 \'test\' | grep shit| grep shit2", @device.send(:fullcmd,"test| grep shit| grep shit2")
+    assert_equal "fosexec --fid 99 -cmd \'test\' | grep shit| grep shit2", @device.send(:fullcmd,"test| grep shit| grep shit2")
+    
+    #vf enabled and fid given and override
+    @device.set_context 99
+    @device.override_vf
+    assert_equal "test", @device.send(:fullcmd,"test")
+    
   end
   
   def test_zone_cfgs_and_effective_cfg_and_zones

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: brocadesan
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.8
 platform: ruby
 authors:
 - Tomas Trnecka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake-notes
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 description: Gem to manipulate FABOS based devices
 email: trnecka@gmail.com
 executables: []
@@ -107,16 +100,28 @@ files:
 - test/outputs/dlsshow_1.yml
 - test/outputs/dlsshow_2.txt
 - test/outputs/dlsshow_2.yml
+- test/outputs/fabricprincipal_1.txt
+- test/outputs/fabricprincipal_1.yml
+- test/outputs/fabricprincipal_2.txt
+- test/outputs/fabricprincipal_2.yml
+- test/outputs/fabricprincipal_3.txt
+- test/outputs/fabricprincipal_3.yml
 - test/outputs/fabricshow_1.txt
 - test/outputs/fabricshow_1.yml
 - test/outputs/iodshow_1.txt
 - test/outputs/iodshow_1.yml
+- test/outputs/ipaddrshow_1.txt
+- test/outputs/ipaddrshow_1.yml
+- test/outputs/ipaddrshow_2.txt
+- test/outputs/ipaddrshow_2.yml
 - test/outputs/islshow_1.txt
 - test/outputs/islshow_1.yml
 - test/outputs/islshow_2.txt
 - test/outputs/islshow_2.yml
 - test/outputs/lscfg_show_1.txt
 - test/outputs/lscfg_show_1.yml
+- test/outputs/mapsdbshow_1.txt
+- test/outputs/mapsdbshow_1.yml
 - test/outputs/ns_1.txt
 - test/outputs/ns_1.yml
 - test/outputs/ns_2.txt
@@ -145,26 +150,25 @@ files:
 - test/zone_test.rb
 homepage: http://rubygems.org/gems/brocadesan
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Brocade SAN library
 test_files: []