[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index 42d88fe..4e27dbd 100644
--- a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -90,7 +90,7 @@
cellAppString = main.params[ 'ENV' ][ 'appString' ]
main.ONOSbench.createCellFile( main.ONOSbench.ip_address, cellName,
main.Mininet1.ip_address,
- cellAppString, ipList, main.ONOScli1.user_name )
+ cellAppString, ipList, main.ONOScli1.karafUser )
main.step( "Applying cell variable to environment" )
cellResult = main.ONOSbench.setCell( cellName )
verifyResult = main.ONOSbench.verifyCell()
@@ -165,7 +165,7 @@
main.ONOSbench.createCellFile( main.ONOSbench.ip_address, "SingleHA",
main.Mininet1.ip_address,
- cellAppString, ipList[ 0 ], main.ONOScli1.user_name )
+ cellAppString, ipList[ 0 ], main.ONOScli1.karafUser )
cellResult = main.ONOSbench.setCell( "SingleHA" )
verifyResult = main.ONOSbench.verifyCell()
main.step( "Creating ONOS package" )
diff --git a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.topo b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.topo
index 81cf47a..7c18a98 100644
--- a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.topo
+++ b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.topo
@@ -8,6 +8,7 @@
<type>OnosDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -17,7 +18,11 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli1>
<ONOScli2>
@@ -26,7 +31,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli2>
<ONOScli3>
@@ -35,7 +42,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli3>
@@ -45,7 +54,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli4>
@@ -55,7 +66,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli5>
@@ -65,7 +78,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli6>
@@ -75,7 +90,9 @@
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOScli7>
<ONOS1>
@@ -84,7 +101,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>9</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS1>
<ONOS2>
@@ -93,7 +112,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>10</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS2>
<ONOS3>
@@ -102,7 +123,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>11</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS3>
<ONOS4>
@@ -111,7 +134,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>12</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS4>
<ONOS5>
@@ -120,7 +145,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>13</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS5>
<ONOS6>
@@ -129,7 +156,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>14</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS6>
<ONOS7>
@@ -138,7 +167,9 @@
<password>rocks</password>
<type>OnosDriver</type>
<connect_order>15</connect_order>
- <COMPONENTS> </COMPONENTS>
+ <COMPONENTS>
+ <prompt></prompt>
+ </COMPONENTS>
</ONOS7>
<Mininet1>
@@ -154,6 +185,7 @@
<arg3> --switch ovs,protocols=OpenFlow13 </arg3>
<controller> none </controller>
<home>~/mininet/custom/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>
@@ -164,6 +196,7 @@
<type>RemoteMininetDriver</type>
<connect_order>17</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</Mininet2>