diff --git a/libra/worker/controller.py b/libra/worker/controller.py index 575d691f..88b2b959 100644 --- a/libra/worker/controller.py +++ b/libra/worker/controller.py @@ -313,6 +313,7 @@ class LBaaSController(object): lb_list = self.msg[self.LBLIST_FIELD] params['protocol'] = lb_list[0]['protocol'] + params['lbid'] = lb_list[0]['id'] params['basepath'] = self.msg[self.OBJ_STORE_BASEPATH_FIELD] params['endpoint'] = self.msg[self.OBJ_STORE_ENDPOINT_FIELD] params['token'] = self.msg[self.OBJ_STORE_TOKEN_FIELD] diff --git a/tests/test_worker_controller.py b/tests/test_worker_controller.py index c963c0bc..8746c9fb 100644 --- a/tests/test_worker_controller.py +++ b/tests/test_worker_controller.py @@ -171,7 +171,7 @@ class TestWorkerController(testtools.TestCase): c.OBJ_STORE_TYPE_FIELD: 'Swift', c.OBJ_STORE_ENDPOINT_FIELD: "https://example.com", c.OBJ_STORE_TOKEN_FIELD: "XXXX", - c.LBLIST_FIELD: [{'protocol': 'http'}] + c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}] } controller = c(self.logger, null_driver, msg) response = controller.run() @@ -183,7 +183,7 @@ class TestWorkerController(testtools.TestCase): c.OBJ_STORE_TYPE_FIELD: 'Swift', c.OBJ_STORE_BASEPATH_FIELD: "/lbaaslogs", c.OBJ_STORE_TOKEN_FIELD: "XXXX", - c.LBLIST_FIELD: [{'protocol': 'http'}] + c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}] } controller = c(self.logger, null_driver, msg) response = controller.run() @@ -195,7 +195,7 @@ class TestWorkerController(testtools.TestCase): c.OBJ_STORE_TYPE_FIELD: 'Swift', c.OBJ_STORE_BASEPATH_FIELD: "/lbaaslogs", c.OBJ_STORE_ENDPOINT_FIELD: "https://example.com", - c.LBLIST_FIELD: [{'protocol': 'http'}] + c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}] } controller = c(self.logger, null_driver, msg) response = controller.run() @@ -220,7 +220,7 @@ class TestWorkerController(testtools.TestCase): c.OBJ_STORE_BASEPATH_FIELD: "/lbaaslogs", c.OBJ_STORE_ENDPOINT_FIELD: "https://example.com", c.OBJ_STORE_TOKEN_FIELD: "XXXX", - c.LBLIST_FIELD: [{'protocol': 'http'}] + c.LBLIST_FIELD: [{'protocol': 'http', 'id': '123'}] } null_driver = LoadBalancerDriver() controller = c(self.logger, null_driver, msg)