Pass HAProxy config to OS services driver.

Bug fix. We weren't passing the HAProxy config as a string down
to the OS service module.

Also remove the service_restart() method since it was unused.

Also set a default balancing algorithm.

Change-Id: I8db025488099fed5015d62e0bf9c73c6e6795483

libra/worker/controller.py

@@ -125,21 +125,23 @@ class LBaaSController(object):
                     self.logger.error("Invalid algorithm: %s" % algo)
                     self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
                     return self.msg
+            else:
+                algo = LoadBalancerDriver.ROUNDROBIN
 
-                try:
+            try:
-                    self.driver.set_algorithm(current_lb['protocol'], algo)
+                self.driver.set_algorithm(current_lb['protocol'], algo)
-                except NotImplementedError:
+            except NotImplementedError:
-                    self.logger.error(
+                self.logger.error(
-                        "Selected driver does not support setting algorithm."
+                    "Selected driver does not support setting algorithm."
-                    )
+                )
-                    self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
+                self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
-                    return self.msg
+                return self.msg
-                except Exception as e:
+            except Exception as e:
-                    self.logger.error(
+                self.logger.error(
-                        "Selected driver failed setting algorithm."
+                    "Selected driver failed setting algorithm."
-                    )
+                )
-                    self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
+                self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
-                    return self.msg
+                return self.msg
 
             for lb_node in current_lb['nodes']:
                 port, address = None, None
@@ -183,7 +185,7 @@ class LBaaSController(object):
             self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
         except Exception as e:
             self.logger.error("CREATE failed: %s, %s" % (e.__class__, e))
-            for lb_node in self.msg['nodes']:
+            for lb_node in current_lb['nodes']:
                 lb_node['condition'] = self.NODE_ERR
             self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
         else:

libra/worker/drivers/haproxy/driver.py

@@ -121,7 +121,7 @@ class HAProxyDriver(LoadBalancerDriver):
             raise Exception('Invalid algorithm: %s' % protocol)
 
     def create(self):
-        self.ossvc.write_config()
+        self.ossvc.write_config(self._config_to_string())
         self.ossvc.service_stop()
         self.ossvc.service_start()
 

libra/worker/drivers/haproxy/services_base.py

@@ -34,11 +34,7 @@ class ServicesBase:
         """ Start the HAProxy service. """
         return NotImplementedError()
 
-    def service_restart(self):
+    def write_config(self, config_str):
-        """ Restart the HAProxy service. """
-        return NotImplementedError()
-
-    def write_config(self):
         """ Write the HAProxy configuration file. """
         return NotImplementedError()
 

libra/worker/drivers/haproxy/ubuntu_services.py

@@ -50,10 +50,7 @@ class UbuntuServices(ServicesBase):
             raise Exception("%s does not exist. Start failed." %
                             self._haproxy_pid)
 
-    def service_restart(self):
+    def write_config(self, config_str):
-        return NotImplementedError()
-
-    def write_config(self):
         """
         Generate the new config and replace the current config file.
 
@@ -61,7 +58,6 @@ class UbuntuServices(ServicesBase):
         the production config file, then rename the temporary config to the
         production config.
         """
-        config_str = self._config_to_string()
         tmpfile = '/tmp/haproxy.cfg'
         fh = open(tmpfile, 'w')
         fh.write(config_str)

tests/mock_objects.py

@@ -19,10 +19,7 @@ class FakeOSServices(ServicesBase):
     def service_start(self):
         pass
 
-    def service_restart(self):
+    def write_config(self, config_str):
-        pass
-
-    def write_config(self):
         pass
 
     def remove_configs(self):