[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.topo b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.topo
index c531f7d..5ad1b13 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.topo
@@ -9,6 +9,7 @@
<connect_order>1</connect_order>
<COMPONENTS>
<nodes>1</nodes>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -19,6 +20,9 @@
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli1>
@@ -29,6 +33,7 @@
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli2>
@@ -39,6 +44,7 @@
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli3>
@@ -50,6 +56,7 @@
<type>OnosRestDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>
@@ -61,6 +68,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest2>
@@ -72,6 +80,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest3>
@@ -83,6 +92,7 @@
<connect_order>7</connect_order>
<COMPONENTS>
<home>~/mininet/custom/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.topo b/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.topo
index c531f7d..5ad1b13 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.topo
@@ -9,6 +9,7 @@
<connect_order>1</connect_order>
<COMPONENTS>
<nodes>1</nodes>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -19,6 +20,9 @@
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli1>
@@ -29,6 +33,7 @@
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli2>
@@ -39,6 +44,7 @@
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli3>
@@ -50,6 +56,7 @@
<type>OnosRestDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>
@@ -61,6 +68,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest2>
@@ -72,6 +80,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest3>
@@ -83,6 +92,7 @@
<connect_order>7</connect_order>
<COMPONENTS>
<home>~/mininet/custom/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRHighAvailability/SRHighAvailability.topo b/TestON/tests/USECASE/SegmentRouting/SRHighAvailability/SRHighAvailability.topo
index bf9b6be..e0328c2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRHighAvailability/SRHighAvailability.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRHighAvailability/SRHighAvailability.topo
@@ -9,6 +9,7 @@
<connect_order>1</connect_order>
<COMPONENTS>
<nodes>1</nodes>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -19,6 +20,9 @@
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli1>
@@ -29,6 +33,7 @@
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli2>
@@ -39,6 +44,7 @@
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli3>
@@ -50,6 +56,7 @@
<type>OnosRestDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>
@@ -61,6 +68,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest2>
@@ -72,6 +80,7 @@
<type>OnosRestDriver</type>
<connect_order>7</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest3>
@@ -83,6 +92,7 @@
<connect_order>7</connect_order>
<COMPONENTS>
<home>~/mininet/custom/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.topo b/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.topo
index 2d69c35..f63a8c2 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.topo
@@ -19,6 +19,9 @@
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli1>
@@ -29,6 +32,7 @@
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli2>
@@ -39,6 +43,7 @@
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli3>
@@ -50,6 +55,7 @@
<type>OnosRestDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>
@@ -61,6 +67,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest2>
@@ -72,6 +79,7 @@
<type>OnosRestDriver</type>
<connect_order>7</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest3>
@@ -83,6 +91,7 @@
<connect_order>8</connect_order>
<COMPONENTS>
<home>~/mininet/custom/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>
diff --git a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.topo b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.topo
index c531f7d..5ad1b13 100755
--- a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.topo
@@ -9,6 +9,7 @@
<connect_order>1</connect_order>
<COMPONENTS>
<nodes>1</nodes>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -19,6 +20,9 @@
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli1>
@@ -29,6 +33,7 @@
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli2>
@@ -39,6 +44,7 @@
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli3>
@@ -50,6 +56,7 @@
<type>OnosRestDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>
@@ -61,6 +68,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest2>
@@ -72,6 +80,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest3>
@@ -83,6 +92,7 @@
<connect_order>7</connect_order>
<COMPONENTS>
<home>~/mininet/custom/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRSanity/SRSanity.topo b/TestON/tests/USECASE/SegmentRouting/SRSanity/SRSanity.topo
index c531f7d..5ad1b13 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRSanity/SRSanity.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRSanity/SRSanity.topo
@@ -9,6 +9,7 @@
<connect_order>1</connect_order>
<COMPONENTS>
<nodes>1</nodes>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -19,6 +20,9 @@
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli1>
@@ -29,6 +33,7 @@
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli2>
@@ -39,6 +44,7 @@
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli3>
@@ -50,6 +56,7 @@
<type>OnosRestDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>
@@ -61,6 +68,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest2>
@@ -72,6 +80,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest3>
@@ -83,6 +92,7 @@
<connect_order>7</connect_order>
<COMPONENTS>
<home>~/mininet/custom/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.topo b/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.topo
index 2d69c35..04f480a 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.topo
@@ -9,6 +9,7 @@
<connect_order>1</connect_order>
<COMPONENTS>
<nodes>1</nodes>
+ <prompt></prompt>
</COMPONENTS>
</ONOSbench>
@@ -19,6 +20,9 @@
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
+ <karaf_username></karaf_username>
+ <karaf_password></karaf_password>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli1>
@@ -29,6 +33,7 @@
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli2>
@@ -39,6 +44,7 @@
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOScli3>
@@ -50,6 +56,7 @@
<type>OnosRestDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest1>
@@ -61,6 +68,7 @@
<type>OnosRestDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest2>
@@ -72,6 +80,7 @@
<type>OnosRestDriver</type>
<connect_order>7</connect_order>
<COMPONENTS>
+ <prompt></prompt>
</COMPONENTS>
</ONOSrest3>
@@ -83,6 +92,7 @@
<connect_order>8</connect_order>
<COMPONENTS>
<home>~/mininet/custom/</home>
+ <prompt></prompt>
</COMPONENTS>
</Mininet1>