Index: trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-bbn-plastic-101.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-bbn-plastic-101.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-bbn-plastic-101.rspec	(revision 1201)
@@ -1,50 +1,56 @@
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 This rspec will reserve the OpenFlow resources at BBN used by the
 plastic-101 slice.
 
-AM: https://expedient.gpolab.bbn.com:1443/openflow/gapi/
+AM: https://foam.gpolab.bbn.com:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="plastic-101 OpenFlow resources at BBN."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-101@bbn" description="Plastic Slices slice 101 at BBN"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33101" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33101" name="naxos-33101" description="The FlowVisor on naxos, for plastic-101."/>
+    <openflow:group name="habanero-1750-i2-plnodes">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:24:a8:c4:b9:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+	<openflow:port num="49"/>
+	<openflow:port num="50"/>
+	<openflow:port num="51"/>
+	<openflow:port num="71"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+    <openflow:group name="poblano-1750-i2-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:12:e2:b8:a5:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+        <openflow:port num="9"/>
+        <openflow:port num="20"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:3"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.101.0" to="10.42.101.255"/>
+      <openflow:use-group name="habanero-1750-i2-plnodes" />
+      <openflow:use-group name="poblano-1750-i2-3715" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.101.0/24"/>
+        <openflow:nw_src value="10.42.101.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:3"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.101.0" to="10.42.101.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-clemson-plastic-101.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-clemson-plastic-101.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-clemson-plastic-101.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Clemson used by the
-plastic-101 slice.
+This rspec will reserve the OpenFlow resources at Clemson
+used by the plastic-101 slice.
 
-AM: https://expedient.clemson.edu:1443/openflow/gapi/
+AM: https://foam.clemson.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 101 at Clemson."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-101@clemson" description="Plastic Slices slice 101 at Clemson"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33101" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33101" name="naxos-33101" description="The FlowVisor on naxos, for plastic-101." expiry="1313380800"/>
+    <openflow:group name="clemson-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam+datapath+06:d6:00:26:f1:3f:e4:80"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam+authority+am">
+	<openflow:port num="36"/>
+	<openflow:port num="39"/>
+	<openflow:port num="43"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:43"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.101.0" to="10.42.101.255"/>
+      <openflow:use-group name="clemson-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.101.0/24"/>
+	<openflow:nw_src value="10.42.101.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:43"/>
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.101.0" to="10.42.101.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-gatech-plastic-101.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-gatech-plastic-101.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-gatech-plastic-101.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at GT used by the
-plastic-101 slice.
+This rspec will reserve the OpenFlow resources at GT
+used by the plastic-101 slice.
 
-AM: https://expedient.oflow.cip.gatech.edu:1443/openflow/gapi/ 
+AM: https://foam.oflow.cip.gatech.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 101 at GT."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-101@gt" description="Plastic Slices slice 101 at GT"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33101" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33101" name="naxos-33101" description="The FlowVisor on naxos, for plastic-101." expiry="1313380800"/>
+    <openflow:group name="gatech-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+datapath+06:d6:00:19:bb:b3:0d:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+authority+am">
+	<openflow:port num="3"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:3"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.101.0" to="10.42.101.255"/>
+      <openflow:use-group name="gatech-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.101.0/24"/>
+	<openflow:nw_src value="10.42.101.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:3"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.101.0" to="10.42.101.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-indiana-plastic-101.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-indiana-plastic-101.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-indiana-plastic-101.rspec	(revision 1201)
@@ -1,39 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Indiana used by the
-plastic-101 slice.
+This rspec will reserve the OpenFlow resources at Indiana
+used by the plastic-101 slice.
 
-AM: https://optin.testlab.grnoc.iu.edu:1443/openflow/gapi/
+AM: https://foam.noc.iu.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 101 at Indiana."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-101@indiana" description="Plastic Slices slice 101 at Indiana"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33101" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33101" name="naxos-33101" description="The FlowVisor on naxos, for plastic-101." expiry="1313380800"/>
+    <openflow:group name="indiana-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+datapath+06:d6:00:16:b9:cf:fc:40"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+authority+am">
+	<openflow:port num="3"/>
+	<openflow:port num="8"/>
+	<openflow:port num="9"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:3"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+      <openflow:use-group name="indiana-1750-nlr-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.101.0" to="10.42.101.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.101.0/24"/>
+	<openflow:nw_src value="10.42.101.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:3"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.101.0" to="10.42.101.255"/>
-
-  </flowspace>
-
-</resv_rspec>
-
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-internet2-plastic-101.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-internet2-plastic-101.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-internet2-plastic-101.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Internet2 used by the
-plastic-101 slice.
+This rspec will reserve the OpenFlow resources at Internet2
+used by the plastic-101 slice.
 
-AM: https://ofc-vm1.net.internet2.edu:1443/openflow/gapi/
+AM: https://foam.net.internet2.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 101 at Internet2."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-101@internet2" description="Plastic Slices slice 101 at Internet2"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33101" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33101" name="naxos-33101" description="The FlowVisor on naxos, for plastic-101." expiry="1313380800"/>
+    <openflow:group name="i2-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:18:1b" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:18:58" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:19:96" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:1a:57" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:1b:93" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1b:93"/>
+      <openflow:use-group name="i2-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.101.0" to="10.42.101.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.101.0/24"/>
+	<openflow:nw_src value="10.42.101.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1b:93"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.101.0" to="10.42.101.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-nlr-plastic-101.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-nlr-plastic-101.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-nlr-plastic-101.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at NLR used by the
-plastic-101 slice.
+This rspec will reserve the OpenFlow resources at NLR
+used by the plastic-101 slice.
 
-AM: https://expedient.nlr.net:1443/openflow/gapi/
+AM: https://foam.nlr.net:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 101 at NLR."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-101@nlr" description="Plastic Slices slice 101 at NLR"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33101" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33101" name="naxos-33101" description="The FlowVisor on naxos, for plastic-101." expiry="1313380800"/>
+    <openflow:group name="nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:23:47:c8:bc:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:23:47:ca:bc:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:24:a8:d2:48:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:24:a8:d2:b8:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:26:f1:40:a8:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+    </openflow:group>
 
-  <flowspace>
- 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:26:f1:40:a8:00"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.101.0" to="10.42.101.255"/>
+      <openflow:use-group name="nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.101.0/24"/>
+	<openflow:nw_src value="10.42.101.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:26:f1:40:a8:00"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.101.0" to="10.42.101.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-rutgers-plastic-101.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-rutgers-plastic-101.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-rutgers-plastic-101.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Rutgers used by the
-plastic-101 slice.
+This rspec will reserve the OpenFlow resources at Rutgers
+used by the plastic-101 slice.
 
-AM: https://nox.orbit-lab.org:1443/openflow/gapi/
+AM: https://nox.orbit-lab.org:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 101 at Rutgers."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-101@rutgers" description="Plastic Slices slice 101 at Rutgers"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33101" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33101" name="naxos-33101" description="The FlowVisor on naxos, for plastic-101." expiry="1313380800"/>
+    <openflow:group name="rutgers-1750-i2-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+datapath+00:00:00:10:10:17:50:01"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+authority+am">
+	<openflow:port num="3"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:1"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
+      <openflow:use-group name="rutgers-1750-i2-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.101.0" to="10.42.101.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.101.0/24"/>
+	<openflow:nw_src value="10.42.101.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:1"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.101.0" to="10.42.101.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-stanford-plastic-101.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-stanford-plastic-101.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-stanford-plastic-101.rspec	(revision 1201)
@@ -1,60 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Stanford used by the
-plastic-101 slice.
+This rspec will reserve the OpenFlow resources at Stanford
+used by the plastic-101 slice.
 
-AM: https://endpoint.stanford.edu:1443/openflow/gapi/
+AM: https://openflow4.stanford.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 101 at Stanford."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-101@stanford" description="Plastic Slices slice 101 at Stanford"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33101" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33101" name="naxos-33101" description="The FlowVisor on naxos, for plastic-101." expiry="1313380800"/>
+    <openflow:group name="stanford-plnodes-901">
 
-  <flowspace>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+03:85:00:23:47:4e:2e:c0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- hpsw4-901 -->
+        <openflow:port num="4"/>  <!-- of-planet1 -->
+        <openflow:port num="8"/>  <!-- to necsw2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:11"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:67:65"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw-901 -->
+        <openflow:port num="1"/>  <!-- to necsw2 -->
+        <openflow:port num="2"/>  <!-- to necsw7 -->
+        <openflow:port num="4"/>  <!-- of-planet2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:b8:f3:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw7-901 -->
+        <openflow:port num="3"/>   <!-- to necsw -->
+        <openflow:port num="27"/>  <!-- of-planet3 -->
+        <openflow:port num="28"/>  <!-- of-planet4 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
+    <openflow:group name="stanford-901-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:31:f5"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw2-901 -->
+        <openflow:port num="1"/>   <!-- to necsw -->
+        <openflow:port num="2"/>   <!-- to hpsw4 -->
+        <openflow:port num="11"/>  <!-- to NLR 3715 -->
+      </openflow:datapath>
+    </openflow:group>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.101.0" to="10.42.101.255"/>
+    <openflow:match>
 
-  </flowspace>
+      <openflow:use-group name="stanford-plnodes-901" />
+      <openflow:use-group name="stanford-901-nlr-3715" />
 
-  <flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.101.0/24"/>
+        <openflow:nw_src value="10.42.101.0/24"/>
+      </openflow:packet>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:11"/>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
-
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.101.0" to="10.42.101.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-washington-plastic-101.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-washington-plastic-101.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-washington-plastic-101.rspec	(revision 1201)
@@ -1,37 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Washington used by the
-plastic-101 slice.
+This rspec will reserve the OpenFlow resources at Washington
+used by the plastic-101 slice.
 
-AM: https://of.cs.washington.edu:1443/openflow/gapi/
+AM: https://of.cs.washington.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 101 at Washington."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-101@washington" description="Plastic Slices slice 101 at Washington"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33101" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33101" name="naxos-33101" description="The FlowVisor on naxos, for plastic-101." expiry="1313380800"/>
+    <openflow:group name="washington-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+datapath+06:d6:00:23:47:c8:8c:40"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+authority+am">
+        <openflow:port num="22"/>
+        <openflow:port num="23"/>
+        <openflow:port num="24"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:22"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.101.0" to="10.42.101.255"/>
+      <openflow:use-group name="washington-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.101.0/24"/>
+        <openflow:nw_src value="10.42.101.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
-     <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:22"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.101.0" to="10.42.101.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-wisconsin-plastic-101.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-wisconsin-plastic-101.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-101/openflow-wisconsin-plastic-101.rspec	(revision 1201)
@@ -1,44 +1,55 @@
-<!--
-This rspec will reserve the OpenFlow resources at Wisconsin used by the
-plastic-101 slice.
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+This rspec will reserve the OpenFlow resources at Wisconsin
+used by the plastic-101 slice.
 
