X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fplanetlab%2Fnode.py;h=57146453058120853f4366ee99418c86033bb3ee;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=6599a2b7ea8b3ba006648df39e30a384ebfb6468;hpb=64d23d71a2a30b0b77fe97597b26813f3d94d5f8;p=nepi.git diff --git a/test/resources/planetlab/node.py b/test/resources/planetlab/node.py index 6599a2b7..57146453 100755 --- a/test/resources/planetlab/node.py +++ b/test/resources/planetlab/node.py @@ -4,9 +4,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 @@ -38,7 +37,7 @@ def create_node(ec, username, pl_user=None, pl_password=None, pl_url=None, minBandwidth=None, minCpu=None, architecture=None, city=None, ip=None): - node = ec.register_resource("PlanetlabNode") + node = ec.register_resource("planetlab::Node") if username: ec.set(node, "username", username) @@ -66,7 +65,7 @@ def create_node(ec, username, pl_user=None, pl_password=None, pl_url=None, if ip: ec.set(node, "ip", ip) - ec.set(node, "cleanHome", True) + ec.set(node, "cleanExperiment", True) ec.set(node, "cleanProcesses", True) return node @@ -74,7 +73,7 @@ def create_node(ec, username, pl_user=None, pl_password=None, pl_url=None, class PLNodeFactoryTestCase(unittest.TestCase): def test_creation_phase(self): - self.assertEquals(PlanetlabNode._rtype, "PlanetlabNode") + self.assertEquals(PlanetlabNode._rtype, "planetlab::Node") self.assertEquals(len(PlanetlabNode._attributes), 32) class PLNodeTestCase(unittest.TestCase):