Merge lp:~sidnei/charms/precise/haproxy/restore-services-from-relation into lp:charms/haproxy

[Sidnei da Silva]

Actually fix tests.

Actually fix tests.

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-10-25 21:33:52 +0000
+++ hooks/hooks.py	2013-11-04 13:11:24 +0000
@@ -342,7 +342,11 @@
 
 
 def parse_services_yaml(services, yaml_data):
-    for service in yaml.safe_load(yaml_data):
+    yaml_services = yaml.safe_load(yaml_data)
+    if yaml_services is None:
+        return services
+
+    for service in yaml_services:
         service_name = service["service_name"]
         if not services:
             # 'None' is used as a marker for the first service defined, which
@@ -365,6 +369,7 @@
 
         services[service_name] = merge_service(
             services.get(service_name, {}), service)
+
     return services
 
 
@@ -435,6 +440,7 @@
 
     # Augment services_dict with service definitions from relation data.
     relation_data = relations_of_type("reverseproxy")
+
     for relation_info in relation_data:
         if "services" in relation_info:
             services_dict = parse_services_yaml(services_dict,
@@ -444,8 +450,6 @@
         log("No services configured, exiting.")
         return
 
-    relation_data = relations_of_type("reverseproxy")
-
     for relation_info in relation_data:
         unit = relation_info['__unit__']
 
@@ -785,7 +789,6 @@
 
 
 def notify_relation(relation, changed=False, relation_ids=None):
-    config_data = config_get()
     default_host = get_hostname()
     default_port = 80
 
@@ -809,7 +812,7 @@
         if len(service_names) == 1:
             service_name = service_names.pop()
         elif len(service_names) > 1:
-            log("Remote units requested than a single service name."
+            log("Remote units requested more than a single service name."
                 "Falling back to default host/port.")
 
         if service_name is not None:
@@ -822,9 +825,14 @@
             my_host = default_host
             my_port = default_port
 
+        all_services = ""
+        services_dict = create_services()
+        if services_dict is not None:
+            all_services = yaml.safe_dump(sorted(services_dict.itervalues()))
+
         relation_set(relation_id=rid, port=str(my_port),
                      hostname=my_host,
-                     all_services=config_data['services'])
+                     all_services=all_services)
 
 
 def notify_website(changed=False, relation_ids=None):

=== modified file 'hooks/tests/test_website_hooks.py'
--- hooks/tests/test_website_hooks.py	2013-05-10 17:36:36 +0000
+++ hooks/tests/test_website_hooks.py	2013-11-04 13:11:24 +0000
@@ -36,13 +36,14 @@
     def setUp(self):
         super(NotifyRelationTest, self).setUp()
 
+        self.relations_of_type = self.patch_hook("relations_of_type")
         self.relations_for_id = self.patch_hook("relations_for_id")
         self.relation_set = self.patch_hook("relation_set")
         self.config_get = self.patch_hook("config_get")
         self.get_relation_ids = self.patch_hook("get_relation_ids")
         self.get_hostname = self.patch_hook("get_hostname")
         self.log = self.patch_hook("log")
-        self.get_config_services = self.patch_hook("get_config_service")
+        self.get_config_service = self.patch_hook("get_config_service")
 
     def patch_hook(self, hook_name):
         mock_controller = patch.object(hooks, hook_name)
@@ -114,9 +115,12 @@
                 relation_id="website:1", port="80", hostname="foo.local",
                 all_services=""),
             ])
-        self.log.assert_called_once_with(
-            "Remote units requested than a single service name."
-            "Falling back to default host/port.")
+        self.log.assert_has_calls([
+            call.log(
+                "Remote units requested more than a single service name."
+                "Falling back to default host/port."),
+            call.log("No services configured, exiting."),
+            ])
 
     def test_notify_website_relation_with_same_sitenames(self):
         self.get_relation_ids.return_value = ("website:1",)
@@ -124,8 +128,8 @@
         self.relations_for_id.return_value = [{"service_name": "bar"},
                                               {"service_name": "bar"}]
         self.config_get.return_value = {"services": ""}
-        self.get_config_services.return_value = {"service_host": "bar.local",
-                                                 "service_port": "4242"}
+        self.get_config_service.return_value = {"service_host": "bar.local",
+                                                "service_port": "4242"}
 
         hooks.notify_relation("website")