Rename hostclidriver's interfaceName to ifaceName to match other drivers
Change-Id: Ie8af60d9b3d727c57123af43b52cf26271c20abb
diff --git a/TestON/drivers/common/cli/hostdriver.py b/TestON/drivers/common/cli/hostdriver.py
index 3232361..22045de 100644
--- a/TestON/drivers/common/cli/hostdriver.py
+++ b/TestON/drivers/common/cli/hostdriver.py
@@ -58,7 +58,7 @@
'isUp': True,
'mac': self.options[ 'mac' ],
'dhcp': self.options.get( 'dhcp', "False" ),
- 'name': self.options.get( 'interfaceName', None ) } )
+ 'name': self.options.get( 'ifaceName', None ) } )
try:
if os.getenv( str( self.ip_address ) ) is not None:
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x1.physical b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x1.physical
index e67e354..251f1ea 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x1.physical
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x1.physical
@@ -55,7 +55,7 @@
<shortName>h1</shortName>
<port1>0</port1>
<link1>SwitchLeaf1</link1>
- <interfaceName>ens6f0</interfaceName>
+ <ifaceName>ens6f0</ifaceName>
<routes>
<route1>
<network>192.168.102.1</network>
@@ -80,7 +80,7 @@
<shortName>h2</shortName>
<port1>0</port1>
<link1>SwitchLeaf1</link1>
- <interfaceName>ens6f1</interfaceName>
+ <ifaceName>ens6f1</ifaceName>
<routes>
<route1>
<network>192.168.102.1</network>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
index 0976b83..61ff208 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
@@ -71,7 +71,7 @@
<shortName>h1</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>pairbond</interfaceName>
+ <ifaceName>pairbond</ifaceName>
<scapy_path>/usr/bin/scapy</scapy_path>
<routes>
<route1>
@@ -100,7 +100,7 @@
<shortName>h2</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>pairbond</interfaceName>
+ <ifaceName>pairbond</ifaceName>
<scapy_path>/usr/bin/scapy</scapy_path>
<routes>
<route1>
@@ -129,7 +129,7 @@
<shortName>h3</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>eno2</interfaceName>
+ <ifaceName>eno2</ifaceName>
<scapy_path>/usr/bin/scapy</scapy_path>
<routes>
<route1>
@@ -157,7 +157,7 @@
<shortName>mgmt</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>pairbond</interfaceName>
+ <ifaceName>pairbond</ifaceName>
<scapy_path>/usr/bin/scapy</scapy_path>
<routes>
<route1>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/SRDynamicConf.topo.2x2.physical b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/SRDynamicConf.topo.2x2.physical
index 8353070..24d5f51 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/SRDynamicConf.topo.2x2.physical
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/SRDynamicConf.topo.2x2.physical
@@ -101,7 +101,7 @@
<shortName>h1</shortName>
<port1>0</port1>
<link1>Leaf1</link1>
- <interfaceName>ens6f0</interfaceName>
+ <ifaceName>ens6f0</ifaceName>
<routes>
<route1>
<network>192.168.103.1</network>
@@ -126,7 +126,7 @@
<shortName>h2</shortName>
<port1>0</port1>
<link1>Leaf1</link1>
- <interfaceName>ens6f1</interfaceName>
+ <ifaceName>ens6f1</ifaceName>
<routes>
<route1>
<network>192.168.102.1</network>
@@ -151,7 +151,7 @@
<shortName>ng40</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>ens9</interfaceName>
+ <ifaceName>ens9</ifaceName>
<routes>
<route1>
<network>192.168.101.1</network>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.topo.2x2.physical b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.topo.2x2.physical
index e9f18ee..17cb204 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.topo.2x2.physical
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.topo.2x2.physical
@@ -101,7 +101,7 @@
<shortName>h1</shortName>
<port1>0</port1>
<link1>Leaf1</link1>
- <interfaceName>ens6f0</interfaceName>
+ <ifaceName>ens6f0</ifaceName>
<routes>
<route1>
<network>192.168.101.1</network>
@@ -126,7 +126,7 @@
<shortName>h2</shortName>
<port1>0</port1>
<link1>Leaf1</link1>
- <interfaceName>ens6f1</interfaceName>
+ <ifaceName>ens6f1</ifaceName>
<routes>
<route1>
<network>192.168.101.1</network>
@@ -151,7 +151,7 @@
<shortName>ng40</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>ens8</interfaceName>
+ <ifaceName>ens8</ifaceName>
<routes>
<route1>
<network>192.168.101.1</network>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.topo b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.topo
index f50b327..2f4c8f2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.topo
@@ -113,7 +113,7 @@
<shortName>h1</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>fabr52</interfaceName>
+ <ifaceName>fabr52</ifaceName>
<routes>
<route1>
<network></network>
@@ -141,7 +141,7 @@
<shortName>h2</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>fabr52</interfaceName>
+ <ifaceName>fabr52</ifaceName>
<routes>
<route1>
<network></network>
@@ -169,7 +169,7 @@
<shortName>h3</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>fabr52</interfaceName>
+ <ifaceName>fabr52</ifaceName>
<routes>
<route1>
<network></network>
@@ -195,7 +195,7 @@
<shortName>ng40</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>ens8</interfaceName>
+ <ifaceName>ens8</ifaceName>
<routes>
<route1>
<network></network>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.topo b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.topo
index 609d479..40bf030 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.topo
@@ -77,7 +77,7 @@
<shortName>h1</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>pairbond</interfaceName>
+ <ifaceName>pairbond</ifaceName>
<routes>
<route1>
<network></network>
@@ -105,7 +105,7 @@
<shortName>h2</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>pairbond</interfaceName>
+ <ifaceName>pairbond</ifaceName>
<routes>
<route1>
<network></network>
@@ -133,7 +133,7 @@
<shortName>h3</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>eno2</interfaceName>
+ <ifaceName>eno2</ifaceName>
<routes>
<route1>
<network></network>
@@ -160,7 +160,7 @@
<shortName>mgmt</shortName>
<port1></port1>
<link1></link1>
- <interfaceName>pairbond</interfaceName>
+ <ifaceName>pairbond</ifaceName>
<routes>
<route1>
<network></network>