Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(706)

Unified Diff: boto/cloudfront/__init__.py

Issue 8386013: Merging in latest boto. (Closed) Base URL: svn://svn.chromium.org/boto
Patch Set: Redoing vendor drop by deleting and then merging. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « boto/cloudformation/template.py ('k') | boto/cloudfront/distribution.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: boto/cloudfront/__init__.py
diff --git a/boto/cloudfront/__init__.py b/boto/cloudfront/__init__.py
index bd02b0000900a88e728ddb2e915aa3990e24b8d8..7f98b70b75a894a0f5dd37e03bdce34914703409 100644
--- a/boto/cloudfront/__init__.py
+++ b/boto/cloudfront/__init__.py
@@ -153,10 +153,11 @@ class CloudFrontConnection(AWSAuthConnection):
return self._set_config(distribution_id, etag, config)
def create_distribution(self, origin, enabled, caller_reference='',
- cnames=None, comment=''):
+ cnames=None, comment='', trusted_signers=None):
config = DistributionConfig(origin=origin, enabled=enabled,
caller_reference=caller_reference,
- cnames=cnames, comment=comment)
+ cnames=cnames, comment=comment,
+ trusted_signers=trusted_signers)
return self._create_object(config, 'distribution', Distribution)
def delete_distribution(self, distribution_id, etag):
@@ -181,10 +182,12 @@ class CloudFrontConnection(AWSAuthConnection):
def create_streaming_distribution(self, origin, enabled,
caller_reference='',
- cnames=None, comment=''):
+ cnames=None, comment='',
+ trusted_signers=None):
config = StreamingDistributionConfig(origin=origin, enabled=enabled,
caller_reference=caller_reference,
- cnames=cnames, comment=comment)
+ cnames=cnames, comment=comment,
+ trusted_signers=trusted_signers)
return self._create_object(config, 'streaming-distribution',
StreamingDistribution)
@@ -246,3 +249,16 @@ class CloudFrontConnection(AWSAuthConnection):
else:
raise CloudFrontServerError(response.status, response.reason, body)
+ def invalidation_request_status (self, distribution_id, request_id, caller_reference=None):
+ uri = '/%s/distribution/%s/invalidation/%s' % (self.Version, distribution_id, request_id )
+ response = self.make_request('GET', uri, {'Content-Type' : 'text/xml'})
+ body = response.read()
+ if response.status == 200:
+ paths = InvalidationBatch([])
+ h = handler.XmlHandler(paths, self)
+ xml.sax.parseString(body, h)
+ return paths
+ else:
+ raise CloudFrontServerError(response.status, response.reason, body)
+
+
« no previous file with comments | « boto/cloudformation/template.py ('k') | boto/cloudfront/distribution.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698