Fixed the wrong directory and the node for graph
Change-Id: I99ffe47a0e88310839cf3733e5effc8ea5060baa
diff --git a/TestON/JenkinsFile/SRJenkinsfileTrigger b/TestON/JenkinsFile/SRJenkinsfileTrigger
index 9e155fb..5ec7a91 100644
--- a/TestON/JenkinsFile/SRJenkinsfileTrigger
+++ b/TestON/JenkinsFile/SRJenkinsfileTrigger
@@ -1,7 +1,7 @@
#!groovy
-funcs = evaluate readTrusted( 'JenkinsCommonFuncs.groovy' )
-test_lists = evaluate readTrusted( 'JenkinsTestONTests.groovy' )
+funcs = evaluate readTrusted( 'TestON/JenkinsFile/JenkinsCommonFuncs.groovy' )
+test_lists = evaluate readTrusted( 'TestON/JenkinsFile/JenkinsTestONTests.groovy' )
triggerFuncs = evaluate readTrusted( 'TestON/JenkinsFile/TriggerFuncs.groovy' )
previous_version = "1.12"
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params
index 9ca0543..748844e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params
@@ -3,7 +3,7 @@
<testcases>5,6,7,8,15,16,17,18,25,26,27,28,35,36,37,38,45,46,47,48,55,56,57,58,65,66,67,68,75,76,77,78</testcases>
<GRAPH>
- <nodeCluster>VM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params
index 9a0a8a1..778370e 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params
@@ -3,7 +3,7 @@
<testcases>1,2,3</testcases>
<GRAPH>
- <nodeCluster>BM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params
index 29b381d..0fba048 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params
@@ -2,7 +2,7 @@
<testcases>1,2,11,12,21,22,31,41,51,61,71</testcases>
<GRAPH>
- <nodeCluster>VM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.params b/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.params
index 541c836..8beeccd 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.params
@@ -3,7 +3,7 @@
<testcases>1,2,3,4,5,6</testcases>
<GRAPH>
- <nodeCluster>BM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/SRDynamicConf.params b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/SRDynamicConf.params
index 69062b3..551b649 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/SRDynamicConf.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/SRDynamicConf.params
@@ -2,7 +2,7 @@
<testcases>range(13, 251, 10)</testcases>
<GRAPH>
- <nodeCluster>VM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRHighAvailability/SRHighAvailability.params b/TestON/tests/USECASE/SegmentRouting/SRHighAvailability/SRHighAvailability.params
index 236a21c..0870eab 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRHighAvailability/SRHighAvailability.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRHighAvailability/SRHighAvailability.params
@@ -3,7 +3,7 @@
<testcases>1,2,3,4,5,6,7,8</testcases>
<GRAPH>
- <nodeCluster>BM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.params b/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.params
index 098f9da..8e0bbbf 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.params
@@ -3,7 +3,7 @@
<testcases>1,2,4,5</testcases>
<GRAPH>
- <nodeCluster>BM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params b/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params
index b7a9a36..0189744 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params
@@ -2,7 +2,7 @@
<testcases>1</testcases>
<GRAPH>
- <nodeCluster>VM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>
diff --git a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params
index 9a0a8a1..778370e 100755
--- a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params
+++ b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params
@@ -3,7 +3,7 @@
<testcases>1,2,3</testcases>
<GRAPH>
- <nodeCluster>BM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params
index b5feb3a..39448c2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params
@@ -2,7 +2,7 @@
<testcases>1,2,3,4,5,6,7,8,9</testcases>
<GRAPH>
- <nodeCluster>VM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.params b/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.params
index 098f9da..8e0bbbf 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.params
@@ -3,7 +3,7 @@
<testcases>1,2,4,5</testcases>
<GRAPH>
- <nodeCluster>BM</nodeCluster>
+ <nodeCluster>Fabric</nodeCluster>
<builds>20</builds>
</GRAPH>