git://git.onelab.eu / nepi.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
replacing assertEquals into assertEqual
[nepi.git] / test / resources / omf / wilab_node.py
diff --git a/test/resources/omf/wilab_node.py b/test/resources/omf/wilab_node.py
index 5bca969..132ceb8 100755 (executable)
--- a/test/resources/omf/wilab_node.py
+++ b/test/resources/omf/wilab_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
@@ -35,8 +34,8 @@ class DummyEC(ExperimentController):
 class WilabtSfaNodeFactoryTestCase(unittest.TestCase):
 
     def test_creation_phase(self):
-        self.assertEquals(WilabtSfaNode._rtype, "WilabtSfaNode")
-        self.assertEquals(len(WilabtSfaNode._attributes), 17)
+        self.assertEqual(WilabtSfaNode._rtype, "WilabtSfaNode")
+        self.assertEqual(len(WilabtSfaNode._attributes), 17)
 
 class WilabtSfaNodeTestCase(unittest.TestCase):
     """
@@ -48,9 +47,10 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
 
     def setUp(self):
         self.ec = DummyEC()
-        slicepl = os.environ.get('SFA_SLICE')
-        slicename = ['ple'] + slicepl.split('_')
-        self.slicename = '.'.join(slicename)
+        #slicepl = os.environ.get('SFA_SLICE')
+        #slicename = ['ple'] + slicepl.split('_')
+        #self.slicename = '.'.join(slicename)
+        self.slicename = os.environ.get('SFA_SLICE')
         self.sfauser = os.environ.get('SFA_USER')
         self.sfaPrivateKey = os.environ.get('SFA_PK')
         
@@ -62,14 +62,12 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
         the same credentials, the same object of the api is used.
         """
         node1 = self.ec.register_resource("WilabtSfaNode")
-        self.ec.set(node1, "hostname", "zotacB5")
+        self.ec.set(node1, "host", "zotacE5")
         self.ec.set(node1, "slicename", self.slicename)
         self.ec.set(node1, "sfauser", self.sfauser)
         self.ec.set(node1, "sfaPrivateKey", self.sfaPrivateKey)
         self.ec.set(node1, "gatewayUser", "nepi")
         self.ec.set(node1, "gateway", "bastion.test.iminds.be")
-        self.ec.set(node1, "cleanHome", True)
-        self.ec.set(node1, "cleanProcesses", True)
 
         wnode_rm1 = self.ec.get_resource(node1)
 
@@ -77,22 +75,20 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
 
         api1 = wnode_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("WilabtSfaNode")
-        self.ec.set(node2, "hostname", "zotacM20")
+        self.ec.set(node2, "host", "zotacM20")
         self.ec.set(node2, "slicename", self.slicename)
         self.ec.set(node2, "sfauser", self.sfauser)
         self.ec.set(node2, "sfaPrivateKey", self.sfaPrivateKey)
         self.ec.set(node1, "gatewayUser", "nepi")
         self.ec.set(node1, "gateway", "bastion.test.iminds.be")
-        self.ec.set(node1, "cleanHome", True)
-        self.ec.set(node1, "cleanProcesses", True)
 
         wnode_rm2 = self.ec.get_resource(node2)
         api2 = wnode_rm2.sfaapi
-        self.assertEquals(api1, api2)
+        self.assertEqual(api1, api2)
 
         wnode_rm1.sfaapi._reserved = set()
         wnode_rm1.sfaapi._blacklist = set()
@@ -103,25 +99,23 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
         Check that the method do_discover reserve the right node.
         """
         node1 = self.ec.register_resource("WilabtSfaNode")
-        self.ec.set(node1, "hostname", "zotacB5")
+        self.ec.set(node1, "host", "zotacE5")
         self.ec.set(node1, "slicename", self.slicename)
         self.ec.set(node1, "sfauser", self.sfauser)
         self.ec.set(node1, "sfaPrivateKey", self.sfaPrivateKey)
         self.ec.set(node1, "gatewayUser", "nepi")
         self.ec.set(node1, "gateway", "bastion.test.iminds.be")
-        self.ec.set(node1, "cleanHome", True)
-        self.ec.set(node1, "cleanProcesses", True)
 
         wnode_rm = self.ec.get_resource(node1)
        
-        hostname = wnode_rm.get("hostname")
-        self.assertIsNotNone(hostname)
+        host = wnode_rm.get("host")
+        self.assertIsNotNone(host)
 
-        self.assertEquals(wnode_rm.sfaapi._reserved, set())
+        self.assertEqual(wnode_rm.sfaapi._reserved, set())
 
         wnode_rm.do_discover()
-        self.assertEquals(len(wnode_rm.sfaapi._reserved), 1)
-        self.assertEquals(wnode_rm._node_to_provision, 'wilab2.ilabt.iminds.be.zotacB5')
+        self.assertEqual(len(wnode_rm.sfaapi._reserved), 1)
+        self.assertEqual(wnode_rm._node_to_provision, 'wilab2.ilabt.iminds.be.zotacE5')
 
         wnode_rm.sfaapi._reserved = set()
         wnode_rm.sfaapi._blacklist = set()
@@ -133,31 +127,30 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
         its well functioning.
         """
         node = self.ec.register_resource("WilabtSfaNode")
-        self.ec.set(node, "hostname", "zotacB5")
+        self.ec.set(node, "host", "zotacE5")
         self.ec.set(node, "slicename", self.slicename)
         self.ec.set(node, "sfauser", self.sfauser)
         self.ec.set(node, "sfaPrivateKey", self.sfaPrivateKey)
         self.ec.set(node, "gatewayUser", "nepi")
         self.ec.set(node, "gateway", "bastion.test.iminds.be")