-AM: https://wings-openflow-1.wail.wisc.edu:1443/openflow/gapi/
+AM: https://foam.wail.wisc.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 101 at Wisconsin."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-101@wisconsin" description="Plastic Slices slice 101 at Wisconsin"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33101" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33101" name="naxos-33101" description="The FlowVisor on naxos, for plastic-101." expiry="1313380800"/>
+    <openflow:group name="wisconsin-plnodes-1750">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:23:47:cc:44:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="1"/>
+        <openflow:port num="20"/>
+        <openflow:port num="22"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:group name="wisconsin-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:21:f7:be:8d:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="3"/>
+        <openflow:port num="51"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:51"/>
+      <openflow:use-group name="wisconsin-plnodes-1750" />
+      <openflow:use-group name="wisconsin-1750-nlr-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.101.0" to="10.42.101.255"/>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.101.0/24"/>
+        <openflow:nw_src value="10.42.101.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
-
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:51"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.101.0" to="10.42.101.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-bbn-plastic-102.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-bbn-plastic-102.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-bbn-plastic-102.rspec	(revision 1201)
@@ -1,50 +1,55 @@
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 This rspec will reserve the OpenFlow resources at BBN used by the
 plastic-102 slice.
 
-AM: https://expedient.gpolab.bbn.com:1443/openflow/gapi/
+AM: https://foam.gpolab.bbn.com:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="plastic-102 OpenFlow resources at BBN."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-102@bbn" description="Plastic Slices slice 102 at BBN"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33102" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33102" name="naxos-33102" description="The FlowVisor on naxos, for plastic-102."/>
+    <openflow:group name="habanero-1750-nlr-plnodes">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:24:a8:c4:b9:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+	<openflow:port num="55"/>
+	<openflow:port num="56"/>
+	<openflow:port num="71"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+    <openflow:group name="poblano-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:12:e2:b8:a5:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+        <openflow:port num="5"/>
+        <openflow:port num="20"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:5"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.102.0" to="10.42.102.255"/>
+      <openflow:use-group name="habanero-1750-nlr-plnodes" />
+      <openflow:use-group name="poblano-1750-nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.102.0/24"/>
+        <openflow:nw_src value="10.42.102.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:5"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.102.0" to="10.42.102.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-clemson-plastic-102.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-clemson-plastic-102.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-clemson-plastic-102.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Clemson used by the
-plastic-102 slice.
+This rspec will reserve the OpenFlow resources at Clemson
+used by the plastic-102 slice.
 
-AM: https://expedient.clemson.edu:1443/openflow/gapi/
+AM: https://foam.clemson.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 102 at Clemson."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-102@clemson" description="Plastic Slices slice 102 at Clemson"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33102" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33102" name="naxos-33102" description="The FlowVisor on naxos, for plastic-102." expiry="1313380800"/>
+    <openflow:group name="clemson-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam+datapath+06:d6:00:26:f1:3f:e4:80"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam+authority+am">
+	<openflow:port num="36"/>
+	<openflow:port num="39"/>
+	<openflow:port num="41"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:41"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.102.0" to="10.42.102.255"/>
+      <openflow:use-group name="clemson-1750-nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.102.0/24"/>
+	<openflow:nw_src value="10.42.102.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:41"/>
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.102.0" to="10.42.102.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-gatech-plastic-102.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-gatech-plastic-102.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-gatech-plastic-102.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at GT used by the
-plastic-102 slice.
+This rspec will reserve the OpenFlow resources at GT
+used by the plastic-102 slice.
 
-AM: https://expedient.oflow.cip.gatech.edu:1443/openflow/gapi/ 
+AM: https://foam.oflow.cip.gatech.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 102 at GT."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-102@gt" description="Plastic Slices slice 102 at GT"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33102" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33102" name="naxos-33102" description="The FlowVisor on naxos, for plastic-102." expiry="1313380800"/>
+    <openflow:group name="gatech-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+datapath+06:d6:00:19:bb:b3:0d:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:5"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.102.0" to="10.42.102.255"/>
+      <openflow:use-group name="gatech-1750-nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.102.0/24"/>
+	<openflow:nw_src value="10.42.102.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:5"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.102.0" to="10.42.102.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-indiana-plastic-102.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-indiana-plastic-102.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-indiana-plastic-102.rspec	(revision 1201)
@@ -1,39 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Indiana used by the
-plastic-102 slice.
+This rspec will reserve the OpenFlow resources at Indiana
+used by the plastic-102 slice.
 
-AM: https://optin.testlab.grnoc.iu.edu:1443/openflow/gapi/
+AM: https://foam.noc.iu.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 102 at Indiana."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-102@indiana" description="Plastic Slices slice 102 at Indiana"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33102" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33102" name="naxos-33102" description="The FlowVisor on naxos, for plastic-102." expiry="1313380800"/>
+    <openflow:group name="indiana-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+datapath+06:d6:00:16:b9:cf:fc:40"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="8"/>
+	<openflow:port num="9"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:5"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+      <openflow:use-group name="indiana-1750-nlr-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.102.0" to="10.42.102.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.102.0/24"/>
+	<openflow:nw_src value="10.42.102.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:5"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.102.0" to="10.42.102.255"/>
-
-  </flowspace>
-
-</resv_rspec>
-
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-internet2-plastic-102.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-internet2-plastic-102.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-internet2-plastic-102.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Internet2 used by the
-plastic-102 slice.
+This rspec will reserve the OpenFlow resources at Internet2
+used by the plastic-102 slice.
 
-AM: https://ofc-vm1.net.internet2.edu:1443/openflow/gapi/
+AM: https://foam.net.internet2.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 102 at Internet2."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-102@internet2" description="Plastic Slices slice 102 at Internet2"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33102" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33102" name="naxos-33102" description="The FlowVisor on naxos, for plastic-102." expiry="1313380800"/>
+    <openflow:group name="i2-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:18:1b" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:18:1b" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:18:58" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:18:58" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:19:96" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:19:96" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:1a:57" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:1a:57" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:1b:93" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:1b:93" />
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1b:93"/>
+      <openflow:use-group name="i2-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.102.0" to="10.42.102.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.102.0/24"/>
+	<openflow:nw_src value="10.42.102.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1b:93"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.102.0" to="10.42.102.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-nlr-plastic-102.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-nlr-plastic-102.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-nlr-plastic-102.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at NLR used by the
-plastic-102 slice.
+This rspec will reserve the OpenFlow resources at NLR
+used by the plastic-102 slice.
 
-AM: https://expedient.nlr.net:1443/openflow/gapi/
+AM: https://foam.nlr.net:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 102 at NLR."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-102@nlr" description="Plastic Slices slice 102 at NLR"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33102" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33102" name="naxos-33102" description="The FlowVisor on naxos, for plastic-102." expiry="1313380800"/>
+    <openflow:group name="nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:23:47:c8:bc:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:23:47:ca:bc:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:24:a8:d2:48:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:24:a8:d2:b8:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:26:f1:40:a8:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+    </openflow:group>
 
-  <flowspace>
- 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:26:f1:40:a8:00"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.102.0" to="10.42.102.255"/>
+      <openflow:use-group name="nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.102.0/24"/>
+	<openflow:nw_src value="10.42.102.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:26:f1:40:a8:00"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.102.0" to="10.42.102.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-rutgers-plastic-102.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-rutgers-plastic-102.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-rutgers-plastic-102.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Rutgers used by the
-plastic-102 slice.
+This rspec will reserve the OpenFlow resources at Rutgers
+used by the plastic-102 slice.
 
-AM: https://nox.orbit-lab.org:1443/openflow/gapi/
+AM: https://nox.orbit-lab.org:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 102 at Rutgers."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-102@rutgers" description="Plastic Slices slice 102 at Rutgers"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33102" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33102" name="naxos-33102" description="The FlowVisor on naxos, for plastic-102." expiry="1313380800"/>
+    <openflow:group name="rutgers-1750-i2-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+datapath+00:00:00:10:10:17:50:01"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:2"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
+      <openflow:use-group name="rutgers-1750-i2-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.102.0" to="10.42.102.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.102.0/24"/>
+	<openflow:nw_src value="10.42.102.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:2"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.102.0" to="10.42.102.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-stanford-plastic-102.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-stanford-plastic-102.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-stanford-plastic-102.rspec	(revision 1201)
@@ -1,60 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Stanford used by the
-plastic-102 slice.
+This rspec will reserve the OpenFlow resources at Stanford
+used by the plastic-102 slice.
 
-AM: https://endpoint.stanford.edu:1443/openflow/gapi/
+AM: https://openflow4.stanford.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 102 at Stanford."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-102@stanford" description="Plastic Slices slice 102 at Stanford"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33102" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33102" name="naxos-33102" description="The FlowVisor on naxos, for plastic-102." expiry="1313380800"/>
+    <openflow:group name="stanford-plnodes-901">
 
-  <flowspace>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+03:85:00:23:47:4e:2e:c0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- hpsw4-901 -->
+        <openflow:port num="4"/>  <!-- of-planet1 -->
+        <openflow:port num="8"/>  <!-- to necsw2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:10"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:67:65"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw-901 -->
+        <openflow:port num="1"/>  <!-- to necsw2 -->
+        <openflow:port num="2"/>  <!-- to necsw7 -->
+        <openflow:port num="4"/>  <!-- of-planet2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:b8:f3:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw7-901 -->
+        <openflow:port num="3"/>   <!-- to necsw -->
+        <openflow:port num="27"/>  <!-- of-planet3 -->
+        <openflow:port num="28"/>  <!-- of-planet4 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
+    <openflow:group name="stanford-901-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:31:f5"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw2-901 -->
+        <openflow:port num="1"/>   <!-- to necsw -->
+        <openflow:port num="2"/>   <!-- to hpsw4 -->
+        <openflow:port num="10"/>  <!-- to NLR 3716 -->
+      </openflow:datapath>
+    </openflow:group>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.102.0" to="10.42.102.255"/>
+    <openflow:match>
 
-  </flowspace>
+      <openflow:use-group name="stanford-plnodes-901" />
+      <openflow:use-group name="stanford-901-nlr-3716" />
 
-  <flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.102.0/24"/>
+        <openflow:nw_src value="10.42.102.0/24"/>
+      </openflow:packet>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:10"/>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
-
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.102.0" to="10.42.102.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-washington-plastic-102.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-washington-plastic-102.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-washington-plastic-102.rspec	(revision 1201)
@@ -1,37 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Washington used by the
-plastic-102 slice.
+This rspec will reserve the OpenFlow resources at Washington
+used by the plastic-102 slice.
 
-AM: https://of.cs.washington.edu:1443/openflow/gapi/
+AM: https://of.cs.washington.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 102 at Washington."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-102@washington" description="Plastic Slices slice 102 at Washington"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33102" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33102" name="naxos-33102" description="The FlowVisor on naxos, for plastic-102." expiry="1313380800"/>
+    <openflow:group name="washington-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+datapath+06:d6:00:23:47:c8:8c:40"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+authority+am">
+        <openflow:port num="20"/>
+        <openflow:port num="23"/>
+        <openflow:port num="24"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:20"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.102.0" to="10.42.102.255"/>
+      <openflow:use-group name="washington-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.102.0/24"/>
+        <openflow:nw_src value="10.42.102.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
-     <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:20"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.102.0" to="10.42.102.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-wisconsin-plastic-102.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-wisconsin-plastic-102.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-102/openflow-wisconsin-plastic-102.rspec	(revision 1201)
@@ -1,44 +1,55 @@
-<!--
-This rspec will reserve the OpenFlow resources at Wisconsin used by the
-plastic-102 slice.
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+This rspec will reserve the OpenFlow resources at Wisconsin
+used by the plastic-102 slice.
 
