modified to make batch count accurate
Change-Id: Id3b0b07d1c937eb52abb25e2186d6d2999bf40ac
diff --git a/TestON/drivers/common/api/controller/onosrestdriver.py b/TestON/drivers/common/api/controller/onosrestdriver.py
index 49e20a2..d03e12e 100644
--- a/TestON/drivers/common/api/controller/onosrestdriver.py
+++ b/TestON/drivers/common/api/controller/onosrestdriver.py
@@ -1586,6 +1586,7 @@
deviceId = deviceIdpreFix + "{0:0{1}x}".format(dev,16)
#print deviceId
flowJson['deviceId'] = deviceId
+ dev += 1
# ethSrc starts with "0"; ethDst starts with "1"
# 3 Hex digit of device number; 4 digits of batch index number; 4 digits of batch size
diff --git a/TestON/tests/COMPflow/COMPflow.params b/TestON/tests/COMPflow/COMPflow.params
index f3a0ef5..b8850ee 100755
--- a/TestON/tests/COMPflow/COMPflow.params
+++ b/TestON/tests/COMPflow/COMPflow.params
@@ -44,8 +44,8 @@
</CASE10>
<CASE1000>
- <batchSize>20</batchSize>
- <batches>10</batches>
+ <batchSize>200</batchSize>
+ <batches>500</batches>
</CASE1000>
<SLEEP>
diff --git a/TestON/tests/COMPflow/COMPflow.py b/TestON/tests/COMPflow/COMPflow.py
index 7fae518..45e4de5 100644
--- a/TestON/tests/COMPflow/COMPflow.py
+++ b/TestON/tests/COMPflow/COMPflow.py
@@ -239,18 +239,22 @@
main.step("Creating a full list of batches")
for index in range(1, int(main.params['CASE1000']['batches']) + 1):
if startSw <= main.numSw:
- main.log.info("Creating batch: " + str(index))
- flowJsonBatch = main.ONOSrest.createFlowBatch( numSw = main.numSw,
- swIndex = startSw,
+ ind = startSw
+ else:
+ startSw = 1
+ ind = startSw
+
+ main.log.info("Creating batch: " + str(index))
+ flowJsonBatch = main.ONOSrest.createFlowBatch( numSw = main.numSw,
+ swIndex = ind,
batchSize = main.batchSize,
batchIndex = index,
ingressPort = 2,
egressPort = 3)
- main.flowJsonBatchList.append(flowJsonBatch)
+ main.flowJsonBatchList.append(flowJsonBatch)
- startSw += 1
- else:
- startSw = 1
+ startSw += 1
+
main.step("Using REST API /flows/{} to post flow batch")