Skip to content

Add support for reservationAffinity to Compute Instance and InstanceTemplate #459

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

Open
edwardsamuel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for reservationAffinity to Compute Instance and InstanceTemplate #459

Show file tree
Hide file tree
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
79 changes: 79 additions & 0 deletions plugins/modules/gcp_compute_instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,35 @@
field to "{{ name-of-resource }}"'
required: false
type: dict
reservation_affinity:
description:
- Specifies the reservations that this instance can consume from.
required: false
type: dict
suboptions:
consume_reservation_type:
description:
- 'Specifies the type of reservation from which this instance can consume
resources: ANY_RESERVATION (default), SPECIFIC_RESERVATION, or NO_RESERVATION.'
- 'Some valid choices include: "ANY_RESERVATION", "SPECIFIC_RESERVATION",
"NO_RESERVATION"'
required: false
type: str
key:
description:
- Corresponds to the label key of a reservation resource. To target a SPECIFIC_RESERVATION
by name, specify googleapis.com/reservation-name as the key and specify
the name of your reservation as its value.
required: false
type: str
values:
description:
- Corresponds to the label values of a reservation resource. This can be either
a name to a reservation in the same project or "projects/different-project/reservations/some-reservation-name"
to target a shared reservation in the same zone but in a different project.
elements: str
required: false
type: list
scheduling:
description:
- Sets the scheduling options for this instance.
Expand Down Expand Up @@ -956,6 +985,32 @@
If the network is in custom subnet mode, then this field should be specified.
returned: success
type: dict
reservationAffinity:
description:
- Specifies the reservations that this instance can consume from.
returned: success
type: complex
contains:
consumeReservationType:
description:
- 'Specifies the type of reservation from which this instance can consume resources:
ANY_RESERVATION (default), SPECIFIC_RESERVATION, or NO_RESERVATION.'
returned: success
type: str
key:
description:
- Corresponds to the label key of a reservation resource. To target a SPECIFIC_RESERVATION
by name, specify googleapis.com/reservation-name as the key and specify the
name of your reservation as its value.
returned: success
type: str
values:
description:
- Corresponds to the label values of a reservation resource. This can be either
a name to a reservation in the same project or "projects/different-project/reservations/some-reservation-name"
to target a shared reservation in the same zone but in a different project.
returned: success
type: list
scheduling:
description:
- Sets the scheduling options for this instance.
Expand Down Expand Up @@ -1160,6 +1215,9 @@ def main():
subnetwork=dict(type='dict'),
),
),
reservation_affinity=dict(
type='dict', options=dict(consume_reservation_type=dict(type='str'), key=dict(type='str'), values=dict(type='list', elements='str'))
),
scheduling=dict(
type='dict', options=dict(automatic_restart=dict(type='bool'), on_host_maintenance=dict(type='str'), preemptible=dict(type='bool'))
),
Expand Down Expand Up @@ -1266,6 +1324,7 @@ def resource_to_request(module):
u'minCpuPlatform': module.params.get('min_cpu_platform'),
u'name': module.params.get('name'),
u'networkInterfaces': InstanceNetworkinterfacesArray(module.params.get('network_interfaces', []), module).to_request(),
u'reservationAffinity': InstanceReservationaffinity(module.params.get('reservation_affinity', {}), module).to_request(),
u'scheduling': InstanceScheduling(module.params.get('scheduling', {}), module).to_request(),
u'serviceAccounts': InstanceServiceaccountsArray(module.params.get('service_accounts', []), module).to_request(),
u'shieldedInstanceConfig': InstanceShieldedinstanceconfig(module.params.get('shielded_instance_config', {}), module).to_request(),
Expand Down Expand Up @@ -1356,6 +1415,7 @@ def response_to_hash(module, response):
u'minCpuPlatform': response.get(u'minCpuPlatform'),
u'name': response.get(u'name'),
u'networkInterfaces': InstanceNetworkinterfacesArray(response.get(u'networkInterfaces', []), module).from_response(),
u'reservationAffinity': InstanceReservationaffinity(response.get(u'reservationAffinity', {}), module).from_response(),
u'scheduling': InstanceScheduling(response.get(u'scheduling', {}), module).from_response(),
u'serviceAccounts': InstanceServiceaccountsArray(response.get(u'serviceAccounts', []), module).from_response(),
u'shieldedInstanceConfig': InstanceShieldedinstanceconfig(response.get(u'shieldedInstanceConfig', {}), module).from_response(),
Expand Down Expand Up @@ -1784,6 +1844,25 @@ def _response_from_item(self, item):
return remove_nones_from_dict({u'ipCidrRange': item.get(u'ipCidrRange'), u'subnetworkRangeName': item.get(u'subnetworkRangeName')})