-AM: https://wings-openflow-1.wail.wisc.edu:1443/openflow/gapi/
+AM: https://foam.wail.wisc.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 102 at Wisconsin."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-102@wisconsin" description="Plastic Slices slice 102 at Wisconsin"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33102" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33102" name="naxos-33102" description="The FlowVisor on naxos, for plastic-102." expiry="1313380800"/>
+    <openflow:group name="wisconsin-plnodes-1750">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:23:47:cc:44:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="1"/>
+        <openflow:port num="20"/>
+        <openflow:port num="22"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:group name="wisconsin-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:21:f7:be:8d:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="3"/>
+        <openflow:port num="53"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:53"/>
+      <openflow:use-group name="wisconsin-plnodes-1750" />
+      <openflow:use-group name="wisconsin-1750-nlr-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.102.0" to="10.42.102.255"/>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.102.0/24"/>
+        <openflow:nw_src value="10.42.102.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
-
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:53"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.102.0" to="10.42.102.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-bbn-plastic-103.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-bbn-plastic-103.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-bbn-plastic-103.rspec	(revision 1201)
@@ -1,50 +1,56 @@
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 This rspec will reserve the OpenFlow resources at BBN used by the
 plastic-103 slice.
 
-AM: https://expedient.gpolab.bbn.com:1443/openflow/gapi/
+AM: https://foam.gpolab.bbn.com:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="plastic-103 OpenFlow resources at BBN."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-103@bbn" description="Plastic Slices slice 103 at BBN"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33103" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33103" name="naxos-33103" description="The FlowVisor on naxos, for plastic-103."/>
+    <openflow:group name="habanero-1750-i2-plnodes">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:24:a8:c4:b9:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+	<openflow:port num="49"/>
+	<openflow:port num="50"/>
+	<openflow:port num="51"/>
+	<openflow:port num="71"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+    <openflow:group name="poblano-1750-i2-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:12:e2:b8:a5:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+        <openflow:port num="9"/>
+        <openflow:port num="20"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:9"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.103.0" to="10.42.103.255"/>
+      <openflow:use-group name="habanero-1750-i2-plnodes" />
+      <openflow:use-group name="poblano-1750-i2-3715" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.103.0/24"/>
+        <openflow:nw_src value="10.42.103.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:9"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.103.0" to="10.42.103.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-internet2-plastic-103.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-internet2-plastic-103.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-internet2-plastic-103.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Internet2 used by the
-plastic-103 slice.
+This rspec will reserve the OpenFlow resources at Internet2
+used by the plastic-103 slice.
 
-AM: https://ofc-vm1.net.internet2.edu:1443/openflow/gapi/
+AM: https://foam.net.internet2.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 103 at Internet2."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-103@internet2" description="Plastic Slices slice 103 at Internet2"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33103" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33103" name="naxos-33103" description="The FlowVisor on naxos, for plastic-103." expiry="1313380800"/>
+    <openflow:group name="i2-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:18:1b" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:18:58" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:19:96" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:1a:57" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:1b:93" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1b:93"/>
+      <openflow:use-group name="i2-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.103.0" to="10.42.103.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.103.0/24"/>
+	<openflow:nw_src value="10.42.103.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1b:93"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.103.0" to="10.42.103.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-nlr-plastic-103.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-nlr-plastic-103.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-nlr-plastic-103.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at NLR used by the
-plastic-103 slice.
+This rspec will reserve the OpenFlow resources at NLR
+used by the plastic-103 slice.
 
-AM: https://expedient.nlr.net:1443/openflow/gapi/
+AM: https://foam.nlr.net:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 103 at NLR."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-103@nlr" description="Plastic Slices slice 103 at NLR"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33103" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33103" name="naxos-33103" description="The FlowVisor on naxos, for plastic-103." expiry="1313380800"/>
+    <openflow:group name="nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:23:47:c8:bc:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:23:47:ca:bc:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:24:a8:d2:48:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:24:a8:d2:b8:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:26:f1:40:a8:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+    </openflow:group>
 
-  <flowspace>
- 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:26:f1:40:a8:00"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.103.0" to="10.42.103.255"/>
+      <openflow:use-group name="nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.103.0/24"/>
+	<openflow:nw_src value="10.42.103.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:26:f1:40:a8:00"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.103.0" to="10.42.103.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-rutgers-plastic-103.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-rutgers-plastic-103.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-rutgers-plastic-103.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Rutgers used by the
-plastic-103 slice.
+This rspec will reserve the OpenFlow resources at Rutgers
+used by the plastic-103 slice.
 
-AM: https://nox.orbit-lab.org:1443/openflow/gapi/
+AM: https://nox.orbit-lab.org:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 103 at Rutgers."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-103@rutgers" description="Plastic Slices slice 103 at Rutgers"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33103" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33103" name="naxos-33103" description="The FlowVisor on naxos, for plastic-103." expiry="1313380800"/>
+    <openflow:group name="rutgers-1750-i2-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+datapath+00:00:00:10:10:17:50:01"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+authority+am">
+	<openflow:port num="3"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:1"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
+      <openflow:use-group name="rutgers-1750-i2-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.103.0" to="10.42.103.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.103.0/24"/>
+	<openflow:nw_src value="10.42.103.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:1"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.103.0" to="10.42.103.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-stanford-plastic-103.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-stanford-plastic-103.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-stanford-plastic-103.rspec	(revision 1201)
@@ -1,60 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Stanford used by the
-plastic-103 slice.
+This rspec will reserve the OpenFlow resources at Stanford
+used by the plastic-103 slice.
 
-AM: https://endpoint.stanford.edu:1443/openflow/gapi/
+AM: https://openflow4.stanford.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 103 at Stanford."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-103@stanford" description="Plastic Slices slice 103 at Stanford"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33103" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33103" name="naxos-33103" description="The FlowVisor on naxos, for plastic-103." expiry="1313380800"/>
+    <openflow:group name="stanford-plnodes-901">
 
-  <flowspace>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+03:85:00:23:47:4e:2e:c0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- hpsw4-901 -->
+        <openflow:port num="4"/>  <!-- of-planet1 -->
+        <openflow:port num="8"/>  <!-- to necsw2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:11"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:67:65"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw-901 -->
+        <openflow:port num="1"/>  <!-- to necsw2 -->
+        <openflow:port num="2"/>  <!-- to necsw7 -->
+        <openflow:port num="4"/>  <!-- of-planet2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:b8:f3:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw7-901 -->
+        <openflow:port num="3"/>   <!-- to necsw -->
+        <openflow:port num="27"/>  <!-- of-planet3 -->
+        <openflow:port num="28"/>  <!-- of-planet4 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
+    <openflow:group name="stanford-901-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:31:f5"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw2-901 -->
+        <openflow:port num="1"/>   <!-- to necsw -->
+        <openflow:port num="2"/>   <!-- to hpsw4 -->
+        <openflow:port num="11"/>  <!-- to NLR 3715 -->
+      </openflow:datapath>
+    </openflow:group>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.103.0" to="10.42.103.255"/>
+    <openflow:match>
 
-  </flowspace>
+      <openflow:use-group name="stanford-plnodes-901" />
+      <openflow:use-group name="stanford-901-nlr-3715" />
 
-  <flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.103.0/24"/>
+        <openflow:nw_src value="10.42.103.0/24"/>
+      </openflow:packet>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:11"/>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
-
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.103.0" to="10.42.103.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-washington-plastic-103.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-washington-plastic-103.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-103/openflow-washington-plastic-103.rspec	(revision 1201)
@@ -1,37 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Washington used by the
-plastic-103 slice.
+This rspec will reserve the OpenFlow resources at Washington
+used by the plastic-103 slice.
 
-AM: https://of.cs.washington.edu:1443/openflow/gapi/
+AM: https://of.cs.washington.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 103 at Washington."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-103@washington" description="Plastic Slices slice 103 at Washington"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33103" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33103" name="naxos-33103" description="The FlowVisor on naxos, for plastic-103." expiry="1313380800"/>
+    <openflow:group name="washington-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+datapath+06:d6:00:23:47:c8:8c:40"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+authority+am">
+        <openflow:port num="22"/>
+        <openflow:port num="23"/>
+        <openflow:port num="24"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:22"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.103.0" to="10.42.103.255"/>
+      <openflow:use-group name="washington-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.103.0/24"/>
+        <openflow:nw_src value="10.42.103.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
-     <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:22"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.103.0" to="10.42.103.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-bbn-plastic-104.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-bbn-plastic-104.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-bbn-plastic-104.rspec	(revision 1201)
@@ -1,50 +1,56 @@
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 This rspec will reserve the OpenFlow resources at BBN used by the
 plastic-104 slice.
 
-AM: https://expedient.gpolab.bbn.com:1443/openflow/gapi/
+AM: https://foam.gpolab.bbn.com:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="plastic-104 OpenFlow resources at BBN."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-104@bbn" description="Plastic Slices slice 104 at BBN"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33104" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33104" name="naxos-33104" description="The FlowVisor on naxos, for plastic-104."/>
+    <openflow:group name="habanero-1750-i2-plnodes">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:24:a8:c4:b9:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+	<openflow:port num="49"/>
+	<openflow:port num="50"/>
+	<openflow:port num="51"/>
+	<openflow:port num="71"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+    <openflow:group name="poblano-1750-i2-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:12:e2:b8:a5:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+        <openflow:port num="11"/>
+        <openflow:port num="20"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:11"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.104.0" to="10.42.104.255"/>
+      <openflow:use-group name="habanero-1750-i2-plnodes" />
+      <openflow:use-group name="poblano-1750-i2-3716" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.104.0/24"/>
+        <openflow:nw_src value="10.42.104.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:11"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.104.0" to="10.42.104.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-indiana-plastic-104.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-indiana-plastic-104.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-indiana-plastic-104.rspec	(revision 1201)
@@ -1,39 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Indiana used by the
-plastic-104 slice.
+This rspec will reserve the OpenFlow resources at Indiana
+used by the plastic-104 slice.
 
-AM: https://optin.testlab.grnoc.iu.edu:1443/openflow/gapi/
+AM: https://foam.noc.iu.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 104 at Indiana."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-104@indiana" description="Plastic Slices slice 104 at Indiana"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33104" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33104" name="naxos-33104" description="The FlowVisor on naxos, for plastic-104." expiry="1313380800"/>
+    <openflow:group name="indiana-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+datapath+06:d6:00:16:b9:cf:fc:40"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="8"/>
+	<openflow:port num="9"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:5"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+      <openflow:use-group name="indiana-1750-nlr-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.104.0" to="10.42.104.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.104.0/24"/>
+	<openflow:nw_src value="10.42.104.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:5"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.104.0" to="10.42.104.255"/>
-
-  </flowspace>
-
-</resv_rspec>
-
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-internet2-plastic-104.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-internet2-plastic-104.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-internet2-plastic-104.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Internet2 used by the
-plastic-104 slice.
+This rspec will reserve the OpenFlow resources at Internet2
+used by the plastic-104 slice.
 
