commit 612e86ebc98435ed1af9ad313f2baf418fb2722a
author You Wang <you@opennetworking.org> Tue Jan 23 23:39:21 2018 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Tue Jan 23 23:39:21 2018 +0000
tree bc2054ac5588384cbce6d46b373fac05e8407405
parent 645e98c0950b91fa92100a30d6ba19f861d73d6d
parent dafb6e2ddd7021ecccf6000fa7ee27cfb12e2ec4

Merge "[ONOS-7356] Decouple Scapy from TestON tests  - Create MininetScapyCliDriver for mininet based scapy tests  - Move scapy related setup to a single test case in FUNCflow and    FUNCgroup"

TestON/drivers/common/cli/emulator/mininetclidriver.py

diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 25cafe0..580b3b5 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -153,7 +153,7 @@
                     # Sudo asking for password
                     main.log.info( self.name + ": Sending sudo password" )
                     self.handle.sendline( self.pwd )
-                    i = self.handle.expect( [ '%s:' % self.user,
+                    i = self.handle.expect( [ '%s:' % self.user_name,
                                               self.prompt,
                                               pexpect.EOF,
                                               pexpect.TIMEOUT ],

TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params

diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params
index 021be12..27a2bae 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params
@@ -2,7 +2,7 @@
     <testcases>5,6,7,8,15,16,17,18,25,26,27,28,35,36,37,38,45,46,47,48,55,56,57,58,65,66,67,68,75,76,77,78</testcases>
 
     <GRAPH>
-        <nodeCluster>BM</nodeCluster>
+        <nodeCluster>VM</nodeCluster>
         <builds>20</builds>
     </GRAPH>