git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 37d363e)
New OpenFlow RSpec.
authorSapan Bhatia <sapanb@cs.princeton.edu>
Mon, 2 Nov 2009 19:41:15 +0000 (19:41 +0000)
committerSapan Bhatia <sapanb@cs.princeton.edu>
Mon, 2 Nov 2009 19:41:15 +0000 (19:41 +0000)
sfa/rspecs/aggregates/openflow.xml patch | blob | history

diff --git a/sfa/rspecs/aggregates/openflow.xml b/sfa/rspecs/aggregates/openflow.xml
index 77e11b0..791baab 100755 (executable)
--- a/sfa/rspecs/aggregates/openflow.xml
+++ b/sfa/rspecs/aggregates/openflow.xml
@@ -1,52 +1,101 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>\r
-<tns:RSpec xmlns:tns="http://yuba.stanford.edu/geniLight/rspec" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://yuba.stanford.edu/geniLight/rspec http://yuba.stanford.edu/geniLight/rspec.xsd">\r
-\r
-  <tns:version>1.0</tns:version>\r
-\r
+<?xml version="1.0" encoding="UTF-8"?>\r
+<tns:RSpec xmlns:tns="http://yuba.stanford.edu/egeni/rspec" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://yuba.stanford.edu/egeni/rspec stanford-rspec.xsd ">\r
+  <tns:version>tns:version</tns:version>\r
   <tns:switchEntry>\r
     <tns:node>\r
-      <tns:nodeId>0012e2b8f3d2</tns:nodeId>\r
+      <tns:nodeId>tns:nodeId</tns:nodeId>\r
+      <tns:type>0</tns:type>\r
       <tns:interfaceEntry>\r
         <tns:port>0</tns:port>\r
-        <tns:flowSpaceEntry><tns:policy>allow</tns:policy><tns:tp_src>10001</tns:tp_src> </tns:flowSpaceEntry>\r
-        <tns:flowSpaceEntry><tns:policy>allow</tns:policy><tns:tp_dst>10001</tns:tp_dst> </tns:flowSpaceEntry>\r
-      </tns:interfaceEntry>\r
-      <tns:interfaceEntry>\r
-        <tns:port>1</tns:port>\r
-        <tns:flowSpaceEntry><tns:policy>allow</tns:policy><tns:tp_src>10001</tns:tp_src> </tns:flowSpaceEntry>\r
-        <tns:flowSpaceEntry><tns:policy>allow</tns:policy><tns:tp_dst>10001</tns:tp_dst> </tns:flowSpaceEntry>\r
-      </tns:interfaceEntry>\r
-      <tns:interfaceEntry>\r
-        <tns:port>3</tns:port>\r
-        <tns:flowSpaceEntry><tns:policy>allow</tns:policy><tns:tp_src>10001</tns:tp_src> </tns:flowSpaceEntry>\r
-        <tns:flowSpaceEntry><tns:policy>allow</tns:policy><tns:tp_dst>10001</tns:tp_dst> </tns:flowSpaceEntry>\r
+        <tns:remoteNodeId>tns:remoteNodeId</tns:remoteNodeId>\r
+        <tns:remotePort>0</tns:remotePort>\r
+        <tns:flowSpaceEntry>\r
+          <tns:policy>readonly</tns:policy>\r
+          <tns:dl_src>0F00</tns:dl_src>\r
+          <tns:dl_dst>0F00</tns:dl_dst>\r
+          <tns:dl_type>0</tns:dl_type>\r
+          <tns:vlan_id>0</tns:vlan_id>\r
+          <tns:ip_src>0F00</tns:ip_src>\r
+          <tns:ip_dst>0F00</tns:ip_dst>\r
+          <tns:ip_proto>0</tns:ip_proto>\r
+          <tns:tp_src>0</tns:tp_src>\r
+          <tns:tp_dst>0</tns:tp_dst>\r
+        </tns:flowSpaceEntry>\r
+        <tns:bandwidth>0.0</tns:bandwidth>\r
+        <tns:latency>0.0</tns:latency>\r
+        <tns:lossRate>0.0</tns:lossRate>\r
       </tns:interfaceEntry>\r
     </tns:node>\r
-    <tns:controllerUrl>tcp:openflow4.stanford.edu:10001</tns:controllerUrl>\r
+    <tns:switchFeatures>tns:switchFeatures</tns:switchFeatures>\r
+    <tns:controllerUrl>tns:controllerUrl</tns:controllerUrl>\r
   </tns:switchEntry>\r
-\r
-  <tns:switchEntry>\r
+  <tns:hostEntry>\r
     <tns:node>\r
-      <tns:nodeId>0012e2786763</tns:nodeId>\r
+      <tns:nodeId>tns:nodeId</tns:nodeId>\r
+      <tns:type>0</tns:type>\r
       <tns:interfaceEntry>\r
         <tns:port>0</tns:port>\r