-AM: https://ofc-vm1.net.internet2.edu:1443/openflow/gapi/
+AM: https://foam.net.internet2.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 104 at Internet2."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-104@internet2" description="Plastic Slices slice 104 at Internet2"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33104" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33104" name="naxos-33104" description="The FlowVisor on naxos, for plastic-104." expiry="1313380800"/>
+    <openflow:group name="i2-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:18:1b" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:18:1b" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:18:58" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:18:58" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:19:96" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:19:96" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:1a:57" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:1a:57" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:1b:93" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:1b:93" />
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1b:93"/>
+      <openflow:use-group name="i2-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.104.0" to="10.42.104.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.104.0/24"/>
+	<openflow:nw_src value="10.42.104.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1b:93"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.104.0" to="10.42.104.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-nlr-plastic-104.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-nlr-plastic-104.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-nlr-plastic-104.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at NLR used by the
-plastic-104 slice.
+This rspec will reserve the OpenFlow resources at NLR
+used by the plastic-104 slice.
 
-AM: https://expedient.nlr.net:1443/openflow/gapi/
+AM: https://foam.nlr.net:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 104 at NLR."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-104@nlr" description="Plastic Slices slice 104 at NLR"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33104" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33104" name="naxos-33104" description="The FlowVisor on naxos, for plastic-104." expiry="1313380800"/>
+    <openflow:group name="nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:23:47:c8:bc:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:23:47:ca:bc:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:24:a8:d2:48:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:24:a8:d2:b8:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:26:f1:40:a8:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+    </openflow:group>
 
-  <flowspace>
- 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:26:f1:40:a8:00"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.104.0" to="10.42.104.255"/>
+      <openflow:use-group name="nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.104.0/24"/>
+	<openflow:nw_src value="10.42.104.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:26:f1:40:a8:00"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.104.0" to="10.42.104.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-rutgers-plastic-104.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-rutgers-plastic-104.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-rutgers-plastic-104.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Rutgers used by the
-plastic-104 slice.
+This rspec will reserve the OpenFlow resources at Rutgers
+used by the plastic-104 slice.
 
-AM: https://nox.orbit-lab.org:1443/openflow/gapi/
+AM: https://nox.orbit-lab.org:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 104 at Rutgers."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-104@rutgers" description="Plastic Slices slice 104 at Rutgers"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33104" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33104" name="naxos-33104" description="The FlowVisor on naxos, for plastic-104." expiry="1313380800"/>
+    <openflow:group name="rutgers-1750-i2-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+datapath+00:00:00:10:10:17:50:01"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:2"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
+      <openflow:use-group name="rutgers-1750-i2-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.104.0" to="10.42.104.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.104.0/24"/>
+	<openflow:nw_src value="10.42.104.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:2"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.104.0" to="10.42.104.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-wisconsin-plastic-104.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-wisconsin-plastic-104.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-104/openflow-wisconsin-plastic-104.rspec	(revision 1201)
@@ -1,44 +1,55 @@
-<!--
-This rspec will reserve the OpenFlow resources at Wisconsin used by the
-plastic-104 slice.
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+This rspec will reserve the OpenFlow resources at Wisconsin
+used by the plastic-104 slice.
 
-AM: https://wings-openflow-1.wail.wisc.edu:1443/openflow/gapi/
+AM: https://foam.wail.wisc.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 104 at Wisconsin."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-104@wisconsin" description="Plastic Slices slice 104 at Wisconsin"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33104" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33104" name="naxos-33104" description="The FlowVisor on naxos, for plastic-104." expiry="1313380800"/>
+    <openflow:group name="wisconsin-plnodes-1750">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:23:47:cc:44:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="1"/>
+        <openflow:port num="20"/>
+        <openflow:port num="22"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:group name="wisconsin-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:21:f7:be:8d:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="3"/>
+        <openflow:port num="53"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:53"/>
+      <openflow:use-group name="wisconsin-plnodes-1750" />
+      <openflow:use-group name="wisconsin-1750-nlr-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.104.0" to="10.42.104.255"/>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.104.0/24"/>
+        <openflow:nw_src value="10.42.104.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
-
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:53"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.104.0" to="10.42.104.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-bbn-plastic-105.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-bbn-plastic-105.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-bbn-plastic-105.rspec	(revision 1201)
@@ -1,50 +1,55 @@
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 This rspec will reserve the OpenFlow resources at BBN used by the
 plastic-105 slice.
 
-AM: https://expedient.gpolab.bbn.com:1443/openflow/gapi/
+AM: https://foam.gpolab.bbn.com:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="plastic-105 OpenFlow resources at BBN."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-105@bbn" description="Plastic Slices slice 105 at BBN"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33105" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33105" name="naxos-33105" description="The FlowVisor on naxos, for plastic-105."/>
+    <openflow:group name="habanero-1750-nlr-plnodes">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:24:a8:c4:b9:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+	<openflow:port num="55"/>
+	<openflow:port num="56"/>
+	<openflow:port num="71"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+    <openflow:group name="poblano-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:12:e2:b8:a5:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+        <openflow:port num="3"/>
+        <openflow:port num="20"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:3"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.105.0" to="10.42.105.255"/>
+      <openflow:use-group name="habanero-1750-nlr-plnodes" />
+      <openflow:use-group name="poblano-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.105.0/24"/>
+        <openflow:nw_src value="10.42.105.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:3"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.105.0" to="10.42.105.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-clemson-plastic-105.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-clemson-plastic-105.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-clemson-plastic-105.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Clemson used by the
-plastic-105 slice.
+This rspec will reserve the OpenFlow resources at Clemson
+used by the plastic-105 slice.
 
-AM: https://expedient.clemson.edu:1443/openflow/gapi/
+AM: https://foam.clemson.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 105 at Clemson."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-105@clemson" description="Plastic Slices slice 105 at Clemson"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33105" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33105" name="naxos-33105" description="The FlowVisor on naxos, for plastic-105." expiry="1313380800"/>
+    <openflow:group name="clemson-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam+datapath+06:d6:00:26:f1:3f:e4:80"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam+authority+am">
+	<openflow:port num="36"/>
+	<openflow:port num="39"/>
+	<openflow:port num="43"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:43"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.105.0" to="10.42.105.255"/>
+      <openflow:use-group name="clemson-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.105.0/24"/>
+	<openflow:nw_src value="10.42.105.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:43"/>
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.105.0" to="10.42.105.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-gatech-plastic-105.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-gatech-plastic-105.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-gatech-plastic-105.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at GT used by the
-plastic-105 slice.
+This rspec will reserve the OpenFlow resources at GT
+used by the plastic-105 slice.
 
-AM: https://expedient.oflow.cip.gatech.edu:1443/openflow/gapi/ 
+AM: https://foam.oflow.cip.gatech.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 105 at GT."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-105@gt" description="Plastic Slices slice 105 at GT"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33105" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33105" name="naxos-33105" description="The FlowVisor on naxos, for plastic-105." expiry="1313380800"/>
+    <openflow:group name="gatech-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+datapath+06:d6:00:19:bb:b3:0d:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+authority+am">
+	<openflow:port num="3"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:3"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.105.0" to="10.42.105.255"/>
+      <openflow:use-group name="gatech-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.105.0/24"/>
+	<openflow:nw_src value="10.42.105.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:3"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.105.0" to="10.42.105.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-internet2-plastic-105.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-internet2-plastic-105.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-internet2-plastic-105.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Internet2 used by the
-plastic-105 slice.
+This rspec will reserve the OpenFlow resources at Internet2
+used by the plastic-105 slice.
 
-AM: https://ofc-vm1.net.internet2.edu:1443/openflow/gapi/
+AM: https://foam.net.internet2.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 105 at Internet2."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-105@internet2" description="Plastic Slices slice 105 at Internet2"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33105" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33105" name="naxos-33105" description="The FlowVisor on naxos, for plastic-105." expiry="1313380800"/>
+    <openflow:group name="i2-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:18:1b" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:18:58" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:19:96" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:1a:57" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:1b:93" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1b:93"/>
+      <openflow:use-group name="i2-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.105.0" to="10.42.105.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.105.0/24"/>
+	<openflow:nw_src value="10.42.105.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1b:93"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.105.0" to="10.42.105.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-nlr-plastic-105.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-nlr-plastic-105.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-nlr-plastic-105.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at NLR used by the
-plastic-105 slice.
+This rspec will reserve the OpenFlow resources at NLR
+used by the plastic-105 slice.
 
-AM: https://expedient.nlr.net:1443/openflow/gapi/
+AM: https://foam.nlr.net:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 105 at NLR."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-105@nlr" description="Plastic Slices slice 105 at NLR"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33105" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33105" name="naxos-33105" description="The FlowVisor on naxos, for plastic-105." expiry="1313380800"/>
+    <openflow:group name="nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:23:47:c8:bc:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:23:47:ca:bc:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:24:a8:d2:48:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:24:a8:d2:b8:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:26:f1:40:a8:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+    </openflow:group>
 
-  <flowspace>
- 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:26:f1:40:a8:00"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.105.0" to="10.42.105.255"/>
+      <openflow:use-group name="nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.105.0/24"/>
+	<openflow:nw_src value="10.42.105.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:26:f1:40:a8:00"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.105.0" to="10.42.105.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-wisconsin-plastic-105.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-wisconsin-plastic-105.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-105/openflow-wisconsin-plastic-105.rspec	(revision 1201)
@@ -1,44 +1,55 @@
-<!--
-This rspec will reserve the OpenFlow resources at Wisconsin used by the
-plastic-105 slice.
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+This rspec will reserve the OpenFlow resources at Wisconsin
+used by the plastic-105 slice.
 
-AM: https://wings-openflow-1.wail.wisc.edu:1443/openflow/gapi/
+AM: https://foam.wail.wisc.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 105 at Wisconsin."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-105@wisconsin" description="Plastic Slices slice 105 at Wisconsin"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33105" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33105" name="naxos-33105" description="The FlowVisor on naxos, for plastic-105." expiry="1313380800"/>
+    <openflow:group name="wisconsin-plnodes-1750">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:23:47:cc:44:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="1"/>
+        <openflow:port num="20"/>
+        <openflow:port num="22"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:group name="wisconsin-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:21:f7:be:8d:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="3"/>
+        <openflow:port num="51"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:51"/>
+      <openflow:use-group name="wisconsin-plnodes-1750" />
+      <openflow:use-group name="wisconsin-1750-nlr-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.105.0" to="10.42.105.255"/>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.105.0/24"/>
+        <openflow:nw_src value="10.42.105.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
-
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:51"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.105.0" to="10.42.105.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-bbn-plastic-106.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-bbn-plastic-106.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-bbn-plastic-106.rspec	(revision 1201)
@@ -1,50 +1,55 @@
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 This rspec will reserve the OpenFlow resources at BBN used by the
 plastic-106 slice.
 
