lib/sloe/ixia.rb in sloe-0.8.1 vs lib/sloe/ixia.rb in sloe-0.8.2
- old
+ new
@@ -129,15 +129,18 @@
def load_config
code = <<-TCL.gsub(/^\s+\|/,'')
|ixNet exec loadConfig [ixNet readFrom "#@ixncfg"]
|set root [ixNet getRoot]
|set vportList [ixNet getList $root vport]
- |after 120000
- |ixTclNet::CheckLinkState $vportList doneList
+ |ixTclNet::CheckLinkState $vportList notReadVportList
+ |foreach vport $notReadyVportList {
+ | set port [IxNet getAttribute $vport -connectedTo]
+ | ixNet exec clearOwnership $port
+ | ixNet exec connectPort $vport
+ |}
|if {[llength $doneList]} {
- | puts "Error: links are not up on $doneList"
- | return -1
+ | after 10000
|}
TCL
code
end
@@ -204,9 +207,13 @@
end
def clean_up
code = <<-TCL.gsub(/^\s+\|/,'')
|cleanUp
+ |foreach vport $vportList {
+ | set port [IxNet getAttribute $vport -connectedTo]
+ | ixNet exec clearOwnership $port
+ |}
TCL
code
end
def disconnect