Update to FUNCintentRest
Currently Changes:
-Updated cases in FUNCintentRest up to case 1000
-Case 8 replaced with case 8 from FUNCintent
and some small modifications
-Cases were added and existing cases were
renumbered to more closely match FUNCintent
-Cases 1000, 2000, 5000 refactored to match
cases 1000, 2000, 5000 from FUNCintent
-Three functions added to FUNCintentRest's
FuncIntentFunction from the one in FUNCintent
-sendDiscoveryArp
-confirmHostDiscovery
-populateHostsData
-The function hostIntent was split into
installHostIntent and testHostIntent
-The function pointIntent was split into
installPointIntent and testPointIntent
TODO:
-Finish updating rest of cases
-Continue updating FUNCintentRest to use Scapy
-Add cli instance to provide function thes rest
API is missing
Uncompletable
-Complete Case 3000, 4000, and write analogue to
Case 6000 in FUNCintent
-the REST API does not currently support
Single to Multi and Multi to Single Point Intents.
Change-Id: I94917bef3fcaaec9d365df12528df0a05e98246f
diff --git a/TestON/tests/FUNCintentRest/FUNCintentRest.params b/TestON/tests/FUNCintentRest/FUNCintentRest.params
index 058b57a..94339b4 100644
--- a/TestON/tests/FUNCintentRest/FUNCintentRest.params
+++ b/TestON/tests/FUNCintentRest/FUNCintentRest.params
@@ -2,22 +2,25 @@
# CASE - Description
# 1 - Variable initialization and optional pull and build ONOS package
# 2 - Install ONOS
+ # 8 - Compare Topology
# 9 - Report logs
# 10 - Start Mininet with Openflow 1.0
# 11 - Start Mininet with Openflow 1.3
# 12 - Assign switch to controller
- # 13 - Create a data of hosts information
- # 14 - Stop Mininet
+ # 13 - Create Scapy Components
+ # 14 - Discover all hosts and Create a dictionary of hosts information
+ # 15 - Discover hosts with scapy arping ( only discovers scapy hosts )
+ # 16 - Stop Mininet
# 1000 - Test host intents
# 2000 - Test point intents
# 3000 - Test single to multi point intents
# 4000 - Test multi to single point intents
# 5000 - Test host mobility
- <testcases>1,[2,10,12,13,1000,2000,14],[2,11,12,13,1000,2000,14]</testcases>
+ <testcases>1,[2,10,12,13,15,1000,2000,5000,16]*2,[2,11,12,13,15,1000,2000,5000,16]*2</testcases>
<SCALE>
- <size>1,1</size>
+ <size>1,3,1,3</size>
</SCALE>
<DEPENDENCY>
@@ -40,8 +43,10 @@
<startup>15</startup>
<reroute>5</reroute>
<checkintent>5</checkintent>
- <fwd>5</fwd>
- <addIntent>3</addIntent>
+ <removeintent>10</removeintent>
+ <fwd>10</fwd>
+ <addIntent>10</addIntent>
+ <topoAttempts>3</topoAttempts>
</SLEEP>
<MININET>
@@ -49,6 +54,10 @@
<links>20</links>
</MININET>
+ <SCAPY>
+ <HOSTNAMES>h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11,h12,h13,h14,h15,h16,h17,h18,h19,h20,h21,h22,h23,h24</HOSTNAMES>
+ </SCAPY>
+
# Intent tests params
<SDNIP>
<tcpProto>6</tcpProto>