-AM: https://expedient.gpolab.bbn.com:1443/openflow/gapi/
+AM: https://foam.gpolab.bbn.com:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="plastic-106 OpenFlow resources at BBN."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-106@bbn" description="Plastic Slices slice 106 at BBN"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33106" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33106" name="naxos-33106" description="The FlowVisor on naxos, for plastic-106."/>
+    <openflow:group name="habanero-1750-nlr-plnodes">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:24:a8:c4:b9:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+	<openflow:port num="55"/>
+	<openflow:port num="56"/>
+	<openflow:port num="71"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+    <openflow:group name="poblano-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:12:e2:b8:a5:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+        <openflow:port num="5"/>
+        <openflow:port num="20"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:5"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.106.0" to="10.42.106.255"/>
+      <openflow:use-group name="habanero-1750-nlr-plnodes" />
+      <openflow:use-group name="poblano-1750-nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.106.0/24"/>
+        <openflow:nw_src value="10.42.106.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:5"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.106.0" to="10.42.106.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-clemson-plastic-106.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-clemson-plastic-106.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-clemson-plastic-106.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Clemson used by the
-plastic-106 slice.
+This rspec will reserve the OpenFlow resources at Clemson
+used by the plastic-106 slice.
 
-AM: https://expedient.clemson.edu:1443/openflow/gapi/
+AM: https://foam.clemson.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 106 at Clemson."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-106@clemson" description="Plastic Slices slice 106 at Clemson"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33106" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33106" name="naxos-33106" description="The FlowVisor on naxos, for plastic-106." expiry="1313380800"/>
+    <openflow:group name="clemson-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam+datapath+06:d6:00:26:f1:3f:e4:80"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam+authority+am">
+	<openflow:port num="36"/>
+	<openflow:port num="39"/>
+	<openflow:port num="41"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:41"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.106.0" to="10.42.106.255"/>
+      <openflow:use-group name="clemson-1750-nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.106.0/24"/>
+	<openflow:nw_src value="10.42.106.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:41"/>
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.106.0" to="10.42.106.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-gatech-plastic-106.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-gatech-plastic-106.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-gatech-plastic-106.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at GT used by the
-plastic-106 slice.
+This rspec will reserve the OpenFlow resources at GT
+used by the plastic-106 slice.
 
-AM: https://expedient.oflow.cip.gatech.edu:1443/openflow/gapi/ 
+AM: https://foam.oflow.cip.gatech.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 106 at GT."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-106@gt" description="Plastic Slices slice 106 at GT"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33106" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33106" name="naxos-33106" description="The FlowVisor on naxos, for plastic-106." expiry="1313380800"/>
+    <openflow:group name="gatech-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+datapath+06:d6:00:19:bb:b3:0d:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:5"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.106.0" to="10.42.106.255"/>
+      <openflow:use-group name="gatech-1750-nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.106.0/24"/>
+	<openflow:nw_src value="10.42.106.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:5"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.106.0" to="10.42.106.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-internet2-plastic-106.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-internet2-plastic-106.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-internet2-plastic-106.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Internet2 used by the
-plastic-106 slice.
+This rspec will reserve the OpenFlow resources at Internet2
+used by the plastic-106 slice.
 
-AM: https://ofc-vm1.net.internet2.edu:1443/openflow/gapi/
+AM: https://foam.net.internet2.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 106 at Internet2."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-106@internet2" description="Plastic Slices slice 106 at Internet2"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33106" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33106" name="naxos-33106" description="The FlowVisor on naxos, for plastic-106." expiry="1313380800"/>
+    <openflow:group name="i2-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:18:1b" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:18:1b" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:18:58" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:18:58" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:19:96" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:19:96" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:1a:57" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:1a:57" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:1b:93" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:1b:93" />
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1b:93"/>
+      <openflow:use-group name="i2-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.106.0" to="10.42.106.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.106.0/24"/>
+	<openflow:nw_src value="10.42.106.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1b:93"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.106.0" to="10.42.106.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-nlr-plastic-106.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-nlr-plastic-106.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-nlr-plastic-106.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at NLR used by the
-plastic-106 slice.
+This rspec will reserve the OpenFlow resources at NLR
+used by the plastic-106 slice.
 
-AM: https://expedient.nlr.net:1443/openflow/gapi/
+AM: https://foam.nlr.net:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 106 at NLR."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-106@nlr" description="Plastic Slices slice 106 at NLR"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33106" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33106" name="naxos-33106" description="The FlowVisor on naxos, for plastic-106." expiry="1313380800"/>
+    <openflow:group name="nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:23:47:c8:bc:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:23:47:ca:bc:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:24:a8:d2:48:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:24:a8:d2:b8:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:26:f1:40:a8:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+    </openflow:group>
 
-  <flowspace>
- 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:26:f1:40:a8:00"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.106.0" to="10.42.106.255"/>
+      <openflow:use-group name="nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.106.0/24"/>
+	<openflow:nw_src value="10.42.106.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:26:f1:40:a8:00"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.106.0" to="10.42.106.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-wisconsin-plastic-106.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-wisconsin-plastic-106.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-106/openflow-wisconsin-plastic-106.rspec	(revision 1201)
@@ -1,44 +1,55 @@
-<!--
-This rspec will reserve the OpenFlow resources at Wisconsin used by the
-plastic-106 slice.
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+This rspec will reserve the OpenFlow resources at Wisconsin
+used by the plastic-106 slice.
 
-AM: https://wings-openflow-1.wail.wisc.edu:1443/openflow/gapi/
+AM: https://foam.wail.wisc.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 106 at Wisconsin."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-106@wisconsin" description="Plastic Slices slice 106 at Wisconsin"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33106" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33106" name="naxos-33106" description="The FlowVisor on naxos, for plastic-106." expiry="1313380800"/>
+    <openflow:group name="wisconsin-plnodes-1750">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:23:47:cc:44:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="1"/>
+        <openflow:port num="20"/>
+        <openflow:port num="22"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:group name="wisconsin-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:21:f7:be:8d:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="3"/>
+        <openflow:port num="53"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:53"/>
+      <openflow:use-group name="wisconsin-plnodes-1750" />
+      <openflow:use-group name="wisconsin-1750-nlr-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.106.0" to="10.42.106.255"/>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.106.0/24"/>
+        <openflow:nw_src value="10.42.106.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
-
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:53"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.106.0" to="10.42.106.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-clemson-plastic-107.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-clemson-plastic-107.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-clemson-plastic-107.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Clemson used by the
-plastic-107 slice.
+This rspec will reserve the OpenFlow resources at Clemson
+used by the plastic-107 slice.
 
-AM: https://expedient.clemson.edu:1443/openflow/gapi/
+AM: https://foam.clemson.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 107 at Clemson."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-107@clemson" description="Plastic Slices slice 107 at Clemson"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33107" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33107" name="naxos-33107" description="The FlowVisor on naxos, for plastic-107." expiry="1313380800"/>
+    <openflow:group name="clemson-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam+datapath+06:d6:00:26:f1:3f:e4:80"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam+authority+am">
+	<openflow:port num="36"/>
+	<openflow:port num="39"/>
+	<openflow:port num="43"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:43"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.107.0" to="10.42.107.255"/>
+      <openflow:use-group name="clemson-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.107.0/24"/>
+	<openflow:nw_src value="10.42.107.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:43"/>
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.107.0" to="10.42.107.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-gatech-plastic-107.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-gatech-plastic-107.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-gatech-plastic-107.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at GT used by the
-plastic-107 slice.
+This rspec will reserve the OpenFlow resources at GT
+used by the plastic-107 slice.
 
-AM: https://expedient.oflow.cip.gatech.edu:1443/openflow/gapi/ 
+AM: https://foam.oflow.cip.gatech.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 107 at GT."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-107@gt" description="Plastic Slices slice 107 at GT"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33107" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33107" name="naxos-33107" description="The FlowVisor on naxos, for plastic-107." expiry="1313380800"/>
+    <openflow:group name="gatech-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+datapath+06:d6:00:19:bb:b3:0d:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+authority+am">
+	<openflow:port num="3"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:3"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.107.0" to="10.42.107.255"/>
+      <openflow:use-group name="gatech-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.107.0/24"/>
+	<openflow:nw_src value="10.42.107.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:3"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.107.0" to="10.42.107.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-indiana-plastic-107.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-indiana-plastic-107.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-indiana-plastic-107.rspec	(revision 1201)
@@ -1,39 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Indiana used by the
-plastic-107 slice.
+This rspec will reserve the OpenFlow resources at Indiana
+used by the plastic-107 slice.
 
-AM: https://optin.testlab.grnoc.iu.edu:1443/openflow/gapi/
+AM: https://foam.noc.iu.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 107 at Indiana."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-107@indiana" description="Plastic Slices slice 107 at Indiana"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33107" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33107" name="naxos-33107" description="The FlowVisor on naxos, for plastic-107." expiry="1313380800"/>
+    <openflow:group name="indiana-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+datapath+06:d6:00:16:b9:cf:fc:40"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+authority+am">
+	<openflow:port num="3"/>
+	<openflow:port num="8"/>
+	<openflow:port num="9"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:3"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+      <openflow:use-group name="indiana-1750-nlr-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.107.0" to="10.42.107.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.107.0/24"/>
+	<openflow:nw_src value="10.42.107.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:3"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.107.0" to="10.42.107.255"/>
-
-  </flowspace>
-
-</resv_rspec>
-
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-internet2-plastic-107.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-internet2-plastic-107.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-internet2-plastic-107.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Internet2 used by the
-plastic-107 slice.
+This rspec will reserve the OpenFlow resources at Internet2
+used by the plastic-107 slice.
 
-AM: https://ofc-vm1.net.internet2.edu:1443/openflow/gapi/
+AM: https://foam.net.internet2.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 107 at Internet2."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-107@internet2" description="Plastic Slices slice 107 at Internet2"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33107" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33107" name="naxos-33107" description="The FlowVisor on naxos, for plastic-107." expiry="1313380800"/>
+    <openflow:group name="i2-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:18:1b" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:18:58" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:19:96" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:1a:57" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:1b:93" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1b:93"/>
+      <openflow:use-group name="i2-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.107.0" to="10.42.107.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.107.0/24"/>
+	<openflow:nw_src value="10.42.107.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1b:93"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.107.0" to="10.42.107.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-nlr-plastic-107.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-nlr-plastic-107.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-nlr-plastic-107.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at NLR used by the
-plastic-107 slice.
+This rspec will reserve the OpenFlow resources at NLR
+used by the plastic-107 slice.
 
-AM: https://expedient.nlr.net:1443/openflow/gapi/
+AM: https://foam.nlr.net:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 107 at NLR."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-107@nlr" description="Plastic Slices slice 107 at NLR"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33107" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33107" name="naxos-33107" description="The FlowVisor on naxos, for plastic-107." expiry="1313380800"/>
+    <openflow:group name="nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:23:47:c8:bc:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:23:47:ca:bc:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:24:a8:d2:48:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:24:a8:d2:b8:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:26:f1:40:a8:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+    </openflow:group>
 