-        <tns:flowSpaceEntry><tns:policy>allow</tns:policy><tns:tp_src>10001</tns:tp_src> </tns:flowSpaceEntry>\r
-        <tns:flowSpaceEntry><tns:policy>allow</tns:policy><tns:tp_dst>10001</tns:tp_dst> </tns:flowSpaceEntry>\r
+        <tns:remoteNodeId>tns:remoteNodeId</tns:remoteNodeId>\r
+        <tns:remotePort>0</tns:remotePort>\r
+        <tns:flowSpaceEntry>\r
+          <tns:policy>readonly</tns:policy>\r
+          <tns:dl_src>0F00</tns:dl_src>\r
+          <tns:dl_dst>0F00</tns:dl_dst>\r
+          <tns:dl_type>0</tns:dl_type>\r
+          <tns:vlan_id>0</tns:vlan_id>\r
+          <tns:ip_src>0F00</tns:ip_src>\r
+          <tns:ip_dst>0F00</tns:ip_dst>\r
+          <tns:ip_proto>0</tns:ip_proto>\r
+          <tns:tp_src>0</tns:tp_src>\r
+          <tns:tp_dst>0</tns:tp_dst>\r
+        </tns:flowSpaceEntry>\r
+        <tns:bandwidth>0.0</tns:bandwidth>\r
+        <tns:latency>0.0</tns:latency>\r
+        <tns:lossRate>0.0</tns:lossRate>\r
       </tns:interfaceEntry>\r
     </tns:node>\r
-    <tns:controllerUrl>tcp:openflow4.stanford.edu:10001</tns:controllerUrl>\r
-  </tns:switchEntry>\r
-\r
-  <tns:switchEntry>\r
+    <tns:cpuUtil>0.0</tns:cpuUtil>\r
+    <tns:memUtil>0.0</tns:memUtil>\r
+  </tns:hostEntry>\r
+  <tns:remoteNodeEntry>\r
+    <tns:remoteURL>tns:remoteURL</tns:remoteURL>\r
+    <tns:remoteType>tns:remoteType</tns:remoteType>\r
     <tns:node>\r
-      <tns:nodeId>0012e27831f3</tns:nodeId>\r
+      <tns:nodeId>tns:nodeId</tns:nodeId>\r
+      <tns:type>0</tns:type>\r
       <tns:interfaceEntry>\r
-        <tns:port>8</tns:port>\r
-        <tns:flowSpaceEntry><tns:policy>allow</tns:policy><tns:tp_src>10001</tns:tp_src> </tns:flowSpaceEntry>\r
-        <tns:flowSpaceEntry><tns:policy>allow</tns:policy><tns:tp_dst>10001</tns:tp_dst> </tns:flowSpaceEntry>\r
+        <tns:port>0</tns:port>\r
+        <tns:remoteNodeId>tns:remoteNodeId</tns:remoteNodeId>\r
+        <tns:remotePort>0</tns:remotePort>\r
+        <tns:flowSpaceEntry>\r
+          <tns:policy>readonly</tns:policy>\r
+          <tns:dl_src>0F00</tns:dl_src>\r
+          <tns:dl_dst>0F00</tns:dl_dst>\r
+          <tns:dl_type>0</tns:dl_type>\r
+          <tns:vlan_id>0</tns:vlan_id>\r
+          <tns:ip_src>0F00</tns:ip_src>\r
+          <tns:ip_dst>0F00</tns:ip_dst>\r
+          <tns:ip_proto>0</tns:ip_proto>\r
+          <tns:tp_src>0</tns:tp_src>\r
+          <tns:tp_dst>0</tns:tp_dst>\r
+        </tns:flowSpaceEntry>\r
+        <tns:bandwidth>0.0</tns:bandwidth>\r
+        <tns:latency>0.0</tns:latency>\r
+        <tns:lossRate>0.0</tns:lossRate>\r
       </tns:interfaceEntry>\r
     </tns:node>\r
-    <tns:controllerUrl>tcp:openflow4.stanford.edu:10001</tns:controllerUrl>\r
-  </tns:switchEntry>\r
-\r
+  </tns:remoteNodeEntry>\r
+  <tns:flowSpaceEntry>\r
+    <tns:policy>readonly</tns:policy>\r
+    <tns:dl_src>0F00</tns:dl_src>\r
+    <tns:dl_dst>0F00</tns:dl_dst>\r
+    <tns:dl_type>0</tns:dl_type>\r
+    <tns:vlan_id>0</tns:vlan_id>\r
+    <tns:ip_src>0F00</tns:ip_src>\r
+    <tns:ip_dst>0F00</tns:ip_dst>\r
+    <tns:ip_proto>0</tns:ip_proto>\r
+    <tns:tp_src>0</tns:tp_src>\r
+    <tns:tp_dst>0</tns:tp_dst>\r
+  </tns:flowSpaceEntry>\r
 </tns:RSpec>\r
+\r
sfa