X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fexecution%2Fresource.py;h=0945e9b5eff5e1fc956ccb7b0a94b57236557ef9;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=74e560e0454ad4867cd5d5274243c1aba5ed4d9a;hpb=62a8f5c90afe9033f532206c811cff8ea76b2c09;p=nepi.git diff --git a/test/execution/resource.py b/test/execution/resource.py index 74e560e0..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 @@ -20,13 +19,15 @@ from nepi.execution.attribute import Attribute -from nepi.execution.ec import ExperimentController -from nepi.execution.resource import ResourceManager, ResourceState, clsinit +from nepi.execution.ec import ExperimentController, FailureLevel +from nepi.execution.resource import ResourceManager, ResourceState, \ + clsinit_copy, ResourceAction +import random import time import unittest -@clsinit +@clsinit_copy class MyResource(ResourceManager): _rtype = "MyResource" @@ -38,30 +39,12 @@ class MyResource(ResourceManager): def __init__(self, ec, guid): super(MyResource, self).__init__(ec, guid) -@clsinit +@clsinit_copy class AnotherResource(ResourceManager): _rtype = "AnotherResource" def __init__(self, ec, guid): super(AnotherResource, self).__init__(ec, guid) - -class ResourceFactoryTestCase(unittest.TestCase): - def test_add_resource_factory(self): - from nepi.execution.resource import ResourceFactory - - ResourceFactory.register_type(MyResource) - ResourceFactory.register_type(AnotherResource) - - self.assertEquals(MyResource.rtype(), "MyResource") - self.assertEquals(len(MyResource._attributes), 1) - - self.assertEquals(ResourceManager.rtype(), "Resource") - self.assertEquals(len(ResourceManager._attributes), 0) - - self.assertEquals(AnotherResource.rtype(), "AnotherResource") - self.assertEquals(len(AnotherResource._attributes), 0) - - self.assertEquals(len(ResourceFactory.resource_types()), 2) class Channel(ResourceManager): _rtype = "Channel" @@ -69,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): @@ -80,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) @@ -90,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): @@ -99,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("3s", self.deploy) + 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): @@ -121,15 +104,89 @@ 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: - super(Application, self).deploy() + time.sleep(random.random() * 2) + super(Application, self).do_deploy() self.logger.debug(" -------- DEPLOYED ------- ") + def do_start(self): + super(Application, self).do_start() + time.sleep(random.random() * 3) + self.ec.schedule("0.5s", self.stop) + +class ErrorApplication(ResourceManager): + _rtype = "ErrorApplication" + + def __init__(self, ec, guid): + super(ErrorApplication, self).__init__(ec, guid) + + 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") + +class ResourceFactoryTestCase(unittest.TestCase): + def test_add_resource_factory(self): + from nepi.execution.resource import ResourceFactory + + ResourceFactory._resource_types = dict() + ResourceFactory.register_type(MyResource) + ResourceFactory.register_type(AnotherResource) + + # Take into account default 'Critical' attribute + self.assertEquals(MyResource.get_rtype(), "MyResource") + self.assertEquals(len(MyResource._attributes), 3) + + self.assertEquals(ResourceManager.get_rtype(), "Resource") + self.assertEquals(len(ResourceManager._attributes), 2) + + self.assertEquals(AnotherResource.get_rtype(), "AnotherResource") + self.assertEquals(len(AnotherResource._attributes), 2) + + self.assertEquals(len(ResourceFactory.resource_types()), 2) + + # restore factory state for other tests + from nepi.execution.resource import populate_factory + ResourceFactory._resource_types = dict() + populate_factory() + class ResourceManagerTestCase(unittest.TestCase): + def test_register_condition(self): + ec = ExperimentController() + rm = ResourceManager(ec, 15) + + group = [1,3,5,7] + rm.register_condition(ResourceAction.START, group, + ResourceState.STARTED) + + group = [10,8] + rm.register_condition(ResourceAction.START, + group, ResourceState.STARTED, time = "10s") + + waiting_for = [] + conditions = rm.conditions.get(ResourceAction.START) + for (group, state, time) in conditions: + waiting_for.extend(group) + + self.assertEquals(waiting_for, [1, 3, 5, 7, 10, 8]) + + group = [1, 2, 3, 4, 6] + rm.unregister_condition(group) + + waiting_for = [] + conditions = rm.conditions.get(ResourceAction.START) + for (group, state, time) in conditions: + waiting_for.extend(group) + + self.assertEquals(waiting_for, [5, 7, 10, 8]) + def test_deploy_in_order(self): """ Test scenario: 2 applications running one on 1 node each. @@ -169,10 +226,8 @@ class ResourceManagerTestCase(unittest.TestCase): ec.deploy() - while not all([ ec.state(guid) == ResourceState.STARTED \ - for guid in [app1, app2, node1, node2, iface1, iface2, chan]]) \ - and not ec.finished: - time.sleep(0.5) + guids = [app1, app2] + ec.wait_finished(guids) ec.shutdown() @@ -189,27 +244,174 @@ 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) + def test_concurrency(self): + from nepi.execution.resource import ResourceFactory + + ResourceFactory.register_type(Application) + ResourceFactory.register_type(Node) + ResourceFactory.register_type(Interface) + ResourceFactory.register_type(Channel) + + ec = ExperimentController() + + node = ec.register_resource("Node") + + apps = list() + for i in xrange(1000): + app = ec.register_resource("Application") + ec.register_connection(app, node) + apps.append(app) + + ec.deploy() + + ec.wait_finished(apps) + + self.assertTrue(ec.state(node) == ResourceState.STARTED) + self.assertTrue( + all([ec.state(guid) == ResourceState.STOPPED \ + for guid in apps]) + ) + + ec.shutdown() + + def test_exception(self): + from nepi.execution.resource import ResourceFactory + + ResourceFactory.register_type(ErrorApplication) + ResourceFactory.register_type(Node) + ResourceFactory.register_type(Interface) + + ec = ExperimentController() + + node = ec.register_resource("Node") + + app = ec.register_resource("ErrorApplication") + ec.register_connection(app, node) + + ec.deploy() + + ec.wait_finished(app) + + ec.shutdown() + + 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) + + 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): - # TODO!!! - pass - + 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): - # TODO!!! - pass + 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 test_set_with_condition(self): + def ztest_set_with_condition(self): # TODO!!! pass