x/poppy
Code Issues Proposed changes

Enforces a max number of domains and origins

Browse Source 
Closes-Bug: 1406544
Closes-Bug: 1406568
Change-Id: I0d5018ff9351b4ff6c1aca9f694f122ce988cd43
This commit is contained in:
amitgandhinz
2015-01-09 17:14:29 -05:00
parent aeb244d9ea
commit 45cfb935a7
3 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
tests/api/services/data_create_service_negative.json
View File

@@ -6,7 +6,6 @@
"origin_list": [{"origin": "mywebsite1.com",
"port": 443,
"ssl": false}],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
@@ -21,7 +20,6 @@
"origin_list": [{"origin": "mywebsite1.com",
"port": 443,
"ssl": false}],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
@@ -36,7 +34,6 @@
"origin_list": [{"origin": "mywebsite1.com",
"port": 443,
"ssl": false}],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
@@ -51,7 +48,6 @@
"origin_list": [{"origin": "mywebsite1.com",
"port": 443,
"ssl": false}],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
@@ -66,7 +62,6 @@
"origin_list": [{"origin": "mywebsite1.com",
"port": 443,
"ssl": false}],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
@@ -80,7 +75,6 @@
"origin_list": [{"origin": "mywebsite1.com",
"port": 443,
"ssl": false}],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
@@ -88,12 +82,64 @@
"request_url" : "/index.htm"}]}],
"restrictions_list": []
},
"too_many_domains": {
"service_name": "many_domain_list",
"domain_list": [
{"domain": "blog1.mywebsite.com"},
{"domain": "blog2.mywebsite.com"},
{"domain": "blog3.mywebsite.com"},
{"domain": "blog4.mywebsite.com"},
{"domain": "blog5.mywebsite.com"},
{"domain": "blog6.mywebsite.com"},
{"domain": "blog7.mywebsite.com"},
{"domain": "blog8.mywebsite.com"},
{"domain": "blog9.mywebsite.com"},
{"domain": "blog10.mywebsite.com"},
{"domain": "blog11.mywebsite.com"}
],
"origin_list": [{"origin": "mywebsite1.com",
"port": 443,
"ssl": false}],
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
"rules": [{"name" : "index",
"request_url" : "/index.htm"}]}],
"restrictions_list": [
{"name": "test",
"rules": [{"name": "only me",
"referrer": "www.mywebsite.com"}]}
]
},
"empty_origin_list": {
"service_name": "empty_origin_list",
"domain_list": [{"domain": "mywebsite.com"},
{"domain": "blog.mywebsite.com"}],
"origin_list": [],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
"rules": [{"name" : "index",
"request_url" : "/index.htm"}]}],
"restrictions_list": []
},
"too_many_origins": {
"service_name": "many_origin_list",
"domain_list": [{"domain": "mywebsite.com"},
{"domain": "blog.mywebsite.com"}],
"origin_list": [
{"origin": "origin1"},
{"origin": "origin2", "rules": [{"name" : "index", "request_url" : "/index.htm"}]},
{"origin": "origin3", "rules": [{"name" : "index", "request_url" : "/index.htm"}]},
{"origin": "origin4", "rules": [{"name" : "index", "request_url" : "/index.htm"}]},
{"origin": "origin5", "rules": [{"name" : "index", "request_url" : "/index.htm"}]},
{"origin": "origin6", "rules": [{"name" : "index", "request_url" : "/index.htm"}]},
{"origin": "origin7", "rules": [{"name" : "index", "request_url" : "/index.htm"}]},
{"origin": "origin8", "rules": [{"name" : "index", "request_url" : "/index.htm"}]},
{"origin": "origin9", "rules": [{"name" : "index", "request_url" : "/index.htm"}]},
{"origin": "origin10", "rules": [{"name" : "index", "request_url" : "/index.htm"}]},
{"origin": "origin11", "rules": [{"name" : "index", "request_url" : "/index.htm"}]}
],
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
@@ -108,7 +154,6 @@
"origin_list": [{"origin": "invalid_origin_value",
"port": "fourfourthree",
"ssl": false}],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
@@ -123,7 +168,6 @@
"origin_list": [{"origin": "invalid_origin_value",
"port": 443,
"ssl": "Arggg"}],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
@@ -153,7 +197,6 @@
"origin_list": [{"origin": "mywebsite1.com",
"port": 443,
"ssl": false}],
"flavor_id": "standard",
"caching_list": [{"ttl": 3600}],
"restrictions_list": []
},
@@ -164,7 +207,6 @@
"origin_list": [{"origin": "mywebsite1.com",
"port": 443,
"ssl": false}],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,
@@ -178,7 +220,6 @@
"origin_list": [{"origin": "mywebsite1.com",
"port": 443,
"ssl": false}],
"flavor_id": "standard",
"caching_list": [{"name": "default", "ttl": 3600},
{"name": "home",
"ttl": 1200,

4
tests/api/services/test_services.py
View File

@@ -109,6 +109,10 @@ class TestCreateService(providers.TestProviderBase):
service_name = test_data['service_name']
domain_list = test_data['domain_list']
for item in domain_list:
if len(item['domain']) > 2:
item['domain'] = str(uuid.uuid1()) + item['domain']
origin_list = test_data['origin_list']
caching_list = test_data['caching_list']
restrictions_list = test_data['restrictions_list']