-        self.ec.set(node, "cleanHome", True)
-        self.ec.set(node, "cleanProcesses", True)
 
         wnode_rm = self.ec.get_resource(node)
 
-        self.assertEquals(wnode_rm.sfaapi._reserved, set())
+        self.assertEqual(wnode_rm.sfaapi._reserved, set())
         self.assertIsNone(wnode_rm._node_to_provision)
 
         wnode_rm.do_discover()
-        with self.assertRaises(RuntimeError):
-            wnode_rm.do_provision()
+        #with self.assertRaises(RuntimeError):
+        #    wnode_rm.do_provision()
+        wnode_rm.do_provision()
 
         if not self.ec.abort and self.ec.state(node) > 2:
             cmd = 'echo "IT WORKED"'
             ((out, err), proc) = wnode_rm.execute(cmd)
-            self.assertEquals(out.strip(), "IT WORKED")
+            self.assertEqual(out.strip(), "IT WORKED")
 
-        wnode_rm.sfaapi._reserved = set()
-        wnode_rm.sfaapi._blacklist = set()
+        #wnode_rm.sfaapi._reserved = set()
+        #wnode_rm.sfaapi._blacklist = set()
 
         self.ec.shutdown()
 
@@ -167,14 +160,12 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
         Test deploy 1 node.
         """
         node = self.ec.register_resource("WilabtSfaNode")
-        self.ec.set(node, "hostname", "zotacM20")
+        self.ec.set(node, "host", "zotacM20")
         self.ec.set(node, "slicename", self.slicename)
         self.ec.set(node, "sfauser", self.sfauser)
         self.ec.set(node, "sfaPrivateKey", self.sfaPrivateKey)
         self.ec.set(node, "gatewayUser", "nepi")
         self.ec.set(node, "gateway", "bastion.test.iminds.be")
-        self.ec.set(node, "cleanHome", True)
-        self.ec.set(node, "cleanProcesses", True)
 
         self.ec.deploy()
         self.ec.wait_deployed(node)
@@ -194,24 +185,20 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
         Test deploy 2 nodes.
         """
         node1 = self.ec.register_resource("WilabtSfaNode")
-        self.ec.set(node1, "hostname", "zotacB5")
+        self.ec.set(node1, "host", "zotacE3")
         self.ec.set(node1, "slicename", self.slicename)
         self.ec.set(node1, "sfauser", self.sfauser)
         self.ec.set(node1, "sfaPrivateKey", self.sfaPrivateKey)
         self.ec.set(node1, "gatewayUser", "nepi")
         self.ec.set(node1, "gateway", "bastion.test.iminds.be")
-        self.ec.set(node1, "cleanHome", True)
-        self.ec.set(node1, "cleanProcesses", True)
 
         node2 = self.ec.register_resource("WilabtSfaNode")
-        self.ec.set(node2, "hostname", "zotacM20")
+        self.ec.set(node2, "host", "zotacM20")
         self.ec.set(node2, "slicename", self.slicename)
         self.ec.set(node2, "sfauser", self.sfauser)
         self.ec.set(node2, "sfaPrivateKey", self.sfaPrivateKey)
         self.ec.set(node2, "gatewayUser", "nepi")
         self.ec.set(node2, "gateway", "bastion.test.iminds.be")
-        self.ec.set(node2, "cleanHome", True)
-        self.ec.set(node2, "cleanProcesses", True)
 
         self.ec.deploy()
         self.ec.wait_deployed([node1, node2])
@@ -233,32 +220,28 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
         Test deploy 2 nodes, already in the slice.
         """
         node1 = self.ec.register_resource("WilabtSfaNode")
-        self.ec.set(node1, "hostname", "zotacM20")
+        self.ec.set(node1, "host", "zotacM20")
         self.ec.set(node1, "slicename", self.slicename)
         self.ec.set(node1, "sfauser", self.sfauser)
         self.ec.set(node1, "sfaPrivateKey", self.sfaPrivateKey)
         self.ec.set(node1, "gatewayUser", "nepi")
         self.ec.set(node1, "gateway", "bastion.test.iminds.be")
-        self.ec.set(node1, "cleanHome", True)
-        self.ec.set(node1, "cleanProcesses", True)
 
         node2 = self.ec.register_resource("WilabtSfaNode")
-        self.ec.set(node2, "hostname", "zotacB5")
+        self.ec.set(node2, "host", "zotacE3")
         self.ec.set(node2, "slicename", self.slicename)
         self.ec.set(node2, "sfauser", self.sfauser)
         self.ec.set(node2, "sfaPrivateKey", self.sfaPrivateKey)
         self.ec.set(node2, "gatewayUser", "nepi")
         self.ec.set(node2, "gateway", "bastion.test.iminds.be")
-        self.ec.set(node2, "cleanHome", True)
-        self.ec.set(node2, "cleanProcesses", True)
 
         self.ec.deploy()
         self.ec.wait_deployed([node1, node2])
         state1 = self.ec.state(node1)
         state2 = self.ec.state(node2)
         if not self.ec.abort:
-            self.assertEquals(state1, (3, 4))
-            self.assertEquals(state2, (3, 4))
+            self.assertEqual(state1, (3, 4))
+            self.assertEqual(state2, (3, 4))
 
         self.ec.shutdown() 
 
nepi