x

Author: wilkmaia

fastly/__init__.py

@@ -984,7 +984,7 @@ def _formdata(self, fields, valid=[]):
 				data[key] = fields[key]
 				if isinstance(data[key], bool):
 					data[key] = str(int(data[key]))
-		return urllib.urlencode(data)
+		return urllib.parse.urlencode(data)
 
 	def get_acl(self, service_id, version_number, name):
 		content = self._fetch("/service/{}/version/{}/acl/{}".format(service_id, version_number, name))
@@ -998,6 +998,56 @@ def create_acl(self, service_id, version_number, name):
 		content = self._fetch("/service/{}/version/{}/acl".format(service_id, version_number), method="POST", body=body)
 		return FastlyACL(self, content)
 
+	def create_acl_entry(self, service_id, acl_id, ip, subnet=None):
+		body = self._formdata({
+			"ip": ip,
+			"subnet": subnet,
+		}, ["ip", "subnet"])
+
+		content = self._fetch("/service/{}/acl/{}/entry".format(service_id, acl_id), method="POST", body=body)
+		return FastlyACLEntry(self, content)
+
+	def get_acl_entries(self, service_id, acl_id):
+		content = self._fetch("/service/{}/acl/{}/entries".format(service_id, acl_id))
+		result = []
+		for el in content:
+			result.append(FastlyACLEntry(self, el))
+
+		return result
+
+	def delete_acl_entry(self, service_id, acl_id, id):
+		content = self._fetch("/service/{}/acl/{}/entry/{}".format(service_id, acl_id, id), method="DELETE")
+		return self._status(content)
+
+	def get_dic(self, service_id, version_number, name):
+		content = self._fetch("/service/{}/version/{}/dictionary/{}".format(service_id, version_number, name))
+		return FastlyDictionary(self, content)
+
+	def create_dic(self, service_id, version_number, name):
+		body = self._formdata({
+			"name": name,
+		}, ["name"])
+
+		content = self._fetch("/service/{}/version/{}/dictionary".format(service_id, version_number), method="POST", body=body)
+		return FastlyDictionary(self, content)
+
+	def create_dic_entry(self, service_id, dic_id, key, value):
+		body = self._formdata({
+			"item_key": key,
+			"item_value": value,
+		}, ["item_key", "item_value"])
+
+		content = self._fetch("/service/{}/dictionary/{}/item".format(service_id, dic_id), method="POST", body=body)
+		return FastlyDictionaryItem(self, content)
+
+	def get_dic_entry(self, service_id, dic_id, key):
+		content = self._fetch("/service/{}/dictionary/{}/item/{}".format(service_id, dic_id, key))
+		return FastlyDictionaryItem(self, content)
+
+	def delete_dic_entry(self, service_id, dic_id, key):
+		content = self._fetch("/service/{}/dictionary/{}/item/{}".format(service_id, dic_id, key), method="DELETE")
+		return self._status(content)
+
 	def _fetch(self, url, method="GET", body=None, headers={}):
 		hdrs = {}
 		hdrs.update(headers)
@@ -1014,6 +1064,7 @@ def _fetch(self, url, method="GET", body=None, headers={}):
 
 		conn = httplib2.Http(disable_ssl_certificate_validation=False, timeout=10)
 		endpoint = "%s://%s%s" % (FASTLY_SCHEME, FASTLY_HOST, url)
+		print(endpoint)
 		return self._check(*conn.request(endpoint, method, body=body, headers=hdrs))
 
 	def _check(self, resp, content):
@@ -1544,7 +1595,7 @@ class FastlyWordpress(FastlyObject, IServiceVersionObject):
 	]
 
 
-class FastlyACL(FastlyObject):
+class FastlyACL(FastlyObject, object):
 	"""An ACL is a named access control list for matching against a client's IP address during VCL processing"""
 	FIELDS = [
 		"id",
@@ -1557,6 +1608,50 @@ class FastlyACL(FastlyObject):
 	]
 
 
+class FastlyACLEntry(FastlyObject, object):
+	"""An ACL entry holds an IP address with optional subnet to make up an entry in an ACL"""
+	FIELDS = [
+		"ip",
+		"subnet",
+		"acl_id",
+		"negated",
+		"comment",
+		"id",
+		"service_id",
+	]
+
+
+class FastlyDictionary(FastlyObject, object):
+	"""A Dictionary is a table that stores key value pairs accessible to VCL functions during VCL processing"""
+	FIELDS = [
+		"id",
+		"name",
+		"version",
+		"service_id",
+		"created_at",
+		"updated_at",
+		"deleted_at",
+	]
+
+
+class FastlyDictionaryItem(FastlyObject, object):
+	"""A DictionaryItem holds a key and value that make up an entry in a Dictionary"""
+	FIELDS = [
+		"item_key",
+		"item_value",
+		"dictionary_id",
+		"service_id",
+	]
+
+	@property
+	def key(self):
+		return self.item_key
+
+	@property
+	def value(self):
+		return self.item_value
+
+
 def connect(token):
 	conn = FastlyConnection(token)
 	return conn