-  <flowspace>
- 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:26:f1:40:a8:00"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.107.0" to="10.42.107.255"/>
+      <openflow:use-group name="nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.107.0/24"/>
+	<openflow:nw_src value="10.42.107.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:26:f1:40:a8:00"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.107.0" to="10.42.107.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-washington-plastic-107.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-washington-plastic-107.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-107/openflow-washington-plastic-107.rspec	(revision 1201)
@@ -1,37 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Washington used by the
-plastic-107 slice.
+This rspec will reserve the OpenFlow resources at Washington
+used by the plastic-107 slice.
 
-AM: https://of.cs.washington.edu:1443/openflow/gapi/
+AM: https://of.cs.washington.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 107 at Washington."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-107@washington" description="Plastic Slices slice 107 at Washington"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33107" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33107" name="naxos-33107" description="The FlowVisor on naxos, for plastic-107." expiry="1313380800"/>
+    <openflow:group name="washington-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+datapath+06:d6:00:23:47:c8:8c:40"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+authority+am">
+        <openflow:port num="22"/>
+        <openflow:port num="23"/>
+        <openflow:port num="24"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:22"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.107.0" to="10.42.107.255"/>
+      <openflow:use-group name="washington-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.107.0/24"/>
+        <openflow:nw_src value="10.42.107.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
-     <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:22"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.107.0" to="10.42.107.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-indiana-plastic-108.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-indiana-plastic-108.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-indiana-plastic-108.rspec	(revision 1201)
@@ -1,39 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Indiana used by the
-plastic-108 slice.
+This rspec will reserve the OpenFlow resources at Indiana
+used by the plastic-108 slice.
 
-AM: https://optin.testlab.grnoc.iu.edu:1443/openflow/gapi/
+AM: https://foam.noc.iu.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 108 at Indiana."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-108@indiana" description="Plastic Slices slice 108 at Indiana"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33108" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33108" name="naxos-33108" description="The FlowVisor on naxos, for plastic-108." expiry="1313380800"/>
+    <openflow:group name="indiana-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+datapath+06:d6:00:16:b9:cf:fc:40"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="8"/>
+	<openflow:port num="9"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:5"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+      <openflow:use-group name="indiana-1750-nlr-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.108.0" to="10.42.108.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.108.0/24"/>
+	<openflow:nw_src value="10.42.108.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:5"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.108.0" to="10.42.108.255"/>
-
-  </flowspace>
-
-</resv_rspec>
-
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-internet2-plastic-108.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-internet2-plastic-108.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-internet2-plastic-108.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Internet2 used by the
-plastic-108 slice.
+This rspec will reserve the OpenFlow resources at Internet2
+used by the plastic-108 slice.
 
-AM: https://ofc-vm1.net.internet2.edu:1443/openflow/gapi/
+AM: https://foam.net.internet2.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 108 at Internet2."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-108@internet2" description="Plastic Slices slice 108 at Internet2"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33108" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33108" name="naxos-33108" description="The FlowVisor on naxos, for plastic-108." expiry="1313380800"/>
+    <openflow:group name="i2-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:18:1b" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:18:1b" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:18:58" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:18:58" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:19:96" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:19:96" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:1a:57" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:1a:57" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:1b:93" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:1b:93" />
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1b:93"/>
+      <openflow:use-group name="i2-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.108.0" to="10.42.108.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.108.0/24"/>
+	<openflow:nw_src value="10.42.108.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1b:93"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.108.0" to="10.42.108.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-nlr-plastic-108.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-nlr-plastic-108.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-nlr-plastic-108.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at NLR used by the
-plastic-108 slice.
+This rspec will reserve the OpenFlow resources at NLR
+used by the plastic-108 slice.
 
-AM: https://expedient.nlr.net:1443/openflow/gapi/
+AM: https://foam.nlr.net:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 108 at NLR."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-108@nlr" description="Plastic Slices slice 108 at NLR"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33108" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33108" name="naxos-33108" description="The FlowVisor on naxos, for plastic-108." expiry="1313380800"/>
+    <openflow:group name="nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:23:47:c8:bc:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:23:47:ca:bc:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:24:a8:d2:48:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:24:a8:d2:b8:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:26:f1:40:a8:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+    </openflow:group>
 
-  <flowspace>
- 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:26:f1:40:a8:00"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.108.0" to="10.42.108.255"/>
+      <openflow:use-group name="nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.108.0/24"/>
+	<openflow:nw_src value="10.42.108.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:26:f1:40:a8:00"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.108.0" to="10.42.108.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-rutgers-plastic-108.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-rutgers-plastic-108.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-rutgers-plastic-108.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Rutgers used by the
-plastic-108 slice.
+This rspec will reserve the OpenFlow resources at Rutgers
+used by the plastic-108 slice.
 
-AM: https://nox.orbit-lab.org:1443/openflow/gapi/
+AM: https://nox.orbit-lab.org:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 108 at Rutgers."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-108@rutgers" description="Plastic Slices slice 108 at Rutgers"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33108" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33108" name="naxos-33108" description="The FlowVisor on naxos, for plastic-108." expiry="1313380800"/>
+    <openflow:group name="rutgers-1750-i2-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+datapath+00:00:00:10:10:17:50:01"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:2"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
+      <openflow:use-group name="rutgers-1750-i2-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.108.0" to="10.42.108.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.108.0/24"/>
+	<openflow:nw_src value="10.42.108.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:2"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.108.0" to="10.42.108.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-stanford-plastic-108.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-stanford-plastic-108.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-stanford-plastic-108.rspec	(revision 1201)
@@ -1,60 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Stanford used by the
-plastic-108 slice.
+This rspec will reserve the OpenFlow resources at Stanford
+used by the plastic-108 slice.
 
-AM: https://endpoint.stanford.edu:1443/openflow/gapi/
+AM: https://openflow4.stanford.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 108 at Stanford."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-108@stanford" description="Plastic Slices slice 108 at Stanford"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33108" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33108" name="naxos-33108" description="The FlowVisor on naxos, for plastic-108." expiry="1313380800"/>
+    <openflow:group name="stanford-plnodes-901">
 
-  <flowspace>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+03:85:00:23:47:4e:2e:c0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- hpsw4-901 -->
+        <openflow:port num="4"/>  <!-- of-planet1 -->
+        <openflow:port num="8"/>  <!-- to necsw2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:10"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:67:65"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw-901 -->
+        <openflow:port num="1"/>  <!-- to necsw2 -->
+        <openflow:port num="2"/>  <!-- to necsw7 -->
+        <openflow:port num="4"/>  <!-- of-planet2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:b8:f3:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw7-901 -->
+        <openflow:port num="3"/>   <!-- to necsw -->
+        <openflow:port num="27"/>  <!-- of-planet3 -->
+        <openflow:port num="28"/>  <!-- of-planet4 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
+    <openflow:group name="stanford-901-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:31:f5"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw2-901 -->
+        <openflow:port num="1"/>   <!-- to necsw -->
+        <openflow:port num="2"/>   <!-- to hpsw4 -->
+        <openflow:port num="10"/>  <!-- to NLR 3716 -->
+      </openflow:datapath>
+    </openflow:group>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.108.0" to="10.42.108.255"/>
+    <openflow:match>
 
-  </flowspace>
+      <openflow:use-group name="stanford-plnodes-901" />
+      <openflow:use-group name="stanford-901-nlr-3716" />
 
-  <flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.108.0/24"/>
+        <openflow:nw_src value="10.42.108.0/24"/>
+      </openflow:packet>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:10"/>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
-
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.108.0" to="10.42.108.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-wisconsin-plastic-108.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-wisconsin-plastic-108.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-108/openflow-wisconsin-plastic-108.rspec	(revision 1201)
@@ -1,44 +1,55 @@
-<!--
-This rspec will reserve the OpenFlow resources at Wisconsin used by the
-plastic-108 slice.
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+This rspec will reserve the OpenFlow resources at Wisconsin
+used by the plastic-108 slice.
 
-AM: https://wings-openflow-1.wail.wisc.edu:1443/openflow/gapi/
+AM: https://foam.wail.wisc.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 108 at Wisconsin."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-108@wisconsin" description="Plastic Slices slice 108 at Wisconsin"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33108" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33108" name="naxos-33108" description="The FlowVisor on naxos, for plastic-108." expiry="1313380800"/>
+    <openflow:group name="wisconsin-plnodes-1750">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:23:47:cc:44:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="1"/>
+        <openflow:port num="20"/>
+        <openflow:port num="22"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:group name="wisconsin-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:21:f7:be:8d:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="3"/>
+        <openflow:port num="53"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:53"/>
+      <openflow:use-group name="wisconsin-plnodes-1750" />
+      <openflow:use-group name="wisconsin-1750-nlr-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.108.0" to="10.42.108.255"/>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.108.0/24"/>
+        <openflow:nw_src value="10.42.108.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
-
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:53"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.108.0" to="10.42.108.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-bbn-plastic-109.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-bbn-plastic-109.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-bbn-plastic-109.rspec	(revision 1201)
@@ -1,50 +1,56 @@
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 This rspec will reserve the OpenFlow resources at BBN used by the
 plastic-109 slice.
 
-AM: https://expedient.gpolab.bbn.com:1443/openflow/gapi/
+AM: https://foam.gpolab.bbn.com:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="plastic-109 OpenFlow resources at BBN."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-109@bbn" description="Plastic Slices slice 109 at BBN"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33109" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33109" name="naxos-33109" description="The FlowVisor on naxos, for plastic-109."/>
+    <openflow:group name="habanero-1750-i2-plnodes">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:24:a8:c4:b9:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+	<openflow:port num="49"/>
+	<openflow:port num="50"/>
+	<openflow:port num="51"/>
+	<openflow:port num="71"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+    <openflow:group name="poblano-1750-i2-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:12:e2:b8:a5:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+        <openflow:port num="9"/>
+        <openflow:port num="20"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:3"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.109.0" to="10.42.109.255"/>
+      <openflow:use-group name="habanero-1750-i2-plnodes" />
+      <openflow:use-group name="poblano-1750-i2-3715" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.109.0/24"/>
+        <openflow:nw_src value="10.42.109.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:3"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.109.0" to="10.42.109.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-clemson-plastic-109.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-clemson-plastic-109.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-clemson-plastic-109.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Clemson used by the
-plastic-109 slice.
+This rspec will reserve the OpenFlow resources at Clemson
+used by the plastic-109 slice.
 
-AM: https://expedient.clemson.edu:1443/openflow/gapi/
+AM: https://foam.clemson.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 109 at Clemson."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-109@clemson" description="Plastic Slices slice 109 at Clemson"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33109" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33109" name="naxos-33109" description="The FlowVisor on naxos, for plastic-109." expiry="1313380800"/>
+    <openflow:group name="clemson-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam+datapath+06:d6:00:26:f1:3f:e4:80"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam+authority+am">
+	<openflow:port num="36"/>
+	<openflow:port num="39"/>
+	<openflow:port num="43"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:43"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.109.0" to="10.42.109.255"/>
+      <openflow:use-group name="clemson-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.109.0/24"/>
+	<openflow:nw_src value="10.42.109.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:36"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:39"/>
-    <port urn="urn:publicid:IDN+Clemson:expedient:openflow+switch:06:d6:00:26:f1:3f:e4:80+port:43"/>
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.109.0" to="10.42.109.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-indiana-plastic-109.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-indiana-plastic-109.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-indiana-plastic-109.rspec	(revision 1201)
@@ -1,39 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Indiana used by the
-plastic-109 slice.
+This rspec will reserve the OpenFlow resources at Indiana
+used by the plastic-109 slice.
 
