X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Futil%2Fsfarspec_proc.py;h=e013e1a25f017ad0c612f711850cfd37c609027e;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=d8bb27bdbe1330ff460492d5acde9cca87be3399;hpb=75bccfca03c03ede06d63c061c62cd5416194c42;p=nepi.git

diff --git a/src/nepi/util/sfarspec_proc.py b/src/nepi/util/sfarspec_proc.py
index d8bb27bd..e013e1a2 100644
--- a/src/nepi/util/sfarspec_proc.py
+++ b/src/nepi/util/sfarspec_proc.py
@@ -3,9 +3,8 @@
 #    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.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -168,7 +167,6 @@ class SfaRSpecProcessing(object):
             # TODO: take into account the case where we send a dict of URNs without keys
             #resource['component_id'] = resource.pop('urn')
             resource['component_id'] = urn
-            print resource['component_id']
             resource_hrn, resource_type = urn_to_hrn(resource['component_id'])
             # build component_manager_id
             top_auth = resource_hrn.split('.')[0]
@@ -214,8 +212,8 @@ class SfaRSpecProcessing(object):
             for i, n in enumerate(b):
                 if 'sliver_type name="raw-pc"' in n:
                     b[i] = '<sliver_type name="raw-pc">'
-                    #b.insert(i+1, '<disk_image name="urn:publicid:IDN+wall2.ilabt.iminds.be+image+emulab-ops//%s"/>' % properties['disk_image'])
-                    b.insert(i+1, '<disk_image name="urn:publicid:IDN+wilab2.ilabt.iminds.be+image+nepi:%s"/>' % properties['disk_image'])
+                    b.insert(i+1, '<disk_image name="urn:publicid:IDN+wall2.ilabt.iminds.be+image+emulab-ops//%s"/>' % properties['disk_image'])
+                    #b.insert(i+1, '<disk_image name="urn:publicid:IDN+wilab2.ilabt.iminds.be+image+nepi:%s"/>' % properties['disk_image'])
                     b.insert(i+2, '</sliver_type>')
             string = ''.join(b)
         self._log.debug("request rspec : %s" % string)