Updated MAX example RSpec

diff --git a/sfa/managers/max/max.xml b/sfa/managers/max/max.xml
new file mode 100644 (file)
index 0000000..f549ab7
--- /dev/null
+++ b/sfa/managers/max/max.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rspec id="max_rspec_slice1" xmlns="http://geni.maxgigapop.net/aggregate/rspec/20100412/" schemaLocation="http://geni.dragon.maxgigapop.net/max-rspec.xsd" 
+  xmlns:CtrlPlane="http://ogf.org/schema/network/topology/ctrlPlane/20080828/" CtrlPlane:schemaLocation="http://www.controlplane.net/idcp-v1.1/nmtopo-ctrlp.xsd">
+    <aggregate>geni.maxgigapop.net</aggregate>
+    <description>Example MAX RSpec</description>
+    <lifetime id="time-1271533930-1271563981">
+        <CtrlPlane:start type="CtrlPlane:TimeContent">1279848020</CtrlPlane:start>
+        <CtrlPlane:end type="CtrlPlane:TimeContent">1280712039</CtrlPlane:end>
+    </lifetime>
+    <computeResource id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1">
+        <planetlabNodeSliver id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3">
+            <address>206.196.176.55</address>
+            <computeCapacity>
+                <cpuType>generic</cpuType>
+                <cpuSpeed>2.0GHz</cpuSpeed>
+                <numCpuCores>1</numCpuCores>
+                <memorySize>256MB</memorySize>
+                <diskSize>16GB</diskSize>
+            </computeCapacity>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3:interface=eth1.any_1">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.10.2/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2:interface=eth1.any_1</peerNetworkInterface>
+            </networkInterface>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3:interface=eth1.any_2">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.30.1/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5:interface=eth1.any_2</peerNetworkInterface>
+            </networkInterface>
+        </planetlabNodeSliver>
+        <planetlabNodeSliver id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5">
+            <address>206.196.176.138</address>
+            <computeCapacity>
+                <cpuType>generic</cpuType>
+                <cpuSpeed>2.0GHz</cpuSpeed>
+                <numCpuCores>1</numCpuCores>
+                <memorySize>256MB</memorySize>
+                <diskSize>16GB</diskSize>
+            </computeCapacity>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5:interface=eth1.any_3">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.20.2/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2:interface=eth1.any_3</peerNetworkInterface>
+            </networkInterface>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5:interface=eth1.any_2">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.30.2/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3:interface=eth1.any_2</peerNetworkInterface>
+            </networkInterface>
+        </planetlabNodeSliver>
+        <planetlabNodeSliver id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2">
+            <address>206.196.176.133</address>
+            <computeCapacity>
+                <cpuType>generic</cpuType>
+                <cpuSpeed>2.0GHz</cpuSpeed>
+                <numCpuCores>1</numCpuCores>
+                <memorySize>256MB</memorySize>
+                <diskSize>16GB</diskSize>
+            </computeCapacity>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2:interface=eth1.any_1">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.10.1/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3:interface=eth1.any_1</peerNetworkInterface>
+            </networkInterface>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2:interface=eth1.any_3">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.20.1/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5:interface=eth1.any_3</peerNetworkInterface>
+            </networkInterface>
+        </planetlabNodeSliver>
+    </computeResource>
+</rspec>