-AM: https://optin.testlab.grnoc.iu.edu:1443/openflow/gapi/
+AM: https://foam.noc.iu.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 109 at Indiana."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-109@indiana" description="Plastic Slices slice 109 at Indiana"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33109" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33109" name="naxos-33109" description="The FlowVisor on naxos, for plastic-109." expiry="1313380800"/>
+    <openflow:group name="indiana-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+datapath+06:d6:00:16:b9:cf:fc:40"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+authority+am">
+	<openflow:port num="3"/>
+	<openflow:port num="8"/>
+	<openflow:port num="9"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:3"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+      <openflow:use-group name="indiana-1750-nlr-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.109.0" to="10.42.109.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.109.0/24"/>
+	<openflow:nw_src value="10.42.109.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:3"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.109.0" to="10.42.109.255"/>
-
-  </flowspace>
-
-</resv_rspec>
-
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-internet2-plastic-109.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-internet2-plastic-109.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-internet2-plastic-109.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Internet2 used by the
-plastic-109 slice.
+This rspec will reserve the OpenFlow resources at Internet2
+used by the plastic-109 slice.
 
-AM: https://ofc-vm1.net.internet2.edu:1443/openflow/gapi/
+AM: https://foam.net.internet2.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 109 at Internet2."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-109@internet2" description="Plastic Slices slice 109 at Internet2"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33109" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33109" name="naxos-33109" description="The FlowVisor on naxos, for plastic-109." expiry="1313380800"/>
+    <openflow:group name="i2-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:18:1b" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:18:58" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:19:96" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:1a:57" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:83:40:39:1b:93" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" />
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1b:93"/>
+      <openflow:use-group name="i2-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.109.0" to="10.42.109.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.109.0/24"/>
+	<openflow:nw_src value="10.42.109.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:83:40:39:1b:93"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.109.0" to="10.42.109.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-nlr-plastic-109.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-nlr-plastic-109.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-nlr-plastic-109.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at NLR used by the
-plastic-109 slice.
+This rspec will reserve the OpenFlow resources at NLR
+used by the plastic-109 slice.
 
-AM: https://expedient.nlr.net:1443/openflow/gapi/
+AM: https://foam.nlr.net:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 109 at NLR."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-109@nlr" description="Plastic Slices slice 109 at NLR"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33109" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33109" name="naxos-33109" description="The FlowVisor on naxos, for plastic-109." expiry="1313380800"/>
+    <openflow:group name="nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:23:47:c8:bc:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:23:47:ca:bc:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:24:a8:d2:48:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:24:a8:d2:b8:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:83:00:26:f1:40:a8:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+    </openflow:group>
 
-  <flowspace>
- 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:26:f1:40:a8:00"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.109.0" to="10.42.109.255"/>
+      <openflow:use-group name="nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.109.0/24"/>
+	<openflow:nw_src value="10.42.109.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:83:00:26:f1:40:a8:00"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.109.0" to="10.42.109.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-stanford-plastic-109.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-stanford-plastic-109.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-stanford-plastic-109.rspec	(revision 1201)
@@ -1,60 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Stanford used by the
-plastic-109 slice.
+This rspec will reserve the OpenFlow resources at Stanford
+used by the plastic-109 slice.
 
-AM: https://endpoint.stanford.edu:1443/openflow/gapi/
+AM: https://openflow4.stanford.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 109 at Stanford."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-109@stanford" description="Plastic Slices slice 109 at Stanford"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33109" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33109" name="naxos-33109" description="The FlowVisor on naxos, for plastic-109." expiry="1313380800"/>
+    <openflow:group name="stanford-plnodes-901">
 
-  <flowspace>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+03:85:00:23:47:4e:2e:c0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- hpsw4-901 -->
+        <openflow:port num="4"/>  <!-- of-planet1 -->
+        <openflow:port num="8"/>  <!-- to necsw2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:11"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:67:65"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw-901 -->
+        <openflow:port num="1"/>  <!-- to necsw2 -->
+        <openflow:port num="2"/>  <!-- to necsw7 -->
+        <openflow:port num="4"/>  <!-- of-planet2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:b8:f3:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw7-901 -->
+        <openflow:port num="3"/>   <!-- to necsw -->
+        <openflow:port num="27"/>  <!-- of-planet3 -->
+        <openflow:port num="28"/>  <!-- of-planet4 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
+    <openflow:group name="stanford-901-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:31:f5"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw2-901 -->
+        <openflow:port num="1"/>   <!-- to necsw -->
+        <openflow:port num="2"/>   <!-- to hpsw4 -->
+        <openflow:port num="11"/>  <!-- to NLR 3715 -->
+      </openflow:datapath>
+    </openflow:group>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.109.0" to="10.42.109.255"/>
+    <openflow:match>
 
-  </flowspace>
+      <openflow:use-group name="stanford-plnodes-901" />
+      <openflow:use-group name="stanford-901-nlr-3715" />
 
-  <flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.109.0/24"/>
+        <openflow:nw_src value="10.42.109.0/24"/>
+      </openflow:packet>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:11"/>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
-
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.109.0" to="10.42.109.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-washington-plastic-109.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-washington-plastic-109.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-washington-plastic-109.rspec	(revision 1201)
@@ -1,37 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Washington used by the
-plastic-109 slice.
+This rspec will reserve the OpenFlow resources at Washington
+used by the plastic-109 slice.
 
-AM: https://of.cs.washington.edu:1443/openflow/gapi/
+AM: https://of.cs.washington.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 109 at Washington."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-109@washington" description="Plastic Slices slice 109 at Washington"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33109" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33109" name="naxos-33109" description="The FlowVisor on naxos, for plastic-109." expiry="1313380800"/>
+    <openflow:group name="washington-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+datapath+06:d6:00:23:47:c8:8c:40"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+authority+am">
+        <openflow:port num="22"/>
+        <openflow:port num="23"/>
+        <openflow:port num="24"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:22"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.109.0" to="10.42.109.255"/>
+      <openflow:use-group name="washington-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.109.0/24"/>
+        <openflow:nw_src value="10.42.109.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
-     <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:22"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.109.0" to="10.42.109.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-wisconsin-plastic-109.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-wisconsin-plastic-109.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-109/openflow-wisconsin-plastic-109.rspec	(revision 1201)
@@ -1,44 +1,55 @@
-<!--
-This rspec will reserve the OpenFlow resources at Wisconsin used by the
-plastic-109 slice.
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+This rspec will reserve the OpenFlow resources at Wisconsin
+used by the plastic-109 slice.
 
-AM: https://wings-openflow-1.wail.wisc.edu:1443/openflow/gapi/
+AM: https://foam.wail.wisc.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 109 at Wisconsin."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-109@wisconsin" description="Plastic Slices slice 109 at Wisconsin"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33109" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33109" name="naxos-33109" description="The FlowVisor on naxos, for plastic-109." expiry="1313380800"/>
+    <openflow:group name="wisconsin-plnodes-1750">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:23:47:cc:44:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="1"/>
+        <openflow:port num="20"/>
+        <openflow:port num="22"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:group name="wisconsin-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+datapath+06:d6:00:21:f7:be:8d:00"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.wail.wisc.edu+authority+am">
+        <openflow:port num="3"/>
+        <openflow:port num="51"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:51"/>
+      <openflow:use-group name="wisconsin-plnodes-1750" />
+      <openflow:use-group name="wisconsin-1750-nlr-3715" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.109.0" to="10.42.109.255"/>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.109.0/24"/>
+        <openflow:nw_src value="10.42.109.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:1"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:20"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:23:47:cc:44:00+port:22"/>
-
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:3"/>
-    <port urn="urn:publicid:IDN+wisconsin:expedient:openflow+switch:06:d6:00:21:f7:be:8d:00+port:51"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.109.0" to="10.42.109.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-bbn-plastic-110.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-bbn-plastic-110.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-bbn-plastic-110.rspec	(revision 1201)
@@ -1,50 +1,55 @@
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 This rspec will reserve the OpenFlow resources at BBN used by the
 plastic-110 slice.
 
-AM: https://expedient.gpolab.bbn.com:1443/openflow/gapi/
+AM: https://foam.gpolab.bbn.com:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="plastic-110 OpenFlow resources at BBN."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-110@bbn" description="Plastic Slices slice 110 at BBN"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33110" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33110" name="naxos-33110" description="The FlowVisor on naxos, for plastic-110."/>
+    <openflow:group name="habanero-1750-nlr-plnodes">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:24:a8:c4:b9:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+	<openflow:port num="55"/>
+	<openflow:port num="56"/>
+	<openflow:port num="71"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+    <openflow:group name="poblano-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:12:e2:b8:a5:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
+        <openflow:port num="5"/>
+        <openflow:port num="20"/>
+      </openflow:datapath>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:5"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.110.0" to="10.42.110.255"/>
+      <openflow:use-group name="habanero-1750-nlr-plnodes" />
+      <openflow:use-group name="poblano-1750-nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.110.0/24"/>
+        <openflow:nw_src value="10.42.110.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:49"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:50"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:51"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:55"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:56"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:24:a8:c4:b9:00+port:71"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:5"/>
-    <port urn="urn:publicid:IDN+tulum.gpolab.bbn.com:expedient:openflow+switch:06:d6:00:12:e2:b8:a5:d0+port:20"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.110.0" to="10.42.110.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-gatech-plastic-110.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-gatech-plastic-110.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-gatech-plastic-110.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at GT used by the
-plastic-110 slice.
+This rspec will reserve the OpenFlow resources at GT
+used by the plastic-110 slice.
 
-AM: https://expedient.oflow.cip.gatech.edu:1443/openflow/gapi/ 
+AM: https://foam.oflow.cip.gatech.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 110 at GT."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-110@gt" description="Plastic Slices slice 110 at GT"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33110" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33110" name="naxos-33110" description="The FlowVisor on naxos, for plastic-110." expiry="1313380800"/>
+    <openflow:group name="gatech-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+datapath+06:d6:00:19:bb:b3:0d:00"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.oflow.cip.gatech.edu+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:5"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.110.0" to="10.42.110.255"/>
+      <openflow:use-group name="gatech-1750-nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.110.0/24"/>
+	<openflow:nw_src value="10.42.110.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:5"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:9"/>
-    <port urn="urn:publicid:IDN+GT-RNOC:expedient:openflow+switch:06:d6:00:19:bb:b3:0d:00+port:10"/>
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.110.0" to="10.42.110.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-indiana-plastic-110.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-indiana-plastic-110.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-indiana-plastic-110.rspec	(revision 1201)
@@ -1,39 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Indiana used by the
-plastic-110 slice.
+This rspec will reserve the OpenFlow resources at Indiana
+used by the plastic-110 slice.
 
-AM: https://optin.testlab.grnoc.iu.edu:1443/openflow/gapi/
+AM: https://foam.noc.iu.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 110 at Indiana."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-110@indiana" description="Plastic Slices slice 110 at Indiana"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33110" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33110" name="naxos-33110" description="The FlowVisor on naxos, for plastic-110." expiry="1313380800"/>
+    <openflow:group name="indiana-1750-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+datapath+06:d6:00:16:b9:cf:fc:40"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:foam.noc.iu.edu+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="8"/>
+	<openflow:port num="9"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:5"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+      <openflow:use-group name="indiana-1750-nlr-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.110.0" to="10.42.110.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.110.0/24"/>
+	<openflow:nw_src value="10.42.110.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:5"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:8"/>
-    <port urn="urn:publicid:IDN+indiana:expedient:openflow+switch:06:d6:00:16:b9:cf:fc:40+port:9"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.110.0" to="10.42.110.255"/>
-
-  </flowspace>
-
-</resv_rspec>
-
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-internet2-plastic-110.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-internet2-plastic-110.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-internet2-plastic-110.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Internet2 used by the
-plastic-110 slice.
+This rspec will reserve the OpenFlow resources at Internet2
+used by the plastic-110 slice.
 
-AM: https://ofc-vm1.net.internet2.edu:1443/openflow/gapi/
+AM: https://foam.net.internet2.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 110 at Internet2."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-110@internet2" description="Plastic Slices slice 110 at Internet2"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33110" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33110" name="naxos-33110" description="The FlowVisor on naxos, for plastic-110." expiry="1313380800"/>
+    <openflow:group name="i2-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:18:1b" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:18:1b" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:18:58" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:18:58" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:19:96" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:19:96" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:1a:57" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:1a:57" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+datapath+00:00:0e:84:40:39:1b:93" component_manager_id="urn:publicid:IDN+openflow:foam:foam.net.internet2.edu+authority+am" dpid="00:00:0e:84:40:39:1b:93" />
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1b:93"/>
+      <openflow:use-group name="i2-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.110.0" to="10.42.110.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.110.0/24"/>
+	<openflow:nw_src value="10.42.110.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:1b"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:18:58"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:19:96"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1a:57"/>
-    <switch urn="urn:publicid:IDN+indiana:expedient:openflow+switch:00:00:0e:84:40:39:1b:93"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.110.0" to="10.42.110.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-nlr-plastic-110.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-nlr-plastic-110.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-nlr-plastic-110.rspec	(revision 1201)
@@ -1,42 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at NLR used by the
-plastic-110 slice.
+This rspec will reserve the OpenFlow resources at NLR
+used by the plastic-110 slice.
 
-AM: https://expedient.nlr.net:1443/openflow/gapi/
+AM: https://foam.nlr.net:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 110 at NLR."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-110@nlr" description="Plastic Slices slice 110 at NLR"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33110" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33110" name="naxos-33110" description="The FlowVisor on naxos, for plastic-110." expiry="1313380800"/>
+    <openflow:group name="nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:23:47:c8:bc:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:23:47:ca:bc:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:24:a8:d2:48:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:24:a8:d2:b8:40" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+datapath+0e:84:00:26:f1:40:a8:00" component_manager_id="urn:publicid:IDN+openflow:foam:foam.nlr.net+authority+am" />
+    </openflow:group>
 
-  <flowspace>
- 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:26:f1:40:a8:00"/>
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.110.0" to="10.42.110.255"/>
+      <openflow:use-group name="nlr-3716" />
 
-  </flowspace>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.110.0/24"/>
+	<openflow:nw_src value="10.42.110.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
+    </openflow:match>
 
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:c8:bc:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:23:47:ca:bc:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:48:00"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:24:a8:d2:b8:40"/>
-    <switch urn="urn:publicid:IDN+nlr:expedient:openflow+switch:0e:84:00:26:f1:40:a8:00"/>
+  </openflow:sliver>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.110.0" to="10.42.110.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-rutgers-plastic-110.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-rutgers-plastic-110.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-rutgers-plastic-110.rspec	(revision 1201)
@@ -1,38 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Rutgers used by the
-plastic-110 slice.
+This rspec will reserve the OpenFlow resources at Rutgers
+used by the plastic-110 slice.
 
-AM: https://nox.orbit-lab.org:1443/openflow/gapi/
+AM: https://nox.orbit-lab.org:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 110 at Rutgers."
+		   email="jbs@bbn.com">
 
-  <project name="plastic-110@rutgers" description="Plastic Slices slice 110 at Rutgers"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33110" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33110" name="naxos-33110" description="The FlowVisor on naxos, for plastic-110." expiry="1313380800"/>
+    <openflow:group name="rutgers-1750-i2-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+datapath+00:00:00:10:10:17:50:01"
+			 component_manager_id="urn:publicid:IDN+openflow:foam:internal2.orbit-lab.org+authority+am">
+	<openflow:port num="5"/>
+	<openflow:port num="9"/>
+	<openflow:port num="10"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
+    <openflow:match>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:2"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
+      <openflow:use-group name="rutgers-1750-i2-3716" />
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.110.0" to="10.42.110.255"/>
+      <openflow:packet>
+	<openflow:dl_type value="0x800,0x806"/>
+	<openflow:nw_dst value="10.42.110.0/24"/>
+	<openflow:nw_src value="10.42.110.0/24"/>
+      </openflow:packet>
 
-  </flowspace>
+    </openflow:match>
 
-  <flowspace>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:2"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:3"/>
-    <port urn="urn:publicid:IDN+rutgers:expedient:openflow+switch:00:00:00:10:10:17:50:01+port:4"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.110.0" to="10.42.110.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-stanford-plastic-110.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-stanford-plastic-110.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-stanford-plastic-110.rspec	(revision 1201)
@@ -1,60 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Stanford used by the
-plastic-110 slice.
+This rspec will reserve the OpenFlow resources at Stanford
+used by the plastic-110 slice.
 
-AM: https://endpoint.stanford.edu:1443/openflow/gapi/
+AM: https://openflow4.stanford.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 110 at Stanford."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-110@stanford" description="Plastic Slices slice 110 at Stanford"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33110" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33110" name="naxos-33110" description="The FlowVisor on naxos, for plastic-110." expiry="1313380800"/>
+    <openflow:group name="stanford-plnodes-901">
 
-  <flowspace>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+03:85:00:23:47:4e:2e:c0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- hpsw4-901 -->
+        <openflow:port num="4"/>  <!-- of-planet1 -->
+        <openflow:port num="8"/>  <!-- to necsw2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:10"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:67:65"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw-901 -->
+        <openflow:port num="1"/>  <!-- to necsw2 -->
+        <openflow:port num="2"/>  <!-- to necsw7 -->
+        <openflow:port num="4"/>  <!-- of-planet2 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:b8:f3:d0"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw7-901 -->
+        <openflow:port num="3"/>   <!-- to necsw -->
+        <openflow:port num="27"/>  <!-- of-planet3 -->
+        <openflow:port num="28"/>  <!-- of-planet4 -->
+      </openflow:datapath>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
+    </openflow:group>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
+    <openflow:group name="stanford-901-nlr-3716">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+datapath+00:00:00:12:e2:78:31:f5"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:openflow4.stanford.edu+authority+am">  <!-- necsw2-901 -->
+        <openflow:port num="1"/>   <!-- to necsw -->
+        <openflow:port num="2"/>   <!-- to hpsw4 -->
+        <openflow:port num="10"/>  <!-- to NLR 3716 -->
+      </openflow:datapath>
+    </openflow:group>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.110.0" to="10.42.110.255"/>
+    <openflow:match>
 
-  </flowspace>
+      <openflow:use-group name="stanford-plnodes-901" />
+      <openflow:use-group name="stanford-901-nlr-3716" />
 
-  <flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.110.0/24"/>
+        <openflow:nw_src value="10.42.110.0/24"/>
+      </openflow:packet>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:31:f5+port:10"/>
+    </openflow:match>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:1"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:2"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:78:67:65+port:6"/>
+  </openflow:sliver>
 
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:3"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:27"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:00:00:00:12:e2:b8:f3:d0+port:28"/>
-
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:4"/>
-    <port urn="urn:publicid:IDN+stanford:expedient:openflow+switch:03:85:00:23:47:4e:2e:c0+port:5"/>
-
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.110.0" to="10.42.110.255"/>
-
-  </flowspace>
-
-</resv_rspec>
+</rspec>
Index: trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-washington-plastic-110.rspec
===================================================================
--- trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-washington-plastic-110.rspec	(revision 801)
+++ trunk/wikifiles/plastic-slices/rspecs/plastic-110/openflow-washington-plastic-110.rspec	(revision 1201)
@@ -1,37 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-This rspec will reserve the OpenFlow resources at Washington used by the
-plastic-110 slice.
+This rspec will reserve the OpenFlow resources at Washington
+used by the plastic-110 slice.
 
-AM: https://of.cs.washington.edu:1443/openflow/gapi/
+AM: https://of.cs.washington.edu:3626/foam/gapi/1
 -->
 
-<resv_rspec type="openflow" version="2">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:openflow="http://www.geni.net/resources/rspec/ext/openflow/3"
+       xs:schemaLocation="http://www.geni.net/resources/rspec/3
+           http://www.geni.net/resources/rspec/3/request.xsd
+           http://www.geni.net/resources/rspec/ext/openflow/3
+           http://www.geni.net/resources/rspec/ext/openflow/3/of-resv.xsd"
+       type="request">
 
-  <user affiliation="BBN" email="jbs@bbn.com" firstname="Josh" lastname="Smift" passsword="password"/>
+  <openflow:sliver description="Plastic Slices slice 110 at Washington."
+                   email="jbs@bbn.com">
 
-  <project name="plastic-110@washington" description="Plastic Slices slice 110 at Washington"/>
+    <openflow:controller url="tcp:naxos.gpolab.bbn.com:33110" type="primary" />
 
-  <slice controller_url="tcp:naxos.gpolab.bbn.com:33110" name="naxos-33110" description="The FlowVisor on naxos, for plastic-110." expiry="1313380800"/>
+    <openflow:group name="washington-1750-nlr-3715">
+      <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+datapath+06:d6:00:23:47:c8:8c:40"
+                         component_manager_id="urn:publicid:IDN+openflow:foam:of.cs.washington.edu+authority+am">
+        <openflow:port num="20"/>
+        <openflow:port num="23"/>
+        <openflow:port num="24"/>
+      </openflow:datapath>
+    </openflow:group>
 
-  <flowspace>
- 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:20"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    <openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_dst from="10.42.110.0" to="10.42.110.255"/>
+      <openflow:use-group name="washington-1750-nlr-3715" />
 
-  </flowspace>
+      <openflow:packet>
+        <openflow:dl_type value="0x800,0x806"/>
+        <openflow:nw_dst value="10.42.110.0/24"/>
+        <openflow:nw_src value="10.42.110.0/24"/>
+      </openflow:packet>
 
-  <flowspace>
-     <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:20"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:23"/> 
-    <port urn="urn:publicid:IDN+washington:expedient:openflow+switch:06:d6:00:23:47:c8:8c:40+port:24"/> 
+    </openflow:match>
 
-    <dl_type from="2048" to="2048"/>
-    <nw_src from="10.42.110.0" to="10.42.110.255"/>
+  </openflow:sliver>
 
-  </flowspace>
-
-</resv_rspec>
+</rspec>