class InstanceReservationaffinity(object):
def __init__(self, request, module):
self.module = module
if request:
self.request = request
else:
self.request = {}

def to_request(self):
return remove_nones_from_dict(
{u'consumeReservationType': self.request.get('consume_reservation_type'), u'key': self.request.get('key'), u'values': self.request.get('values')}
)

def from_response(self):
return remove_nones_from_dict(
{u'consumeReservationType': self.request.get(u'consumeReservationType'), u'key': self.request.get(u'key'), u'values': self.request.get(u'values')}
)


class InstanceScheduling(object):
def __init__(self, request, module):
self.module = module
Expand Down
26 changes: 26 additions & 0 deletions plugins/modules/gcp_compute_instance_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,32 @@
If the network is in custom subnet mode, then this field should be specified.
returned: success
type: dict
reservationAffinity:
description:
- Specifies the reservations that this instance can consume from.
returned: success
type: complex
contains:
consumeReservationType:
description:
- 'Specifies the type of reservation from which this instance can consume
resources: ANY_RESERVATION (default), SPECIFIC_RESERVATION, or NO_RESERVATION.'
returned: success
type: str
key:
description:
- Corresponds to the label key of a reservation resource. To target a SPECIFIC_RESERVATION
by name, specify googleapis.com/reservation-name as the key and specify
the name of your reservation as its value.
returned: success
type: str
values:
description:
- Corresponds to the label values of a reservation resource. This can be
either a name to a reservation in the same project or "projects/different-project/reservations/some-reservation-name"
to target a shared reservation in the same zone but in a different project.
returned: success
type: list
scheduling:
description:
- Sets the scheduling options for this instance.
Expand Down
79 changes: 79 additions & 0 deletions plugins/modules/gcp_compute_instance_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,35 @@
and then set this subnetwork field to "{{ name-of-resource }}"'
required: false
type: dict
reservation_affinity:
description:
- Specifies the reservations that this instance can consume from.
required: false
type: dict
suboptions:
consume_reservation_type:
description:
- 'Specifies the type of reservation from which this instance can consume
resources: ANY_RESERVATION (default), SPECIFIC_RESERVATION, or NO_RESERVATION.'
- 'Some valid choices include: "ANY_RESERVATION", "SPECIFIC_RESERVATION",
"NO_RESERVATION"'
required: false
type: str
key:
description:
- Corresponds to the label key of a reservation resource. To target a
SPECIFIC_RESERVATION by name, specify googleapis.com/reservation-name
as the key and specify the name of your reservation as its value.
required: false
type: str
values:
description:
- Corresponds to the label values of a reservation resource. This can
be either a name to a reservation in the same project or "projects/different-project/reservations/some-reservation-name"
to target a shared reservation in the same zone but in a different project.
elements: str
required: false
type: list
scheduling:
description:
- Sets the scheduling options for this instance.
Expand Down Expand Up @@ -901,6 +930,32 @@
If the network is in custom subnet mode, then this field should be specified.
returned: success
type: dict
reservationAffinity:
description:
- Specifies the reservations that this instance can consume from.
returned: success
type: complex
contains:
consumeReservationType:
description:
- 'Specifies the type of reservation from which this instance can consume
resources: ANY_RESERVATION (default), SPECIFIC_RESERVATION, or NO_RESERVATION.'
returned: success
type: str
key:
description:
- Corresponds to the label key of a reservation resource. To target a SPECIFIC_RESERVATION
by name, specify googleapis.com/reservation-name as the key and specify
the name of your reservation as its value.
returned: success
type: str
values:
description:
- Corresponds to the label values of a reservation resource. This can be
either a name to a reservation in the same project or "projects/different-project/reservations/some-reservation-name"
to target a shared reservation in the same zone but in a different project.
returned: success
type: list
scheduling:
description:
- Sets the scheduling options for this instance.
Expand Down Expand Up @@ -1061,6 +1116,9 @@ def main():
subnetwork=dict(type='dict'),
),
),
reservation_affinity=dict(
type='dict', options=dict(consume_reservation_type=dict(type='str'), key=dict(type='str'), values=dict(type='list', elements='str'))
),
scheduling=dict(
type='dict', options=dict(automatic_restart=dict(type='bool'), on_host_maintenance=dict(type='str'), preemptible=dict(type='bool'))
),
Expand Down Expand Up @@ -1319,6 +1377,7 @@ def to_request(self):
u'metadata': self.request.get('metadata'),
u'guestAccelerators': InstanceTemplateGuestacceleratorsArray(self.request.get('guest_accelerators', []), self.module).to_request(),
u'networkInterfaces': InstanceTemplateNetworkinterfacesArray(self.request.get('network_interfaces', []), self.module).to_request(),
u'reservationAffinity': InstanceTemplateReservationaffinity(self.request.get('reservation_affinity', {}), self.module).to_request(),
u'scheduling': InstanceTemplateScheduling(self.request.get('scheduling', {}), self.module).to_request(),
u'serviceAccounts': InstanceTemplateServiceaccountsArray(self.request.get('service_accounts', []), self.module).to_request(),
u'tags': InstanceTemplateTags(self.request.get('tags', {}), self.module).to_request(),
Expand All @@ -1337,6 +1396,7 @@ def from_response(self):
u'metadata': self.request.get(u'metadata'),
u'guestAccelerators': InstanceTemplateGuestacceleratorsArray(self.request.get(u'guestAccelerators', []), self.module).from_response(),
u'networkInterfaces': InstanceTemplateNetworkinterfacesArray(self.request.get(u'networkInterfaces', []), self.module).from_response(),
u'reservationAffinity': InstanceTemplateReservationaffinity(self.request.get(u'reservationAffinity', {}), self.module).from_response(),
u'scheduling': InstanceTemplateScheduling(self.request.get(u'scheduling', {}), self.module).from_response(),
u'serviceAccounts': InstanceTemplateServiceaccountsArray(self.request.get(u'serviceAccounts', []), self.module).from_response(),
u'tags': InstanceTemplateTags(self.request.get(u'tags', {}), self.module).from_response(),
Expand Down Expand Up @@ -1604,6 +1664,25 @@ def _response_from_item(self, item):
return remove_nones_from_dict({u'ipCidrRange': item.get(u'ipCidrRange'), u'subnetworkRangeName': item.get(u'subnetworkRangeName')})


