X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Flinux%2Fscalability.py;h=0972961e4b25becf9d9dd96189af914f0a906a32;hb=9787d4609a6ffd444a2f318772406f5b30df9b30;hp=903e6b9aa9b2288519414660e0503586c4b98339;hpb=eb111746f316ddd70f6eed77e432151c8ab96fe6;p=nepi.git

diff --git a/examples/linux/scalability.py b/examples/linux/scalability.py
old mode 100644
new mode 100755
index 903e6b9a..0972961e
--- a/examples/linux/scalability.py
+++ b/examples/linux/scalability.py
@@ -1,7 +1,25 @@
 #!/usr/bin/env python
+#
+#    NEPI, a framework to manage network experiments
+#    Copyright (C) 2013 INRIA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
+
 from nepi.execution.ec import ExperimentController, ECState 
-from nepi.execution.resource import ResourceState, ResourceAction, \
-        populate_factory
+from nepi.execution.resource import ResourceState, ResourceAction
 
 from optparse import OptionParser, SUPPRESS_HELP
 
@@ -39,13 +57,10 @@ def get_options():
 if __name__ == '__main__':
     ( pl_slice, exp_id ) = get_options()
 
-    # Search for available RMs
-    populate_factory()
-    
     apps = []
   
     hostnames = [
-             "planetlab-2.research.netlab.hut.fi",
+             #"planetlab-2.research.netlab.hut.fi",
              "planetlab2.willab.fi",
              "planetlab3.hiit.fi",
              "planetlab4.hiit.fi",
@@ -55,12 +70,12 @@ if __name__ == '__main__':
              "planetlab-1.ida.liu.se",
              "planetlab2.s3.kth.se",
              "planetlab1.sics.se",
-             "planetlab1.tlm.unavarra.es",
-             "planetlab2.uc3m.es",
-             "planetlab1.uc3m.es",
-             "planetlab2.um.es",
+             #"planetlab1.tlm.unavarra.es",
+             #"planetlab2.uc3m.es",
+             #"planetlab1.uc3m.es",
+             #"planetlab2.um.es",
              "planet1.servers.ua.pt",
-             "planetlab2.fct.ualg.pt",
+             #"planetlab2.fct.ualg.pt",
              "planetlab-1.tagus.ist.utl.pt",
              "planetlab-2.tagus.ist.utl.pt",
              "planetlab-um00.di.uminho.pt",
@@ -71,9 +86,9 @@ if __name__ == '__main__':
              "planetlab1.pjwstk.edu.pl",
              "ple2.tu.koszalin.pl",
              "planetlab2.ci.pwr.wroc.pl",
-             "planetlab2.cyfronet.pl",
+             #"planetlab2.cyfronet.pl",
              "plab2.ple.silweb.pl",
-             "planetlab1.cyfronet.pl",
+             #"planetlab1.cyfronet.pl",
              "plab4.ple.silweb.pl",
              "ple2.dmcs.p.lodz.pl",
              "planetlab2.pjwstk.edu.pl",
@@ -83,14 +98,14 @@ if __name__ == '__main__':
              "planetlab-1.ing.unimo.it",
              "gschembra4.diit.unict.it",
              "iraplab1.iralab.uni-karlsruhe.de",
-             "planetlab-1.fokus.fraunhofer.de",
+             #"planetlab-1.fokus.fraunhofer.de",
              "iraplab2.iralab.uni-karlsruhe.de",
              "planet2.zib.de",
-             "pl2.uni-rostock.de",
+             #"pl2.uni-rostock.de",
              "onelab-1.fhi-fokus.de",
              "planet2.l3s.uni-hannover.de",
              "planetlab1.exp-math.uni-essen.de",
-             "planetlab-2.fokus.fraunhofer.de",
+             #"planetlab-2.fokus.fraunhofer.de",
              "planetlab02.tkn.tu-berlin.de",
              "planetlab1.informatik.uni-goettingen.de",
              "planetlab1.informatik.uni-erlangen.de",
@@ -129,7 +144,7 @@ if __name__ == '__main__':
              "orval.infonet.fundp.ac.be",
              "rochefort.infonet.fundp.ac.be",
             ]
- 
+
     ec = ExperimentController(exp_id = exp_id)
 
     for host in hostnames: