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.topo b/TestON/tests/FUNCintentRest/FUNCintentRest.topo
index efed3d6..6be48c6 100755
--- a/TestON/tests/FUNCintentRest/FUNCintentRest.topo
+++ b/TestON/tests/FUNCintentRest/FUNCintentRest.topo
@@ -50,8 +50,18 @@
             <password></password>
             <type>MininetCliDriver</type>
             <connect_order>5</connect_order>
-            <COMPONENTS> </COMPONENTS>
+            <COMPONENTS>
+                <home>~/mininet/</home>
+            </COMPONENTS>
         </Mininet1>
 
+        <Scapy1>
+            <host>OCN</host>
+            <user>admin</user>
+            <password></password>
+            <type>ScapyCliDriver</type>
+            <connect_order>6</connect_order>
+        </Scapy1>
+
     </COMPONENT>
 </TOPOLOGY>