class InstanceTemplateReservationaffinity(object):
def __init__(self, request, module):
self.module = module
if request:
self.request = request
else:
self.request = {}

def to_request(self):
return remove_nones_from_dict(
{u'consumeReservationType': self.request.get('consume_reservation_type'), u'key': self.request.get('key'), u'values': self.request.get('values')}
)

def from_response(self):
return remove_nones_from_dict(
{u'consumeReservationType': self.request.get(u'consumeReservationType'), u'key': self.request.get(u'key'), u'values': self.request.get(u'values')}
)


class InstanceTemplateScheduling(object):
def __init__(self, request, module):
self.module = module
Expand Down
27 changes: 27 additions & 0 deletions plugins/modules/gcp_compute_instance_template_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,33 @@
should be specified.
returned: success
type: dict
reservationAffinity:
description:
- Specifies the reservations that this instance can consume from.
returned: success
type: complex
contains:
consumeReservationType:
description:
- 'Specifies the type of reservation from which this instance can consume
resources: ANY_RESERVATION (default), SPECIFIC_RESERVATION, or NO_RESERVATION.'
returned: success
type: str
key:
description:
- Corresponds to the label key of a reservation resource. To target
a SPECIFIC_RESERVATION by name, specify googleapis.com/reservation-name
as the key and specify the name of your reservation as its value.
returned: success
type: str
values:
description:
- Corresponds to the label values of a reservation resource. This can
be either a name to a reservation in the same project or "projects/different-project/reservations/some-reservation-name"
to target a shared reservation in the same zone but in a different
project.
returned: success
type: list
scheduling:
description:
- Sets the scheduling options for this instance.
Expand Down