Merge branch 'master' into eucalyptus-devel

diff --git a/sfa/managers/eucalyptus/eucalyptus.xml b/sfa/managers/eucalyptus/eucalyptus.xml
index 9aca652..22162b1 100644 (file)
--- a/sfa/managers/eucalyptus/eucalyptus.xml
+++ b/sfa/managers/eucalyptus/eucalyptus.xml
@@ -1,71 +1,50 @@
-<?xml version="1.0"?>
 <RSpec type="eucalyptus">
-  <cloud id="Emulab-Cloud">
-    <!-- This element added by the user -->
-    <user_info>
-      <credential>foobarbaz</credential>
-    </user_info>
-    <ipv4>155.98.39.85</ipv4>
-    <keypairs>
-      <keypair>cortex</keypair>
-      <keypair>mykey</keypair>
-    </keypairs>
-    <images>
-      <image id="emi-88760F45">
-        <type>machine</type>
-        <arch>x86_64</arch>
-        <state>available</state>
-        <location>images/ttylinux.img.manifest.xml</location>
-      </image>
-      <image id="eki-F26610C6">
-        <type>kernel</type>
-        <arch>x86_64</arch>
-        <state>available</state>
-        <location>images/vmlinuz-2.6.16.33-xen.manifest.xml</location>
-      </image>
-    </images>
-    <cluster id="pcluster">
-      <ipv4>10.1.1.2</ipv4>
+  <cloud id="OpenCirrus">
+    <ipv4>198.55.32.86</ipv4>
+    <bundles>
+      <bundle id="fc12" />
+      <bundle id="f12-plab" />
+      <bundle id="f12-planetlab" />
+      <bundle id="fc11" />
+    </bundles>
+    <cluster id="euca-oc">
+      <ipv4>198.55.32.86</ipv4>
       <vm_types>
         <vm_type name="m1.small">
-          <free_slots>2</free_slots>
-          <max_instances>2</max_instances>
+          <free_slots>41</free_slots>
+          <max_instances>44</max_instances>
           <cores>1</cores>
-          <memory unit="MB">128</memory>
+          <memory unit="MB">192</memory>
           <disk_space unit="GB">2</disk_space>
-          <!-- A request for an instance of this type, added by the user -->
-          <request>
-            <instances>1</instances>
-            <kernel_image id="eki-F26610C6"/>
-            <ramdisk/>
-            <disk_image id="emi-88760F45"/>
-            <keypair>cortex</keypair>
-          </request>
         </vm_type>
         <vm_type name="c1.medium">
-          <free_slots>1</free_slots>
-          <max_instances>2</max_instances>
+          <free_slots>41</free_slots>
+          <max_instances>44</max_instances>
           <cores>1</cores>
           <memory unit="MB">256</memory>
           <disk_space unit="GB">5</disk_space>
+          <request>
+            <instances>1</instances>
+            <bundle>f12-plab</bundle>
+          </request>
         </vm_type>
         <vm_type name="m1.large">
-          <free_slots>0</free_slots>
-          <max_instances>1</max_instances>
+          <free_slots>19</free_slots>
+          <max_instances>22</max_instances>
           <cores>2</cores>
           <memory unit="MB">512</memory>
           <disk_space unit="GB">10</disk_space>
         </vm_type>
         <vm_type name="m1.xlarge">
-          <free_slots>0</free_slots>
-          <max_instances>1</max_instances>
+          <free_slots>19</free_slots>
+          <max_instances>22</max_instances>
           <cores>2</cores>
           <memory unit="MB">1024</memory>
           <disk_space unit="GB">20</disk_space>
         </vm_type>
         <vm_type name="c1.xlarge">
-          <free_slots>0</free_slots>
-          <max_instances>0</max_instances>
+          <free_slots>8</free_slots>
+          <max_instances>11</max_instances>
           <cores>4</cores>
           <memory unit="MB">2048</memory>
           <disk_space unit="GB">20</disk_space>