Merge "Fixes bug: GET and LIST return some empty fields"

poppy/storage/cassandra/services.py

@@ -539,25 +539,33 @@ def format_result(result):
         domains = [domain.Domain(d['domain'], d.get('protocol', 'http'))
                    for d in domains]
 
-        restrictions = [restriction.Restriction(
-            r.get('name'),
-            [rule.Rule(r_rule.get('name'),
-                       referrer=r_rule.get('referrer'))
-             for r_rule in r['rules']])
-            for r in restrictions]
-
-        caching_rules = [cachingrule.CachingRule(
-            caching_rule.get('name'),
-            caching_rule.get('ttl'),
-            [rule.Rule(rule_i.get('name'),
-                       request_url=rule_i.get('request_url'))
-             for rule_i in caching_rule['rules']])
-            for caching_rule in caching_rules]
+        restriction_objects = []
+        for r in restrictions:
+            restriction_object = restriction.Restriction(r.get('name'))
+            restriction_object.rules = []
+            for r_rule in r['rules']:
+                rule_object = rule.Rule(r_rule.get('name'))
+                del r_rule['name']
+                rule_object.from_dict(r_rule)
+                restriction_object.rules.append(rule_object)
+            restriction_objects.append(restriction_object)
+
+        caching_objects = []
+        for caching_rule in caching_rules:
+            caching_object = cachingrule.CachingRule(caching_rule.get('name'),
+                                                     caching_rule.get('ttl'))
+            caching_object.rules = []
+            for cr_rule in caching_rule['rules']:
+                rule_object = rule.Rule(cr_rule.get('name'))
+                del cr_rule['name']
+                rule_object.from_dict(cr_rule)
+                caching_object.rules.append(rule_object)
+            caching_objects.append(caching_object)
 
         # create the service object
         s = service.Service(service_id, name, domains, origins, flavor_id,
-                            caching=caching_rules,
-                            restrictions=restrictions)
+                            caching=caching_objects,
+                            restrictions=restriction_objects)
 
         # format the provider details
         provider_detail_results = result.get('provider_details') or {}

tests/api/services/test_services.py

@@ -355,7 +355,8 @@ def setUp(self):
                 u"ttl": 1200,
                 u"rules": [{
                     u"name": u"index",
-                    u"request_url": u"/index.htm"
+                    u"request_url": u"/index.htm",
+                    u"http_method": u"GET"
                 }]
             }
         ]