stackforge/libra
Code Issues Proposed changes

[WORKER]: Fix stupid mistakes

Browse Source 
Co-Authored-By: David Shrewsbury <shrewsbury.dave@gmail.com>

Change-Id: I51b846755309f1dac36f33253c672059ceea2d75
This commit is contained in:
Andrew Hutchings
2013-10-20 17:05:29 +01:00
committed by David Shrewsbury
parent c17a77d03b
commit aa58d4d7c0
2 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
libra/tests/test_worker_controller.py
View File

@@ -22,7 +22,7 @@ class TestWorkerController(testtools.TestCase):
msg = { msg = {
c.ACTION_FIELD: 'BOGUS' c.ACTION_FIELD: 'BOGUS'
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) self.assertIn(c.RESPONSE_FIELD, response)
self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE) self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE)
@@ -32,7 +32,7 @@ class TestWorkerController(testtools.TestCase):
c.ACTION_FIELD: 'UPDATE', c.ACTION_FIELD: 'UPDATE',
'LoAdBaLaNcErS': [{'protocol': 'http'}] 'LoAdBaLaNcErS': [{'protocol': 'http'}]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
@@ -52,7 +52,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) self.assertIn(c.RESPONSE_FIELD, response)
self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS)
@@ -61,7 +61,7 @@ class TestWorkerController(testtools.TestCase):
msg = { msg = {
c.ACTION_FIELD: 'SUSPEND' c.ACTION_FIELD: 'SUSPEND'
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) self.assertIn(c.RESPONSE_FIELD, response)
self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS)
@@ -70,7 +70,7 @@ class TestWorkerController(testtools.TestCase):
msg = { msg = {
c.ACTION_FIELD: 'ENABLE' c.ACTION_FIELD: 'ENABLE'
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) self.assertIn(c.RESPONSE_FIELD, response)
self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS)
@@ -79,7 +79,7 @@ class TestWorkerController(testtools.TestCase):
msg = { msg = {
c.ACTION_FIELD: 'DELETE' c.ACTION_FIELD: 'DELETE'
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) self.assertIn(c.RESPONSE_FIELD, response)
self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS)
@@ -99,7 +99,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -121,7 +121,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -131,7 +131,7 @@ class TestWorkerController(testtools.TestCase):
msg = { msg = {
c.ACTION_FIELD: 'UPDATE' c.ACTION_FIELD: 'UPDATE'
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -142,7 +142,7 @@ class TestWorkerController(testtools.TestCase):
c.ACTION_FIELD: 'UPDATE', c.ACTION_FIELD: 'UPDATE',
c.LBLIST_FIELD: [{'protocol': 'http'}] c.LBLIST_FIELD: [{'protocol': 'http'}]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -163,7 +163,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -193,7 +193,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertNotIn('badRequest', response) self.assertNotIn('badRequest', response)
self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS)
@@ -221,7 +221,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -250,7 +250,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -279,7 +279,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -308,7 +308,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -337,7 +337,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) self.assertIn(c.RESPONSE_FIELD, response)
self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS)
@@ -359,7 +359,7 @@ class TestWorkerController(testtools.TestCase):
} }
] ]
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) self.assertIn(c.RESPONSE_FIELD, response)
self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE) self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE)
@@ -368,7 +368,7 @@ class TestWorkerController(testtools.TestCase):
msg = { msg = {
c.ACTION_FIELD: 'DISCOVER' c.ACTION_FIELD: 'DISCOVER'
} }
controller = c(self.logger, self.driver, msg, []) controller = c(self.logger, self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn('version', response) self.assertIn('version', response)
self.assertIn('release', response) self.assertIn('release', response)
@@ -381,7 +381,7 @@ class TestWorkerController(testtools.TestCase):
c.ACTION_FIELD: 'ARCHIVE' c.ACTION_FIELD: 'ARCHIVE'
} }
null_driver = LoadBalancerDriver() null_driver = LoadBalancerDriver()
controller = c(self.logger, null_driver, msg, []) controller = c(self.logger, null_driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -393,7 +393,7 @@ class TestWorkerController(testtools.TestCase):
c.OBJ_STORE_TYPE_FIELD: 'bad' c.OBJ_STORE_TYPE_FIELD: 'bad'
} }
null_driver = LoadBalancerDriver() null_driver = LoadBalancerDriver()
controller = c(self.logger, null_driver, msg, []) controller = c(self.logger, null_driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
@@ -408,7 +408,7 @@ class TestWorkerController(testtools.TestCase):
c.OBJ_STORE_TOKEN_FIELD: "XXXX", c.OBJ_STORE_TOKEN_FIELD: "XXXX",
c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}] c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}]
} }
controller = c(self.logger, null_driver, msg, []) controller = c(self.logger, null_driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -423,7 +423,7 @@ class TestWorkerController(testtools.TestCase):
c.OBJ_STORE_TOKEN_FIELD: "XXXX", c.OBJ_STORE_TOKEN_FIELD: "XXXX",
c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}] c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}]
} }
controller = c(self.logger, null_driver, msg, []) controller = c(self.logger, null_driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -438,7 +438,7 @@ class TestWorkerController(testtools.TestCase):
c.OBJ_STORE_ENDPOINT_FIELD: "https://example.com", c.OBJ_STORE_ENDPOINT_FIELD: "https://example.com",
c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}] c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}]
} }
controller = c(self.logger, null_driver, msg, []) controller = c(self.logger, null_driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -453,7 +453,7 @@ class TestWorkerController(testtools.TestCase):
c.OBJ_STORE_ENDPOINT_FIELD: "https://example.com", c.OBJ_STORE_ENDPOINT_FIELD: "https://example.com",
c.OBJ_STORE_TOKEN_FIELD: "XXXX" c.OBJ_STORE_TOKEN_FIELD: "XXXX"
} }
controller = c(self.logger, null_driver, msg, []) controller = c(self.logger, null_driver, msg)
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
@@ -469,7 +469,7 @@ class TestWorkerController(testtools.TestCase):
c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}] c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}]
} }
null_driver = LoadBalancerDriver() null_driver = LoadBalancerDriver()
controller = c(self.logger, null_driver, msg, []) controller = c(self.logger, null_driver, msg)
response = controller.run() response = controller.run()
self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE) self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE)
self.assertIn(c.ERROR_FIELD, response) self.assertIn(c.ERROR_FIELD, response)

