x/solar
Code Issues Proposed changes

Test fixes, __eq__ added to Observer

Browse Source
This commit is contained in:
Przemyslaw Kaminski
2015-04-22 20:28:40 +02:00
parent fdd756f442
commit 974761fe30
4 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
haproxy_deployment/haproxy_deployment.py
View File

@@ -18,14 +18,14 @@ class TestHAProxyDeployment(unittest.TestCase):
keystone2 = db.get_resource('keystone2')
haproxy_keystone_config = db.get_resource('haproxy_keystone_config')
self.assertDictEqual(
self.assertEqual(
haproxy_keystone_config.args['servers'],
{
'keystone1': keystone1.args['ip'],
'keystone2': keystone2.args['ip'],
}
)
self.assertDictEqual(
self.assertEqual(
haproxy_keystone_config.args['ports'],
{
'keystone1': keystone1.args['port'],
@@ -47,14 +47,14 @@ class TestHAProxyDeployment(unittest.TestCase):
nova2 = db.get_resource('nova2')
haproxy_nova_config = db.get_resource('haproxy_nova_config')
self.assertDictEqual(
self.assertEqual(
haproxy_nova_config.args['servers'],
{
'nova1': nova1.args['ip'],
'nova2': nova2.args['ip'],
}
)
self.assertDictEqual(
self.assertEqual(
haproxy_nova_config.args['ports'],
{
'nova1': nova1.args['port'],
@@ -72,34 +72,34 @@ class TestHAProxyDeployment(unittest.TestCase):
self.assertEqual(node5.args['ip'], haproxy.args['ip'])
self.assertEqual(node5.args['ssh_key'], haproxy.args['ssh_key'])
self.assertEqual(node5.args['ssh_user'], haproxy.args['ssh_user'])
self.assertDictEqual(
self.assertEqual(
haproxy_config.args['configs'],
{
'haproxy_keystone_config': haproxy_keystone_config.args['servers'],
'haproxy_nova_config': haproxy_nova_config.args['servers'],
}
)
self.assertDictEqual(
self.assertEqual(
haproxy_config.args['configs_ports'],
{
'haproxy_keystone_config': haproxy_keystone_config.args['ports'],
'haproxy_nova_config': haproxy_nova_config.args['ports'],
}
)
self.assertDictEqual(
self.assertEqual(
haproxy_config.args['listen_ports'],
{
'haproxy_keystone_config': haproxy_keystone_config.args['listen_port'],
'haproxy_nova_config': haproxy_nova_config.args['listen_port'],
}
)
self.assertDictEqual(
self.assertEqual(
{
'haproxy-config': haproxy_config.args['config_dir'],
},
haproxy.args['host_binds']
)
self.assertDictEqual(
self.assertEqual(
haproxy.args['ports'],
haproxy_config.args['listen_ports'],
)