Fix end to end tests
This patch fixes the end to end tests. Change-Id: Ib5f21ece1071ad3e7fc5a6c6c7e177a722f0adbb Closes-Bug: 1468877
This commit is contained in:
Malini Kamalambal
parent
0380310257
commit
61e7129751
|
|
@ -20,7 +20,6 @@ import urlparse
|
|||
import uuid
|
||||
|
||||
import ddt
|
||||
import jsonpatch
|
||||
from nose.plugins import attrib
|
||||
|
||||
from tests.api import base
|
||||
|
|
@ -433,476 +432,6 @@ class TestServiceActions(base.TestBase):
|
|||
super(TestServiceActions, self).tearDown()
|
||||
|
||||
|
||||
@ddt.ddt
|
||||
class TestServicePatch(base.TestBase):
|
||||
|
||||
"""Tests for PATCH Services."""
|
||||
|
||||
def setUp(self):
|
||||
super(TestServicePatch, self).setUp()
|
||||
self.service_name = self.generate_random_string(prefix='api-test')
|
||||
self.flavor_id = self.test_flavor
|
||||
self.log_delivery = {"enabled": False}
|
||||
|
||||
domain = self.generate_random_string(prefix='api-test-domain') + '.com'
|
||||
self.domain_list = [
|
||||
{
|
||||
"domain": domain,
|
||||
"protocol": "http"
|
||||
}
|
||||
]
|
||||
|
||||
origin = self.generate_random_string(prefix='api-test-origin') + '.com'
|
||||
self.origin_list = [
|
||||
{
|
||||
"origin": origin,
|
||||
"port": 80,
|
||||
"ssl": False,
|
||||
"rules": [
|
||||
{
|
||||
"name": "default",
|
||||
"request_url": "/*"
|
||||
}
|
||||
],
|
||||
"hostheadertype": "domain",
|
||||
"hostheadervalue": None
|
||||
}
|
||||
]
|
||||
|
||||
self.caching_list = [
|
||||
{
|
||||
"name": "default",
|
||||
"ttl": 3600,
|
||||
"rules": [
|
||||
{
|
||||
"name": "default",
|
||||
"request_url": "/*"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "home",
|
||||
"ttl": 1200,
|
||||
"rules": [
|
||||
{
|
||||
"name": "index",
|
||||
"request_url": "/index.htm"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
self.restrictions_list = [
|
||||
{"name": "website only",
|
||||
"rules": [{"name": "mywebsite.com",
|
||||
"referrer": "www.mywebsite.com",
|
||||
"request_url": "/*"
|
||||
}]}]
|
||||
|
||||
resp = self.client.create_service(
|
||||
service_name=self.service_name,
|
||||
domain_list=self.domain_list,
|
||||
origin_list=self.origin_list,
|
||||
caching_list=self.caching_list,
|
||||
restrictions_list=self.restrictions_list,
|
||||
flavor_id=self.flavor_id,
|
||||
log_delivery=self.log_delivery)
|
||||
|
||||
self.service_url = resp.headers["location"]
|
||||
|
||||
self.original_service_details = {
|
||||
"name": self.service_name,
|
||||
"domains": self.domain_list,
|
||||
"origins": self.origin_list,
|
||||
"caching": self.caching_list,
|
||||
"restrictions": self.restrictions_list,
|
||||
"flavor_id": self.flavor_id,
|
||||
"log_delivery": self.log_delivery}
|
||||
|
||||
self.client.wait_for_service_status(
|
||||
location=self.service_url,
|
||||
status='deployed',
|
||||
abort_on_status='failed',
|
||||
retry_interval=self.test_config.status_check_retry_interval,
|
||||
retry_timeout=self.test_config.status_check_retry_timeout)
|
||||
|
||||
resp = self.client.get_service(location=self.service_url)
|
||||
body = resp.json()
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
self.assertEqual(body['status'], 'deployed')
|
||||
|
||||
@ddt.file_data('data_patch_service.json')
|
||||
def test_patch_service(self, test_data):
|
||||
|
||||
for item in test_data:
|
||||
if 'skip_test' in item:
|
||||
self.skipTest('Not Implemented - bug# 1433807')
|
||||
|
||||
if ('domain' in item['path']) and ('value' in item):
|
||||
if isinstance(item['value'], (list)):
|
||||
item['value'][0]['domain'] = self._replace_domain(
|
||||
domain=item['value'][0])
|
||||
else:
|
||||
item['value']['domain'] = self._replace_domain(
|
||||
domain=item['value'])
|
||||
|
||||
patch = jsonpatch.JsonPatch(test_data)
|
||||
expected_service_details = patch.apply(self.original_service_details)
|
||||
|
||||
resp = self.client.patch_service(location=self.service_url,
|
||||
request_body=test_data)
|
||||
self.assertEqual(resp.status_code, 202)
|
||||
|
||||
for item in test_data:
|
||||
if 'origin' in item['path'] and ('value' in item):
|
||||
if 'hostheadertype' in item['value']:
|
||||
if item['value']['hostheadertype'] == 'custom':
|
||||
for origin in expected_service_details['origins']:
|
||||
if origin['origin'] == item['value']['origin']:
|
||||
origin['hostheadertype'] = 'custom'
|
||||
origin['hostheadervalue'] = item['value'][
|
||||
'hostheadervalue']
|
||||
elif item['value']['hostheadertype'] == 'origin':
|
||||
for origin in expected_service_details['origins']:
|
||||
if origin['origin'] == item['value']['origin']:
|
||||
origin['hostheadertype'] = 'origin'
|
||||
origin['hostheadervalue'] = item['value'][
|
||||
'origin']
|
||||
else:
|
||||
for origin in expected_service_details['origins']:
|
||||
origin['hostheadertype'] = 'domain'
|
||||
origin['hostheadervalue'] = None
|
||||
|
||||
self.client.wait_for_service_status(
|
||||
location=self.service_url,
|
||||
status='deployed',
|
||||
abort_on_status='failed',
|
||||
retry_interval=self.test_config.status_check_retry_interval,
|
||||
retry_timeout=self.test_config.status_check_retry_timeout)
|
||||
|
||||
resp = self.client.get_service(location=self.service_url)
|
||||
body = resp.json()
|
||||
self.assertEqual(body['status'], 'deployed')
|
||||
|
||||
self.assert_patch_service_details(body, expected_service_details)
|
||||
|
||||
def _replace_domain(self, domain):
|
||||
if ('protocol' in domain):
|
||||
if domain['protocol'] == 'https':
|
||||
if (domain['certificate'] == u'shared'):
|
||||
return self.generate_random_string(prefix='api-test-ssl')
|
||||
|
||||
return self.generate_random_string(prefix='api-test-ssl') + '.com'
|
||||
|
||||
@ddt.file_data('data_patch_service_negative.json')
|
||||
def test_patch_service_HTTP_400(self, test_data):
|
||||
|
||||
resp = self.client.patch_service(location=self.service_url,
|
||||
request_body=test_data)
|
||||
self.assertEqual(resp.status_code, 400)
|
||||
|
||||
# nothing should have changed.
|
||||
resp = self.client.get_service(location=self.service_url)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
|
||||
body = resp.json()
|
||||
self.assertEqual(body['status'], 'deployed')
|
||||
|
||||
self.assert_patch_service_details(body, self.original_service_details)
|
||||
|
||||
def test_patch_service_claim_relinquish_domain(self):
|
||||
newdomain = str(uuid.uuid4()) + ".com"
|
||||
add_domain = (
|
||||
[{
|
||||
"op": "add",
|
||||
"path": "/domains/-",
|
||||
"value": {"domain": newdomain, "protocol": "http"}
|
||||
}])
|
||||
remove_domain = (
|
||||
[{
|
||||
"op": "remove",
|
||||
"path": "/domains/1"
|
||||
}])
|
||||
|
||||
# add new domain
|
||||
resp = self.client.patch_service(location=self.service_url,
|
||||
request_body=add_domain)
|
||||
self.assertEqual(resp.status_code, 202)
|
||||
|
||||
# wait for the domain to be added
|
||||
self.client.wait_for_service_status(
|
||||
location=self.service_url,
|
||||
status='deployed',
|
||||
abort_on_status='failed',
|
||||
retry_interval=self.test_config.status_check_retry_interval,
|
||||
retry_timeout=self.test_config.status_check_retry_timeout)
|
||||
|
||||
# make sure the new domain is added
|
||||
resp = self.client.get_service(location=self.service_url)
|
||||
body = resp.json()
|
||||
self.assertEqual(body['status'], 'deployed')
|
||||
self.assertEqual(body['domains'][-1]['domain'], newdomain)
|
||||
|
||||
# remove the new domain
|
||||
resp = self.client.patch_service(location=self.service_url,
|
||||
request_body=remove_domain)
|
||||
self.assertEqual(resp.status_code, 202)
|
||||
|
||||
# wait for the domain to be removed
|
||||
self.client.wait_for_service_status(
|
||||
location=self.service_url,
|
||||
status='deployed',
|
||||
abort_on_status='failed',
|
||||
retry_interval=self.test_config.status_check_retry_interval,
|
||||
retry_timeout=self.test_config.status_check_retry_timeout)
|
||||
# make sure the new domain is removed
|
||||
resp = self.client.get_service(location=self.service_url)
|
||||
body = resp.json()
|
||||
self.assertEqual(body['status'], 'deployed')
|
||||
for domain in body['domains']:
|
||||
self.assertNotEqual(domain['domain'], newdomain)
|
||||
|
||||
# add new domain, again
|
||||
resp = self.client.patch_service(location=self.service_url,
|
||||
request_body=add_domain)
|
||||
self.assertEqual(resp.status_code, 202)
|
||||
|
||||
# wait for the domain to be added
|
||||
self.client.wait_for_service_status(
|
||||
location=self.service_url,
|
||||
status='deployed',
|
||||
abort_on_status='failed',
|
||||
retry_interval=self.test_config.status_check_retry_interval,
|
||||
retry_timeout=self.test_config.status_check_retry_timeout)
|
||||
|
||||
# make sure the new domain is added
|
||||
resp = self.client.get_service(location=self.service_url)
|
||||
body = resp.json()
|
||||
self.assertEqual(body['status'], 'deployed')
|
||||
self.assertEqual(body['domains'][-1]['domain'], newdomain)
|
||||
|
||||
def test_patch_service_add_duplicate_domain(self):
|
||||
# create second service
|
||||
service_name = str(uuid.uuid1())
|
||||
duplicate_domain = str(uuid.uuid1()) + '.com'
|
||||
domain_list = [{"domain": duplicate_domain, "protocol": "http"}]
|
||||
|
||||
origin = str(uuid.uuid1()) + '.com'
|
||||
origin_list = [{"origin": origin,
|
||||
"port": 80, "ssl": False, "rules": []}]
|
||||
|
||||
resp = self.client.create_service(
|
||||
service_name=service_name,
|
||||
domain_list=domain_list,
|
||||
origin_list=origin_list,
|
||||
flavor_id=self.flavor_id)
|
||||
|
||||
service_url = resp.headers["location"]
|
||||
|
||||
# wait until the service is deployed
|
||||
self.client.wait_for_service_status(
|
||||
location=service_url,
|
||||
status='deployed',
|
||||
abort_on_status='failed',
|
||||
retry_interval=self.test_config.status_check_retry_interval,
|
||||
retry_timeout=self.test_config.status_check_retry_timeout)
|
||||
|
||||
resp = self.client.get_service(location=service_url)
|
||||
body = resp.json()
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
self.assertEqual(body['status'], 'deployed')
|
||||
|
||||
# wait to make sure cassandra is eventually consistent
|
||||
time.sleep(self.test_config.cassandra_consistency_wait_time)
|
||||
|
||||
# patch original service with the duplicate domain
|
||||
add_duplicate_domain = (
|
||||
[{
|
||||
"op": "add",
|
||||
"path": "/domains/-",
|
||||
"value": {"domain": duplicate_domain, "protocol": "http"}
|
||||
}])
|
||||
|
||||
# add the duplicate domain
|
||||
resp = self.client.patch_service(location=self.service_url,
|
||||
request_body=add_duplicate_domain)
|
||||
self.assertEqual(resp.status_code, 400)
|
||||
|
||||
def tearDown(self):
|
||||
self.client.delete_service(location=self.service_url)
|
||||
if self.test_config.generate_flavors:
|
||||
self.client.delete_flavor(flavor_id=self.flavor_id)
|
||||
super(TestServicePatch, self).tearDown()
|
||||
|
||||
|
||||
@ddt.ddt
|
||||
class TestServicePatchWithLogDelivery(base.TestBase):
|
||||
|
||||
"""Tests for PATCH Services."""
|
||||
|
||||
def setUp(self):
|
||||
super(TestServicePatchWithLogDelivery, self).setUp()
|
||||
self.service_name = self.generate_random_string(prefix='api-test')
|
||||
self.flavor_id = self.test_flavor
|
||||
self.log_delivery = {"enabled": True}
|
||||
|
||||
domain = self.generate_random_string(prefix='api-test-domain') + '.com'
|
||||
self.domain_list = [
|
||||
{
|
||||
"domain": domain,
|
||||
"protocol": "http"
|
||||
}
|
||||
]
|
||||
|
||||
origin = self.generate_random_string(prefix='api-test-origin') + '.com'
|
||||
self.origin_list = [
|
||||
{
|
||||
"origin": origin,
|
||||
"port": 80,
|
||||
"ssl": False,
|
||||
"rules": [
|
||||
{
|
||||
"name": "default",
|
||||
"request_url": "/*"
|
||||
}
|
||||
],
|
||||
"hostheadertype": "domain",
|
||||
"hostheadervalue": None
|
||||
}
|
||||
]
|
||||
|
||||
self.caching_list = [
|
||||
{
|
||||
"name": "default",
|
||||
"ttl": 3600,
|
||||
"rules": [
|
||||
{
|
||||
"name": "default",
|
||||
"request_url": "/*"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "home",
|
||||
"ttl": 1200,
|
||||
"rules": [
|
||||
{
|
||||
"name": "index",
|
||||
"request_url": "/index.htm"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
self.restrictions_list = [
|
||||
{"name": "website only",
|
||||
"rules": [{"name": "mywebsite.com",
|
||||
"referrer": "www.mywebsite.com",
|
||||
"request_url": "/*"
|
||||
}]}]
|
||||
|
||||
resp = self.client.create_service(
|
||||
service_name=self.service_name,
|
||||
domain_list=self.domain_list,
|
||||
origin_list=self.origin_list,
|
||||
caching_list=self.caching_list,
|
||||
restrictions_list=self.restrictions_list,
|
||||
flavor_id=self.flavor_id,
|
||||
log_delivery=self.log_delivery)
|
||||
|
||||
self.service_url = resp.headers["location"]
|
||||
|
||||
self.original_service_details = {
|
||||
"name": self.service_name,
|
||||
"domains": self.domain_list,
|
||||
"origins": self.origin_list,
|
||||
"caching": self.caching_list,
|
||||
"restrictions": self.restrictions_list,
|
||||
"flavor_id": self.flavor_id,
|
||||
"log_delivery": self.log_delivery}
|
||||
|
||||
self.client.wait_for_service_status(
|
||||
location=self.service_url,
|
||||
status='deployed',
|
||||
abort_on_status='failed',
|
||||
retry_interval=self.test_config.status_check_retry_interval,
|
||||
retry_timeout=self.test_config.status_check_retry_timeout)
|
||||
|
||||
resp = self.client.get_service(location=self.service_url)
|
||||
body = resp.json()
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
self.assertEqual(body['status'], 'deployed')
|
||||
|
||||
def _replace_domain(self, domain):
|
||||
if ('protocol' in domain):
|
||||
if domain['protocol'] == 'https':
|
||||
if (domain['certificate'] == u'shared'):
|
||||
return self.generate_random_string(prefix='api-test-ssl')
|
||||
|
||||
return self.generate_random_string(prefix='api-test-ssl') + '.com'
|
||||
|
||||
@ddt.file_data('data_patch_service.json')
|
||||
def test_patch_service(self, test_data):
|
||||
|
||||
for item in test_data:
|
||||
if 'skip_test' in item:
|
||||
self.skipTest('Not Implemented - bug# 1433807')
|
||||
|
||||
if ('domain' in item['path']) and ('value' in item):
|
||||
if isinstance(item['value'], (list)):
|
||||
item['value'][0]['domain'] = self._replace_domain(
|
||||
domain=item['value'][0])
|
||||
else:
|
||||
item['value']['domain'] = self._replace_domain(
|
||||
domain=item['value'])
|
||||
|
||||
patch = jsonpatch.JsonPatch(test_data)
|
||||
expected_service_details = patch.apply(self.original_service_details)
|
||||
|
||||
resp = self.client.patch_service(location=self.service_url,
|
||||
request_body=test_data)
|
||||
self.assertEqual(resp.status_code, 202)
|
||||
|
||||
for item in test_data:
|
||||
if 'origin' in item['path'] and ('value' in item):
|
||||
if 'hostheadertype' in item['value']:
|
||||
if item['value']['hostheadertype'] == 'custom':
|
||||
for origin in expected_service_details['origins']:
|
||||
if origin['origin'] == item['value']['origin']:
|
||||
origin['hostheadertype'] = 'custom'
|
||||
origin['hostheadervalue'] = item['value'][
|
||||
'hostheadervalue']
|
||||
elif item['value']['hostheadertype'] == 'origin':
|
||||
for origin in expected_service_details['origins']:
|
||||
if origin['origin'] == item['value']['origin']:
|
||||
origin['hostheadertype'] = 'origin'
|
||||
origin['hostheadervalue'] = item['value'][
|
||||
'origin']
|
||||
else:
|
||||
for origin in expected_service_details['origins']:
|
||||
origin['hostheadertype'] = 'domain'
|
||||
origin['hostheadervalue'] = None
|
||||
|
||||
self.client.wait_for_service_status(
|
||||
location=self.service_url,
|
||||
status='deployed',
|
||||
abort_on_status='failed',
|
||||
retry_interval=self.test_config.status_check_retry_interval,
|
||||
retry_timeout=self.test_config.status_check_retry_timeout)
|
||||
|
||||
resp = self.client.get_service(location=self.service_url)
|
||||
body = resp.json()
|
||||
self.assertEqual(body['status'], 'deployed')
|
||||
|
||||
self.assert_patch_service_details(body, expected_service_details)
|
||||
|
||||
def tearDown(self):
|
||||
self.client.delete_service(location=self.service_url)
|
||||
if self.test_config.generate_flavors:
|
||||
self.client.delete_flavor(flavor_id=self.flavor_id)
|
||||
super(TestServicePatchWithLogDelivery, self).tearDown()
|
||||
|
||||
|
||||
@ddt.ddt
|
||||
class TestDefaultServiceFields(providers.TestProviderBase):
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ class TestWebsiteCDN(base.TestBase):
|
|||
def setUp(self):
|
||||
super(TestWebsiteCDN, self).setUp()
|
||||
|
||||
sub_domain = base.random_string(prefix='TestCDN-')
|
||||
sub_domain = base.random_string(prefix='test-cdn-')
|
||||
self.test_domain = sub_domain + '.' + self.dns_config.test_domain
|
||||
|
||||
print('Domain Name', self.test_domain)
|
||||
|
|
@ -75,7 +75,7 @@ class TestWebsiteCDN(base.TestBase):
|
|||
def test_multiple_domains(self):
|
||||
|
||||
# Create another domain in addition to the one created in setUp
|
||||
sub_domain2 = base.random_string(prefix='TestCDN-')
|
||||
sub_domain2 = base.random_string(prefix='test-cdn-')
|
||||
self.test_domain2 = sub_domain2 + '.' + self.dns_config.test_domain
|
||||
|
||||
print('Additional Domain Name', self.test_domain2)
|
||||
|
|
|
|||
Loading…
Reference in New Issue