commit 7892aa18f9e15cadb2502a6d06cfb81b858e35b2
author Jon Hall <jhall@opennetworking.org> Wed Sep 01 18:06:33 2021 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Wed Sep 01 18:06:33 2021 +0000
tree a7ce781596b08cd887fe62a2d195f03ba603f277
parent 638b194f35c1cd47455340e9a023d632c73e775b
parent b0c6ae05662567e1c66ddd793de9d38ebadb5281

Merge "Add option for scapy path"

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

diff --git a/TestON/drivers/common/cli/emulator/scapyclidriver.py b/TestON/drivers/common/cli/emulator/scapyclidriver.py
index e5d2deb..b9eea51 100644
--- a/TestON/drivers/common/cli/emulator/scapyclidriver.py
+++ b/TestON/drivers/common/cli/emulator/scapyclidriver.py
@@ -48,6 +48,7 @@
         self.scapyPrompt = ">>>"
         self.sudoRequired = True
         self.ifaceName = None
+        self.scapyPath = "scapy"
 
     def connect( self, **connectargs ):
         """
@@ -65,6 +66,8 @@
                     self.sudoRequired = False if self.options[ key ] == "false" else True
                 elif key == "ifaceName":
                     self.ifaceName = self.options[ key ]
+                elif key == "scapy_path":
+                    self.scapyPath = self.options[ key ]
             if self.ifaceName is None:
                 self.ifaceName = self.name + "-eth0"
 
@@ -162,9 +165,9 @@
         try:
             main.log.debug( self.name + ": Starting scapy" )
             if self.sudoRequired:
-                self.handle.sendline( "sudo scapy" )
+                self.handle.sendline( "sudo %s" % self.scapyPath )
             else:
-                self.handle.sendline( "scapy" )
+                self.handle.sendline( self.scapyPath )
             i = self.handle.expect( [ "not found", "password for", self.scapyPrompt ] )
             if i == 1:
                 main.log.debug( "Sudo asking for password" )

TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson

diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
index 0b4791b..0976b83 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
@@ -72,6 +72,7 @@
                 <port1></port1>
                 <link1></link1>
                 <interfaceName>pairbond</interfaceName>
+                <scapy_path>/usr/bin/scapy</scapy_path>
                 <routes>
                     <route1>
                         <network>10.32.11.126</network>
@@ -100,6 +101,7 @@
                 <port1></port1>
                 <link1></link1>
                 <interfaceName>pairbond</interfaceName>
+                <scapy_path>/usr/bin/scapy</scapy_path>
                 <routes>
                     <route1>
                         <network>10.32.11.126</network>
@@ -128,6 +130,7 @@
                 <port1></port1>
                 <link1></link1>
                 <interfaceName>eno2</interfaceName>
+                <scapy_path>/usr/bin/scapy</scapy_path>
                 <routes>
                     <route1>
                         <network>10.32.11.254</network>
@@ -155,6 +158,7 @@
                 <port1></port1>
                 <link1></link1>
                 <interfaceName>pairbond</interfaceName>
+                <scapy_path>/usr/bin/scapy</scapy_path>
                 <routes>
                     <route1>
                         <network>10.32.11.126</network>