Skip to content

[LIBCLOUD-541] Add destination(target) instance tags support to GCE driv... #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zerthimon wants to merge 1 commit into from
Closed

[LIBCLOUD-541] Add destination(target) instance tags support to GCE driv... #278

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions libcloud/compute/drivers/gce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,14 @@ def __repr__(self):
class GCEFirewall(UuidMixin):
"""A GCE Firewall rule class."""
def __init__(self, id, name, allowed, network, source_ranges, source_tags,
driver, extra=None):
target_tags, driver, extra=None):
self.id = str(id)
self.name = name
self.network = network
self.allowed = allowed
self.source_ranges = source_ranges
self.source_tags = source_tags
self.target_tags = target_tags
self.driver = driver
self.extra = extra
UuidMixin.__init__(self)
Expand Down Expand Up @@ -986,7 +987,8 @@ def ex_create_healthcheck(self, name, host=None, path=None, port=None,
return self.ex_get_healthcheck(name)

def ex_create_firewall(self, name, allowed, network='default',
source_ranges=None, source_tags=None):
source_ranges=None, source_tags=None,
target_tags=None):
"""
Create a firewall on a network.

Expand Down Expand Up @@ -1020,9 +1022,12 @@ def ex_create_firewall(self, name, allowed, network='default',
['0.0.0.0/0']
:type source_ranges: ``list`` of ``str``

:keyword source_tags: A list of instance tags which the rules apply
:keyword source_tags: A list of source instance tags the rules apply to
:type source_tags: ``list`` of ``str``

:keyword target_tags: A list of target instance tags the rules apply to
:type target_tags: ``list`` of ``str``

:return: Firewall object
:rtype: :class:`GCEFirewall`
"""
Expand All @@ -1038,6 +1043,8 @@ def ex_create_firewall(self, name, allowed, network='default',
firewall_data['sourceRanges'] = source_ranges or ['0.0.0.0/0']
if source_tags is not None:
firewall_data['sourceTags'] = source_tags
if target_tags is not None:
firewall_data['targetTags'] = target_tags

request = '/global/firewalls'

Expand Down Expand Up @@ -1519,6 +1526,8 @@ def ex_update_firewall(self, firewall):
firewall_data['sourceRanges'] = firewall.source_ranges
if firewall.source_tags:
firewall_data['sourceTags'] = firewall.source_tags
if firewall.target_tags:
firewall_data['targetTags'] = firewall.target_tags
if firewall.extra['description']:
firewall_data['description'] = firewall.extra['description']

Expand Down Expand Up @@ -3008,11 +3017,13 @@ def _to_firewall(self, firewall):
network = self.ex_get_network(extra['network_name'])
source_ranges = firewall.get('sourceRanges')
source_tags = firewall.get('sourceTags')
target_tags = firewall.get('targetTags')

return GCEFirewall(id=firewall['id'], name=firewall['name'],
allowed=firewall.get('allowed'), network=network,
source_ranges=source_ranges,
source_tags=source_tags,
target_tags=target_tags,
driver=self, extra=extra)

def _to_forwarding_rule(self, forwarding_rule):
Expand Down