replacing assertEquals into assertEqual

[nepi.git] / test / resources / planetlab / sfa_node.py

diff --git a/test/resources/planetlab/sfa_node.py b/test/resources/planetlab/sfa_node.py
index 691e84d..d712de3 100755 (executable)
--- a/test/resources/planetlab/sfa_node.py
+++ b/test/resources/planetlab/sfa_node.py
@@ -4,9 +4,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    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
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -37,8 +36,8 @@ class DummyEC(ExperimentController):
 class PLSfaNodeFactoryTestCase(unittest.TestCase):
 
     def test_creation_phase(self):
 class PLSfaNodeFactoryTestCase(unittest.TestCase):
 
     def test_creation_phase(self):

-        self.assertEquals(PlanetlabSfaNode._rtype, "PlanetlabSfaNode")
-        self.assertEquals(len(PlanetlabSfaNode._attributes), 31)
+        self.assertEqual(PlanetlabSfaNode._rtype, "planetlab::sfa::Node")
+        self.assertEqual(len(PlanetlabSfaNode._attributes), 31)

 
 class PLSfaNodeTestCase(unittest.TestCase):
     """
 
 class PLSfaNodeTestCase(unittest.TestCase):
     """


@@ -50,7 +49,7 @@ class PLSfaNodeTestCase(unittest.TestCase):
 
     def setUp(self):
         self.ec = DummyEC()
 
     def setUp(self):
         self.ec = DummyEC()

-        self.username = os.environ.get('SFA_SLICE')
+        self.username = 'inria_lguevgeo'

         self.sfauser = os.environ.get('SFA_USER')
         self.sfaPrivateKey = os.environ.get('SFA_PK')
         
         self.sfauser = os.environ.get('SFA_USER')
         self.sfaPrivateKey = os.environ.get('SFA_PK')
         


@@ -61,7 +60,7 @@ class PLSfaNodeTestCase(unittest.TestCase):
         instanciated, and is an instance of SFAAPI. Check that using
         the same credentials, the same object of the api is used.
         """
         instanciated, and is an instance of SFAAPI. Check that using
         the same credentials, the same object of the api is used.
         """

-        node1 = self.ec.register_resource("PlanetlabSfaNode")
+        node1 = self.ec.register_resource("planetlab::sfa::Node")

         self.ec.set(node1, "hostname", "planetlab2.ionio.gr")
         self.ec.set(node1, "username", self.username)
         self.ec.set(node1, "sfauser", self.sfauser)
         self.ec.set(node1, "hostname", "planetlab2.ionio.gr")
         self.ec.set(node1, "username", self.username)
         self.ec.set(node1, "sfauser", self.sfauser)


@@ -73,10 +72,10 @@ class PLSfaNodeTestCase(unittest.TestCase):
 
         api1 = plnode_rm1.sfaapi
         self.assertIsInstance(api1, SFAAPI)
 
         api1 = plnode_rm1.sfaapi
         self.assertIsInstance(api1, SFAAPI)

-        self.assertEquals(len(api1._reserved), 0)
-        self.assertEquals(len(api1._blacklist), 0)
+        self.assertEqual(len(api1._reserved), 0)
+        self.assertEqual(len(api1._blacklist), 0)

 
 

-        node2 = self.ec.register_resource("PlanetlabSfaNode")
+        node2 = self.ec.register_resource("planetlab::sfa::Node")

         self.ec.set(node2, "hostname", "planetlab2.ionio.gr")
         self.ec.set(node2, "username", self.username)
         self.ec.set(node2, "sfauser", self.sfauser)
         self.ec.set(node2, "hostname", "planetlab2.ionio.gr")
         self.ec.set(node2, "username", self.username)
         self.ec.set(node2, "sfauser", self.sfauser)


@@ -84,14 +83,14 @@ class PLSfaNodeTestCase(unittest.TestCase):
 
         plnode_rm2 = self.ec.get_resource(node2)
         api2 = plnode_rm2.sfaapi
 
         plnode_rm2 = self.ec.get_resource(node2)
         api2 = plnode_rm2.sfaapi

