zuul/nodepool
Code Issues Proposed changes

Rename nodepool.py to launcher.py

Browse Source 
Since we are working towards python3 support, lets rename nodepool.py
to launcher.py to make relative imports nicer, otherwise we'd have to
use:

  from . import foo

Change-Id: Ic38b6a8c2bf25d53625e159cb135b71d383b700c
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2017-05-10 11:13:53 -04:00
parent 28bc25c30f
commit 841f120ff6
7 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nodepool/cmd/launcher.py
View File

@@ -20,7 +20,7 @@ import sys
import signal
import nodepool.cmd
import nodepool.nodepool
import nodepool.launcher
import nodepool.webapp
log = logging.getLogger(__name__)
@@ -51,7 +51,7 @@ class NodePoolLauncherApp(nodepool.cmd.NodepoolDaemonApp):
os._exit(0)
def run(self):
self.pool = nodepool.nodepool.NodePool(self.args.secure,
self.pool = nodepool.launcher.NodePool(self.args.secure,
self.args.config)
if not self.args.no_webapp:
self.webapp = nodepool.webapp.WebApp(self.pool)

6
nodepool/cmd/nodepoolcmd.py
View File

@@ -17,8 +17,8 @@
import logging.config
import sys
from nodepool import launcher
from nodepool import provider_manager
from nodepool import nodepool
from nodepool import status
from nodepool import zk
from nodepool.cmd import NodepoolApp
@@ -265,7 +265,7 @@ class NodePoolCmd(NodepoolApp):
if self.args.now:
manager = provider_manager.get_provider_manager(provider, True)
manager.start()
nodepool.InstanceDeleter.delete(self.zk, manager, node)
launcher.InstanceDeleter.delete(self.zk, manager, node)
manager.stop()
else:
node.state = zk.DELETING
@@ -329,7 +329,7 @@ class NodePoolCmd(NodepoolApp):
if self.args.command in ('config-validate'):
return self.args.func()
self.pool = nodepool.NodePool(self.args.secure, self.args.config)
self.pool = launcher.NodePool(self.args.secure, self.args.config)
config = self.pool.loadConfig()
# commands needing ZooKeeper

0
nodepool/nodepool.py → nodepool/launcher.py
View File

9
nodepool/tests/__init__.py
View File

@@ -31,7 +31,10 @@ import fixtures
import kazoo.client
import testtools
from nodepool import builder, fakeprovider, nodepool, webapp
from nodepool import builder
from nodepool import fakeprovider
from nodepool import launcher
from nodepool import webapp
from nodepool import zk
from nodepool.cmd.config_validator import ConfigValidator
@@ -197,7 +200,7 @@ class BaseTestCase(testtools.TestCase):
'nodepool.provider_manager.ProviderManager._getClient',
get_fake_client))
self.useFixture(fixtures.MonkeyPatch(
'nodepool.nodepool._get_one_cloud',
'nodepool.launcher._get_one_cloud',
fakeprovider.fake_get_one_cloud))
clouds_path = os.path.join(os.path.dirname(__file__),
'fixtures', 'clouds.yaml')
@@ -468,7 +471,7 @@ class DBTestCase(BaseTestCase):
def useNodepool(self, *args, **kwargs):
args = (self.secure_conf,) + args
pool = nodepool.NodePool(*args, **kwargs)
pool = launcher.NodePool(*args, **kwargs)
pool.cleanup_interval = .5
pool.delete_interval = .5
self.addCleanup(pool.stop)

2
nodepool/tests/test_builder.py
View File

@@ -108,7 +108,7 @@ class TestNodePoolBuilder(tests.DBTestCase):
'nodepool.provider_manager.FakeProviderManager._getClient',
get_fake_client))
self.useFixture(fixtures.MonkeyPatch(
'nodepool.nodepool._get_one_cloud',
'nodepool.launcher._get_one_cloud',
fakeprovider.fake_get_one_cloud))
configfile = self.setup_config('node.yaml')

12
nodepool/tests/test_nodepool.py → nodepool/tests/test_launcher.py
View File

@@ -20,11 +20,11 @@ import fixtures
from nodepool import tests
from nodepool import zk
import nodepool.fakeprovider
import nodepool.nodepool
import nodepool.launcher
class TestNodepool(tests.DBTestCase):
log = logging.getLogger("nodepool.TestNodepool")
class TestLauncher(tests.DBTestCase):
log = logging.getLogger("nodepool.TestLauncher")
def test_node_assignment(self):
'''
@@ -35,7 +35,7 @@ class TestNodepool(tests.DBTestCase):
self._useBuilder(configfile)
image = self.waitForImage('fake-provider', 'fake-image')
nodepool.nodepool.LOCK_CLEANUP = 1
nodepool.launcher.LOCK_CLEANUP = 1
pool = self.useNodepool(configfile, watermark_sleep=1)
pool.start()
@@ -81,7 +81,7 @@ class TestNodepool(tests.DBTestCase):
self._useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
nodepool.nodepool.LOCK_CLEANUP = 1
nodepool.launcher.LOCK_CLEANUP = 1
pool = self.useNodepool(configfile, watermark_sleep=1)
pool.start()
self.wait_for_config(pool)
@@ -402,7 +402,7 @@ class TestNodepool(tests.DBTestCase):
self.assertEqual(len(nodes), 1)
self.zk.lockNode(nodes[0], blocking=False)
nodepool.nodepool.InstanceDeleter.delete(
nodepool.launcher.InstanceDeleter.delete(
self.zk, pool.getProviderManager('fake-provider'), nodes[0])
# Make sure our old node is in delete state, even though delete failed

6
nodepool/tests/test_nodelaunchmanager.py
View File

@@ -21,7 +21,7 @@ from nodepool import builder
from nodepool import provider_manager
from nodepool import tests
from nodepool import zk
from nodepool.nodepool import NodeLaunchManager
from nodepool.launcher import NodeLaunchManager
class TestNodeLaunchManager(tests.DBTestCase):
@@ -61,7 +61,7 @@ class TestNodeLaunchManager(tests.DBTestCase):
self.assertEqual(len(mgr.ready_nodes), 1)
self.assertEqual(len(mgr.failed_nodes), 0)
@mock.patch('nodepool.nodepool.NodeLauncher._launchNode')
@mock.patch('nodepool.launcher.NodeLauncher._launchNode')
def test_failed_launch(self, mock_launch):
configfile = self.setup_config('node.yaml')
self._setup(configfile)
@@ -78,7 +78,7 @@ class TestNodeLaunchManager(tests.DBTestCase):
self.assertEqual(len(mgr.failed_nodes), 1)
self.assertEqual(len(mgr.ready_nodes), 0)
@mock.patch('nodepool.nodepool.NodeLauncher._launchNode')
@mock.patch('nodepool.launcher.NodeLauncher._launchNode')
def test_mixed_launch(self, mock_launch):
configfile = self.setup_config('node.yaml')
self._setup(configfile)