diff --git a/sfa/rspecs/aggregates/max.xml b/sfa/rspecs/aggregates/max.xml
index 5445621..f549ab7 100644 (file)
--- a/sfa/rspecs/aggregates/max.xml
+++ b/sfa/rspecs/aggregates/max.xml
@@ -1,35 +1,90 @@
-<rspec name="max" 
-    xmlns="http://www.maxgigapop.net/sfa/rspec/07/09">
-    <capacity>
-        <netspec name="predefined_physical_topology">
-            <nodespec name="planetlab2">
-                <node>planetlab2.dragon.maxgigapop.net</node>
-                <ifspec name="pl23" linkid="pl23"/>
-                <ifspec name="pl24" linkid="pl24"/>
-                <ifspec name="pl25" linkid="pl25"/>
-            </nodespec>
-            <nodespec name="planetlab3">
-                <node>planetlab3.dragon.maxgigapop.net</node>
-                <ifspec name="pl32" linkid="pl23"/>
-                <ifspec name="pl34" linkid="pl34"/>
-                <ifspec name="pl35" linkid="pl35"/>
-            </nodespec>
-            <nodespec name="planetlab4">
-                <node>planetlab4.dragon.maxgigapop.net</node>
-                <ifspec name="pl42" linkid="pl24"/>
-                <ifspec name="pl43" linkid="pl34"/>
-                <ifspec name="pl45" linkid="pl45"/>
-            </nodespec>
-            <nodespec name="planetlab5">
-                <node>planetlab5.dragon.maxgigapop.net</node> 
-                <ifspec name="pl52" linkid="pl25"/>
-                <ifspec name="pl53" linkid="pl35"/>
-                <ifspec name="pl54" linkid="pl45"/>
-            </nodespec>
-        </netspec>
-    </capacity>
-    <request>
-        <ifspec name="tns:pl23" ip="10.0.0.1"/>
-        <ifspec name="tns:pl32" ip="10.0.0.2"/>
-    </request>
+<?xml version="1.0" encoding="UTF-8"?>
+<rspec id="max_rspec_slice1" xmlns="http://geni.maxgigapop.net/aggregate/rspec/20100412/" schemaLocation="http://geni.dragon.maxgigapop.net/max-rspec.xsd" 
+  xmlns:CtrlPlane="http://ogf.org/schema/network/topology/ctrlPlane/20080828/" CtrlPlane:schemaLocation="http://www.controlplane.net/idcp-v1.1/nmtopo-ctrlp.xsd">
+    <aggregate>geni.maxgigapop.net</aggregate>
+    <description>Example MAX RSpec</description>
+    <lifetime id="time-1271533930-1271563981">
+        <CtrlPlane:start type="CtrlPlane:TimeContent">1279848020</CtrlPlane:start>
+        <CtrlPlane:end type="CtrlPlane:TimeContent">1280712039</CtrlPlane:end>
+    </lifetime>
+    <computeResource id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1">
+        <planetlabNodeSliver id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3">
+            <address>206.196.176.55</address>
+            <computeCapacity>
+                <cpuType>generic</cpuType>
+                <cpuSpeed>2.0GHz</cpuSpeed>
+                <numCpuCores>1</numCpuCores>
+                <memorySize>256MB</memorySize>
+                <diskSize>16GB</diskSize>
+            </computeCapacity>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3:interface=eth1.any_1">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.10.2/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2:interface=eth1.any_1</peerNetworkInterface>
+            </networkInterface>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3:interface=eth1.any_2">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.30.1/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5:interface=eth1.any_2</peerNetworkInterface>
+            </networkInterface>
+        </planetlabNodeSliver>
+        <planetlabNodeSliver id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5">
+            <address>206.196.176.138</address>
+            <computeCapacity>
+                <cpuType>generic</cpuType>
+                <cpuSpeed>2.0GHz</cpuSpeed>
+                <numCpuCores>1</numCpuCores>
+                <memorySize>256MB</memorySize>
+                <diskSize>16GB</diskSize>
+            </computeCapacity>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5:interface=eth1.any_3">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.20.2/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2:interface=eth1.any_3</peerNetworkInterface>
+            </networkInterface>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5:interface=eth1.any_2">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.30.2/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3:interface=eth1.any_2</peerNetworkInterface>
+            </networkInterface>
+        </planetlabNodeSliver>
+        <planetlabNodeSliver id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2">
+            <address>206.196.176.133</address>
+            <computeCapacity>
+                <cpuType>generic</cpuType>
+                <cpuSpeed>2.0GHz</cpuSpeed>
+                <numCpuCores>1</numCpuCores>
+                <memorySize>256MB</memorySize>
+                <diskSize>16GB</diskSize>
+            </computeCapacity>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2:interface=eth1.any_1">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.10.1/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3:interface=eth1.any_1</peerNetworkInterface>
+            </networkInterface>
+            <networkInterface id="urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2:interface=eth1.any_3">
+                <deviceType>Ethernet</deviceType>
+                <deviceName>eth1</deviceName>
+                <capacity>100Mbps</capacity>
+                <ipAddress>10.10.20.1/24</ipAddress>
+                <vlanRange>any</vlanRange>
+                <peerNetworkInterface>urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5:interface=eth1.any_3</peerNetworkInterface>
+            </networkInterface>
+        </planetlabNodeSliver>
+    </computeResource>
 </rspec>