Merge "Exception handling added to FUNCintent where needed and made related changes to driver and teston functions Change-Id: I8db4949d7eeabb5067a3b70d238348858d0a445f"
diff --git a/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.topo b/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.topo
index 5d040d9..dd25a2e 100755
--- a/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.topo
+++ b/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.topo
@@ -38,12 +38,31 @@
<COMPONENTS> </COMPONENTS>
</ONOScli3>
+ <ONOScli4>
+ <host>localhost</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosCliDriver</type>
+ <connect_order>5</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOScli4>
+
+ <ONOScli5>
+ <host>localhost</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosCliDriver</type>
+ <connect_order>6</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOScli5>
+
+
<ONOS1>
<host>OC1</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
- <connect_order>5</connect_order>
+ <connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS1>
@@ -52,7 +71,7 @@
<user>sdn</user>
<password>rocks</password>
<type>MininetCliDriver</type>
- <connect_order>6</connect_order>
+ <connect_order>8</connect_order>
<COMPONENTS>
<home>~/mininet/custom/</home>
</COMPONENTS>
diff --git a/TestON/tests/PLAT/PLATdockertest/PLATdockertest.params b/TestON/tests/PLAT/PLATdockertest/PLATdockertest.params
index cc90dae..53c4b8c 100755
--- a/TestON/tests/PLAT/PLATdockertest/PLATdockertest.params
+++ b/TestON/tests/PLAT/PLATdockertest/PLATdockertest.params
@@ -14,16 +14,10 @@
</SCALE>
<CASE110>
- <clustercmdpath>../tests/PLATdockertest/dependencies</clustercmdpath>
+ <clustercmdpath>../tests/PLAT/PLATdockertest/dependencies</clustercmdpath>
<apps>org.onosproject.proxyarp,org.onosproject.fwd</apps>
</CASE110>
- <DEPENDENCY>
- <path>/tests/SAMPstartTemplate/dependencies/</path>
- <wrapper1>startUp</wrapper1>
- <topology>newFuncTopo.py</topology>
- </DEPENDENCY>
-
<ENV>
<cellName>productionCell</cellName>
<cellApps>drivers,openflow,proxyarp,mobility</cellApps>
diff --git a/TestON/tests/PLAT/PLATdockertest/dependencies/Dependency/onos-form-cluster b/TestON/tests/PLAT/PLATdockertest/dependencies/onos-form-cluster
similarity index 100%
rename from TestON/tests/PLAT/PLATdockertest/dependencies/Dependency/onos-form-cluster
rename to TestON/tests/PLAT/PLATdockertest/dependencies/onos-form-cluster