8
libra/worker/controller.py
View File

@@ -13,6 +13,9 @@
# under the License. # under the License.
import socket import socket
from oslo.config import cfg
from libra import __version__ as libra_version from libra import __version__ as libra_version
from libra import __release__ as libra_release from libra import __release__ as libra_release
from libra.common.exc import DeletedStateError from libra.common.exc import DeletedStateError
@@ -35,11 +38,10 @@ class LBaaSController(object):
OBJ_STORE_ENDPOINT_FIELD = 'hpcs_object_store_endpoint' OBJ_STORE_ENDPOINT_FIELD = 'hpcs_object_store_endpoint'
OBJ_STORE_TOKEN_FIELD = 'hpcs_object_store_token' OBJ_STORE_TOKEN_FIELD = 'hpcs_object_store_token'
def __init__(self, logger, driver, json_msg, gearman): def __init__(self, logger, driver, json_msg):
self.logger = logger self.logger = logger
self.driver = driver self.driver = driver
self.msg = json_msg self.msg = json_msg
self.gearman = gearman
def run(self): def run(self):
""" """
@@ -90,7 +92,7 @@ class LBaaSController(object):
""" """
# Gearman test # Gearman test
self.msg['gearman'] = [] self.msg['gearman'] = []
for host_port in self.gearman: for host_port in cfg.CONF['gearman']['servers']:
host, port = host_port.split(':') host, port = host_port.split(':')
try: try:
self._check_host(host, port) self._check_host(host, port)