X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fexecution%2Fresource.py;h=0945e9b5eff5e1fc956ccb7b0a94b57236557ef9;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=2aaa4b973656edba2d9d49f9ee11c38a36370697;hpb=09ac796bac9aa2c41c5ad830f404fe128fffb22d;p=nepi.git diff --git a/test/execution/resource.py b/test/execution/resource.py index 2aaa4b97..0945e9b5 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 @@ -65,8 +64,8 @@ class Interface(ResourceManager): super(Interface, self).__init__(ec, guid) def do_deploy(self): - node = self.get_connected(Node.rtype())[0] - chan = self.get_connected(Channel.rtype())[0] + 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) @@ -90,7 +89,7 @@ class Node(ResourceManager): 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) @@ -106,7 +105,7 @@ class Application(ResourceManager): super(Application, self).__init__(ec, guid) def do_deploy(self): - node = self.get_connected(Node.rtype())[0] + node = self.get_connected(Node.get_rtype())[0] if node.state < ResourceState.READY: self.ec.schedule("0.5s", self.deploy) else: @@ -117,7 +116,7 @@ class Application(ResourceManager): def do_start(self): super(Application, self).do_start() time.sleep(random.random() * 3) - self.ec.schedule("0.5s", self.finish) + self.ec.schedule("0.5s", self.stop) class ErrorApplication(ResourceManager): _rtype = "ErrorApplication" @@ -126,12 +125,12 @@ class ErrorApplication(ResourceManager): super(ErrorApplication, self).__init__(ec, guid) def do_deploy(self): - node = self.get_connected(Node.rtype())[0] + 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): @@ -141,14 +140,15 @@ 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.assertEquals(MyResource.get_rtype(), "MyResource") + self.assertEquals(len(MyResource._attributes), 3) - self.assertEquals(ResourceManager.rtype(), "Resource") - self.assertEquals(len(ResourceManager._attributes), 1) + self.assertEquals(ResourceManager.get_rtype(), "Resource") + self.assertEquals(len(ResourceManager._attributes), 2) - self.assertEquals(AnotherResource.rtype(), "AnotherResource") - self.assertEquals(len(AnotherResource._attributes), 1) + self.assertEquals(AnotherResource.get_rtype(), "AnotherResource") + self.assertEquals(len(AnotherResource._attributes), 2) self.assertEquals(len(ResourceFactory.resource_types()), 2) @@ -280,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]) ) @@ -292,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() @@ -307,16 +306,110 @@ class ResourceManagerTestCase(unittest.TestCase): ec.shutdown() - self.assertTrue(ec._fm._failure_level == FailureLevel.RM_FAILURE) + self.assertEquals(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 xrange(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.assertEquals(state, ResourceState.FAILED) + + apps.remove(eapp) + + for app in apps: + state = ec.state(app) + self.assertEquals(state, ResourceState.STOPPED) + + ec.shutdown() + + self.assertEquals(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!!!