-        self.assertEquals(api1, api2)
+        self.assertEqual(api1, api2)

     
     @skipIfNotSfaCredentials
     def test_discover(self):
         """
         Check that the method do_discover reserve the right node.
         """
     
     @skipIfNotSfaCredentials
     def test_discover(self):
         """
         Check that the method do_discover reserve the right node.
         """

-        node = self.ec.register_resource("PlanetlabSfaNode")
+        node = self.ec.register_resource("planetlab::sfa::Node")

         self.ec.set(node, "hostname", "roti.mimuw.edu.pl")
         self.ec.set(node, "username", self.username)
         self.ec.set(node, "sfauser", self.sfauser)
         self.ec.set(node, "hostname", "roti.mimuw.edu.pl")
         self.ec.set(node, "username", self.username)
         self.ec.set(node, "sfauser", self.sfauser)


@@ -102,12 +101,12 @@ class PLSfaNodeTestCase(unittest.TestCase):
         hostname = plnode_rm.get("hostname")
         self.assertIsNotNone(hostname)
 
         hostname = plnode_rm.get("hostname")
         self.assertIsNotNone(hostname)
 

-        self.assertEquals(len(plnode_rm.sfaapi._reserved), 0)
+        self.assertEqual(len(plnode_rm.sfaapi._reserved), 0)

 
         plnode_rm.do_discover()
 
 
         plnode_rm.do_discover()
 

-        self.assertEquals(len(plnode_rm.sfaapi._reserved), 1)
-        self.assertEquals(plnode_rm._node_to_provision, 'ple.mimuw.roti.mimuw.edu.pl')
+        self.assertEqual(len(plnode_rm.sfaapi._reserved), 1)
+        self.assertEqual(plnode_rm._node_to_provision, 'ple.mimuw.roti.mimuw.edu.pl')

         plnode_rm.sfaapi._reserved = set()
         plnode_rm.sfaapi._blacklist = set()
 
         plnode_rm.sfaapi._reserved = set()
         plnode_rm.sfaapi._blacklist = set()
 


@@ -117,7 +116,7 @@ class PLSfaNodeTestCase(unittest.TestCase):
         This test checks that the method do_provision add the node in the slice and check
         its well functioning.
         """
         This test checks that the method do_provision add the node in the slice and check
         its well functioning.
         """

-        node = self.ec.register_resource("PlanetlabSfaNode")
+        node = self.ec.register_resource("planetlab::sfa::Node")

         self.ec.set(node, "hostname", "planetlab2.ionio.gr")
         self.ec.set(node, "username", self.username)
         self.ec.set(node, "sfauser", self.sfauser)
         self.ec.set(node, "hostname", "planetlab2.ionio.gr")
         self.ec.set(node, "username", self.username)
         self.ec.set(node, "sfauser", self.sfauser)


@@ -125,7 +124,7 @@ class PLSfaNodeTestCase(unittest.TestCase):
 
         plnode_rm = self.ec.get_resource(node)
 
 
         plnode_rm = self.ec.get_resource(node)
 

-        self.assertEquals(plnode_rm.sfaapi._reserved, set())
+        self.assertEqual(plnode_rm.sfaapi._reserved, set())

         self.assertIsNone(plnode_rm._node_to_provision)
 
         plnode_rm.do_discover()
         self.assertIsNone(plnode_rm._node_to_provision)
 
         plnode_rm.do_discover()


@@ -133,7 +132,7 @@ class PLSfaNodeTestCase(unittest.TestCase):
 
         cmd = 'echo "IT WORKED"'
         ((out, err), proc) = plnode_rm.execute(cmd)
 
         cmd = 'echo "IT WORKED"'
         ((out, err), proc) = plnode_rm.execute(cmd)

