--- ea/submit_sites.py	2012/08/31 10:40:38	10
+++ ea/submit_sites.py	2012/10/09 16:17:03	18
@@ -1,66 +1,67 @@
-#
-# BonFIRE Virtual Clusters on Federated Clouds Demonstration Kit
-#
-# Copyright (c) Fundacion Centro Tecnologico de Supercomputacion de Galicia 2012
-# 
-# License GPL Version 3
-#
-# The research leading to these results has received funding from 
-# the European Community's Seventh Framework Programme (FP7/2007-2013) 
-# under agreement number 257386
-#
-# This software is provided with ABSOLUTELY NO WARRANTY
-# 
-'''
-Created on 22/02/2012
-
-@author: R. Valin
-Envio a todos los sites
-'''
-#import matplotlib.pyplot as plt
-import time
-#import os
-import random
-#from exp.ea 
-import experiment_type as expt
-#from exp.ea
-import ea_bonfire as ea
-
-
-
-"""################################################################
-# Envio de experimentos                                           #
-###################################################################"""
-#Descripcion del trabajo en Json
-exp={'description': 'Experiment description',
-     'duration': 120,
-     'name': 'My Experiment',
-     'resources': [{'compute': {'name': 'JSON-COMPUTE-TEST',
-                                'description': 'A description of the compute.',
-                                'instanceType': 'small',
-                                'locations': ['fr-inria'],
-                                'resources':[{'storage': '@BonFIRE Debian Squeeze v3'},{'network':'@BonFIRE WAN'}]}}]}
-
-
-
-
-#Indicamos la lista de sites a la que queremos enviar, la duracion de los experimentos
-# y nos devuelve una lista con stings en json con la definicion del experimento 
-locations=['be-ibbt','fr-inria','uk-hplabs','uk-epcc']
-
-duration = 120
-locations = ['fr-inria']
-exp, info_instance, info_storage, info_location = expt.json_exp(locations, duration)
-
-multi = 10
-
-for i in exp:
-    print i
-    m=str(i)
-    for j in range(10):
-        #save(locations)
-        location=info_location[m]
-        instance=info_instance[m]
-        store=info_storage[m]
-        ea.ea_bf(i,instance,store,location)
-        #time.sleep(float(130))
+#
+# BonFIRE Virtual Clusters on Federated Clouds Demonstration Kit
+#
+# Copyright (c) Fundacion Centro Tecnologico de Supercomputacion de Galicia 2012
+# 
+# License Apache Software
+#
+# The research leading to these results has received funding from 
+# the European Community's Seventh Framework Programme (FP7/2007-2013) 
+# under agreement number 257386
+#
+# This software is provided with ABSOLUTELY NO WARRANTY
+# 
+'''
+Created on 22/02/2012
+
+@author: R. Valin
+Envio a todos los sites
+'''
+#import matplotlib.pyplot as plt
+import time
+#import os
+import random
+#from exp.ea 
+import experiment_type as expt
+#from exp.ea
+import ea_bonfire as ea
+
+
+
+"""################################################################
+# Submisson of experiments                                   #
+###################################################################"""
+#Json description
+exp={'description': 'Experiment description',
+     'duration': 120,
+     'name': 'My Experiment',
+     'resources': [{'compute': {'name': 'JSON-COMPUTE-TEST',
+                                'description': 'A description of the compute.',
+                                'instanceType': 'small',
+                                'locations': ['fr-inria'],
+                                'resources':[{'storage': '@BonFIRE Debian Squeeze v3'},{'network':'@BonFIRE WAN'}]}}]}
+
+
+
+
+#List of sites where the experiments can be send and the maximum time.
+
+locations=['be-ibbt','fr-inria','uk-hplabs','uk-epcc']
+
+duration = 120
+locations = ['fr-inria']
+# Get a JSON string with the experiment definition for these locations and times.
+exp, info_instance, info_storage, info_location = expt.json_exp(locations, duration)
+
+multi = 10
+
+for i in exp:
+    print i
+    m=str(i)
+    for j in range(10):
+        #save(locations)
+        location=info_location[m]
+        instance=info_instance[m]
+        store=info_storage[m]
+        ea.ea_bf(i,instance,store,location)
+        #time.sleep(float(130))