X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fexecution%2Fresource.py;h=6a4fd8c06163e91be4329b4cf49237028812a1af;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=88b4156b062725bb312e2b2c3a843be1c1604408;hpb=332038a4a4e7e8c74db87dea003e4c02418175d6;p=nepi.git diff --git a/test/execution/resource.py b/test/execution/resource.py index 88b4156b..6a4fd8c0 100755 --- a/test/execution/resource.py +++ b/test/execution/resource.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 @@ -22,7 +21,7 @@ from nepi.execution.attribute import Attribute from nepi.execution.ec import ExperimentController, FailureLevel from nepi.execution.resource import ResourceManager, ResourceState, \ - clsinit_copy, ResourceAction, failtrap + clsinit_copy, ResourceAction import random import time @@ -53,9 +52,9 @@ class Channel(ResourceManager): def __init__(self, ec, guid): super(Channel, self).__init__(ec, guid) - def deploy(self): + def do_deploy(self): time.sleep(1) - super(Channel, self).deploy() + super(Channel, self).do_deploy() self.logger.debug(" -------- DEPLOYED ------- ") class Interface(ResourceManager): @@ -64,9 +63,9 @@ class Interface(ResourceManager): def __init__(self, ec, guid): super(Interface, self).__init__(ec, guid) - def deploy(self): - node = self.get_connected(Node.rtype())[0] - chan = self.get_connected(Channel.rtype())[0] + def do_deploy(self): + node = self.get_connected(Node.get_rtype())[0] + chan = self.get_connected(Channel.get_rtype())[0] if node.state < ResourceState.PROVISIONED: self.ec.schedule("0.5s", self.deploy) @@ -74,7 +73,7 @@ class Interface(ResourceManager): self.ec.schedule("0.5s", self.deploy) else: time.sleep(2) - super(Interface, self).deploy() + super(Interface, self).do_deploy() self.logger.debug(" -------- DEPLOYED ------- ") class Node(ResourceManager): @@ -83,20 +82,20 @@ class Node(ResourceManager): def __init__(self, ec, guid): super(Node, self).__init__(ec, guid) - def deploy(self): + def do_deploy(self): if self.state == ResourceState.NEW: - self.discover() - self.provision() + self.do_discover() + self.do_provision() self.logger.debug(" -------- PROVISIONED ------- ") self.ec.schedule("1s", self.deploy) elif self.state == ResourceState.PROVISIONED: - ifaces = self.get_connected(Interface.rtype()) + ifaces = self.get_connected(Interface.get_rtype()) for rm in ifaces: if rm.state < ResourceState.READY: self.ec.schedule("0.5s", self.deploy) return - super(Node, self).deploy() + super(Node, self).do_deploy() self.logger.debug(" -------- DEPLOYED ------- ") class Application(ResourceManager): @@ -105,19 +104,19 @@ class Application(ResourceManager): def __init__(self, ec, guid): super(Application, self).__init__(ec, guid) - def deploy(self): - node = self.get_connected(Node.rtype())[0] + def do_deploy(self): + node = self.get_connected(Node.get_rtype())[0] if node.state < ResourceState.READY: self.ec.schedule("0.5s", self.deploy) else: time.sleep(random.random() * 2) - super(Application, self).deploy() + super(Application, self).do_deploy() self.logger.debug(" -------- DEPLOYED ------- ") - def start(self): - super(Application, self).start() + def do_start(self): + super(Application, self).do_start() time.sleep(random.random() * 3) - self._state = ResourceState.FINISHED + self.ec.schedule("0.5s", self.stop) class ErrorApplication(ResourceManager): _rtype = "ErrorApplication" @@ -125,14 +124,13 @@ class ErrorApplication(ResourceManager): def __init__(self, ec, guid): super(ErrorApplication, self).__init__(ec, guid) - @failtrap - def deploy(self): - node = self.get_connected(Node.rtype())[0] + def do_deploy(self): + node = self.get_connected(Node.get_rtype())[0] if node.state < ResourceState.READY: self.ec.schedule("0.5s", self.deploy) else: time.sleep(random.random() * 2) - raise RuntimeError, "NOT A REAL ERROR. JUST TESTING" + raise RuntimeError("NOT A REAL ERROR. JUST TESTING") class ResourceFactoryTestCase(unittest.TestCase): def test_add_resource_factory(self): @@ -142,16 +140,17 @@ class ResourceFactoryTestCase(unittest.TestCase): ResourceFactory.register_type(MyResource) ResourceFactory.register_type(AnotherResource) - self.assertEquals(MyResource.rtype(), "MyResource") - self.assertEquals(len(MyResource._attributes), 2) + # Take into account default 'Critical' attribute + self.assertEqual(MyResource.get_rtype(), "MyResource") + self.assertEqual(len(MyResource._attributes), 3) - self.assertEquals(ResourceManager.rtype(), "Resource") - self.assertEquals(len(ResourceManager._attributes), 1) + self.assertEqual(ResourceManager.get_rtype(), "Resource") + self.assertEqual(len(ResourceManager._attributes), 2) - self.assertEquals(AnotherResource.rtype(), "AnotherResource") - self.assertEquals(len(AnotherResource._attributes), 1) + self.assertEqual(AnotherResource.get_rtype(), "AnotherResource") + self.assertEqual(len(AnotherResource._attributes), 2) - self.assertEquals(len(ResourceFactory.resource_types()), 2) + self.assertEqual(len(ResourceFactory.resource_types()), 2) # restore factory state for other tests from nepi.execution.resource import populate_factory @@ -176,7 +175,7 @@ class ResourceManagerTestCase(unittest.TestCase): for (group, state, time) in conditions: waiting_for.extend(group) - self.assertEquals(waiting_for, [1, 3, 5, 7, 10, 8]) + self.assertEqual(waiting_for, [1, 3, 5, 7, 10, 8]) group = [1, 2, 3, 4, 6] rm.unregister_condition(group) @@ -186,7 +185,7 @@ class ResourceManagerTestCase(unittest.TestCase): for (group, state, time) in conditions: waiting_for.extend(group) - self.assertEquals(waiting_for, [5, 7, 10, 8]) + self.assertEqual(waiting_for, [5, 7, 10, 8]) def test_deploy_in_order(self): """ @@ -245,15 +244,15 @@ class ResourceManagerTestCase(unittest.TestCase): self.assertTrue(rmnode1.ready_time < rmapp1.ready_time) self.assertTrue(rmnode2.ready_time < rmapp2.ready_time) - # - Node needs to wait until Interface is ready to be ready + # - Node needs to wait until Interface is ready to be ready self.assertTrue(rmnode1.ready_time > rmiface1.ready_time) self.assertTrue(rmnode2.ready_time > rmiface2.ready_time) - # - Interface needs to wait until Node is provisioned to be ready + # - Interface needs to wait until Node is provisioned to be ready self.assertTrue(rmnode1.provision_time < rmiface1.ready_time) self.assertTrue(rmnode2.provision_time < rmiface2.ready_time) - # - Interface needs to wait until Channel is ready to be ready + # - Interface needs to wait until Channel is ready to be ready self.assertTrue(rmchan.ready_time < rmiface1.ready_time) self.assertTrue(rmchan.ready_time < rmiface2.ready_time) @@ -270,7 +269,7 @@ class ResourceManagerTestCase(unittest.TestCase): node = ec.register_resource("Node") apps = list() - for i in xrange(1000): + for i in range(1000): app = ec.register_resource("Application") ec.register_connection(app, node) apps.append(app) @@ -281,7 +280,7 @@ class ResourceManagerTestCase(unittest.TestCase): self.assertTrue(ec.state(node) == ResourceState.STARTED) self.assertTrue( - all([ec.state(guid) == ResourceState.FINISHED \ + all([ec.state(guid) == ResourceState.STOPPED \ for guid in apps]) ) @@ -293,7 +292,6 @@ class ResourceManagerTestCase(unittest.TestCase): ResourceFactory.register_type(ErrorApplication) ResourceFactory.register_type(Node) ResourceFactory.register_type(Interface) - ResourceFactory.register_type(Channel) ec = ExperimentController() @@ -301,7 +299,6 @@ class ResourceManagerTestCase(unittest.TestCase): app = ec.register_resource("ErrorApplication") ec.register_connection(app, node) - apps.append(app) ec.deploy() @@ -309,16 +306,110 @@ class ResourceManagerTestCase(unittest.TestCase): ec.shutdown() - self.assertTrue(ec._fm._failure_level == FailureLevel.RM_FAILURE) + self.assertEqual(ec._fm._failure_level, FailureLevel.RM_FAILURE) + def test_critical(self): + from nepi.execution.resource import ResourceFactory + + ResourceFactory.register_type(ErrorApplication) + ResourceFactory.register_type(Application) + ResourceFactory.register_type(Node) + ResourceFactory.register_type(Interface) - def ztest_start_with_condition(self): - # TODO!!! - pass - - def ztest_stop_with_condition(self): - # TODO!!! - pass + ec = ExperimentController() + + node = ec.register_resource("Node") + + apps = list() + + eapp = ec.register_resource("ErrorApplication") + ec.set(eapp, "critical", False) + ec.register_connection(eapp, node) + apps.append(eapp) + + for i in range(10): + app = ec.register_resource("Application") + ec.register_connection(app, node) + apps.append(app) + + ec.deploy() + + ec.wait_finished(apps) + + state = ec.state(eapp) + self.assertEqual(state, ResourceState.FAILED) + + apps.remove(eapp) + + for app in apps: + state = ec.state(app) + self.assertEqual(state, ResourceState.STOPPED) + + ec.shutdown() + + self.assertEqual(ec._fm._failure_level, FailureLevel.OK) + + def test_start_with_condition(self): + from nepi.execution.resource import ResourceFactory + + ResourceFactory.register_type(Application) + ResourceFactory.register_type(Node) + ResourceFactory.register_type(Interface) + + ec = ExperimentController() + + node = ec.register_resource("Node") + + app1 = ec.register_resource("Application") + ec.register_connection(app1, node) + + app2 = ec.register_resource("Application") + ec.register_connection(app2, node) + + ec.register_condition(app2, ResourceAction.START, app1, + ResourceState.STARTED, time = "5s") + + ec.deploy() + + ec.wait_finished([app1, app2]) + + rmapp1 = ec.get_resource(app1) + rmapp2 = ec.get_resource(app2) + + self.assertTrue(rmapp2.start_time > rmapp1.start_time) + + ec.shutdown() + + def test_stop_with_condition(self): + from nepi.execution.resource import ResourceFactory + + ResourceFactory.register_type(Application) + ResourceFactory.register_type(Node) + ResourceFactory.register_type(Interface) + + ec = ExperimentController() + + node = ec.register_resource("Node") + + app1 = ec.register_resource("Application") + ec.register_connection(app1, node) + + app2 = ec.register_resource("Application") + ec.register_connection(app2, node) + + ec.register_condition(app2, ResourceAction.START, app1, + ResourceState.STOPPED) + + ec.deploy() + + ec.wait_finished([app1, app2]) + + rmapp1 = ec.get_resource(app1) + rmapp2 = ec.get_resource(app2) + + self.assertTrue(rmapp2.start_time > rmapp1.stop_time) + + ec.shutdown() def ztest_set_with_condition(self): # TODO!!!