-        self.assertEquals(out.strip(), "IT WORKED")
+        self.assertEqual(out.strip(), "IT WORKED")

 
         plnode_rm.sfaapi._reserved = set()
         plnode_rm.sfaapi._blacklist = set()
 
         plnode_rm.sfaapi._reserved = set()
         plnode_rm.sfaapi._blacklist = set()


@@ -143,7 +142,7 @@ class PLSfaNodeTestCase(unittest.TestCase):
         """
         Test deploy 1 node.
         """
         """
         Test deploy 1 node.
         """

-        node = self.ec.register_resource("PlanetlabSfaNode")
+        node = self.ec.register_resource("planetlab::sfa::Node")

         self.ec.set(node, "hostname", "planetlab2.ionio.gr")
         self.ec.set(node, "username", self.username)
         self.ec.set(node, "sfauser", self.sfauser)
         self.ec.set(node, "hostname", "planetlab2.ionio.gr")
         self.ec.set(node, "username", self.username)
         self.ec.set(node, "sfauser", self.sfauser)


@@ -164,13 +163,13 @@ class PLSfaNodeTestCase(unittest.TestCase):
         """
         Test deploy 2 nodes. Empty slice.
         """
         """
         Test deploy 2 nodes. Empty slice.
         """

-        node1 = self.ec.register_resource("PlanetlabSfaNode")
+        node1 = self.ec.register_resource("planetlab::sfa::Node")

         self.ec.set(node1, "hostname", "planetlab3.xeno.cl.cam.ac.uk")
         self.ec.set(node1, "username", self.username)
         self.ec.set(node1, "sfauser", self.sfauser)
         self.ec.set(node1, "sfaPrivateKey", self.sfaPrivateKey)
 
         self.ec.set(node1, "hostname", "planetlab3.xeno.cl.cam.ac.uk")
         self.ec.set(node1, "username", self.username)
         self.ec.set(node1, "sfauser", self.sfauser)
         self.ec.set(node1, "sfaPrivateKey", self.sfaPrivateKey)
 

-        node2 = self.ec.register_resource("PlanetlabSfaNode")
+        node2 = self.ec.register_resource("planetlab::sfa::Node")

         self.ec.set(node2, "hostname", "planetlab1.cs.vu.nl")
         self.ec.set(node2, "username", self.username)
         self.ec.set(node2, "sfauser", self.sfauser)
         self.ec.set(node2, "hostname", "planetlab1.cs.vu.nl")
         self.ec.set(node2, "username", self.username)
         self.ec.set(node2, "sfauser", self.sfauser)


@@ -196,13 +195,13 @@ class PLSfaNodeTestCase(unittest.TestCase):
         """
         Test deploy 2 nodes, already in the slice.
         """
         """
         Test deploy 2 nodes, already in the slice.
         """

-        node1 = self.ec.register_resource("PlanetlabSfaNode")
+        node1 = self.ec.register_resource("planetlab::sfa::Node")

         self.ec.set(node1, "hostname", "planetlab3.xeno.cl.cam.ac.uk")
         self.ec.set(node1, "username", self.username)
         self.ec.set(node1, "sfauser", self.sfauser)
         self.ec.set(node1, "sfaPrivateKey", self.sfaPrivateKey)
 
         self.ec.set(node1, "hostname", "planetlab3.xeno.cl.cam.ac.uk")
         self.ec.set(node1, "username", self.username)
         self.ec.set(node1, "sfauser", self.sfauser)
         self.ec.set(node1, "sfaPrivateKey", self.sfaPrivateKey)
 

-        node2 = self.ec.register_resource("PlanetlabSfaNode")
+        node2 = self.ec.register_resource("planetlab::sfa::Node")

         self.ec.set(node2, "hostname", "planetlab1.cs.vu.nl")
         self.ec.set(node2, "username", self.username)
         self.ec.set(node2, "sfauser", self.sfauser)
         self.ec.set(node2, "hostname", "planetlab1.cs.vu.nl")
         self.ec.set(node2, "username", self.username)
         self.ec.set(node2, "sfauser", self.sfauser)