Skip to content

Commit a227a4e

Browse files
authored
cloudstack: cs_ip_address: fix vpc support (ansible#22625)
* cloudstack: cs_ip_address: fix vpc support * cloudstack: cs_ip_address: fix pep8
1 parent ce56da6 commit a227a4e

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

lib/ansible/modules/cloud/cloudstack/cs_ip_address.py

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,13 @@
132132
sample: example domain
133133
'''
134134

135-
# import cloudstack common
136-
from ansible.module_utils.cloudstack import *
135+
from ansible.module_utils.basic import AnsibleModule
136+
from ansible.module_utils.cloudstack import (
137+
AnsibleCloudStack,
138+
CloudStackException,
139+
cs_argument_spec,
140+
cs_required_together,
141+
)
137142

138143

139144
class AnsibleCloudStackIPAddress(AnsibleCloudStack):
@@ -147,8 +152,6 @@ def __init__(self, module):
147152
def get_ip_address(self, key=None):
148153
if self.ip_address:
149154
return self._get_by_key(key, self.ip_address)
150-
151-
ip_address = self.module.params.get('ip_address')
152155
args = {
153156
'ipaddress': self.module.params.get('ip_address'),
154157
'account': self.get_account(key='name'),
@@ -170,6 +173,7 @@ def associate_ip_address(self):
170173
'projectid': self.get_project(key='id'),
171174
'networkid': self.get_network(key='id'),
172175
'zoneid': self.get_zone(key='id'),
176+
'vpcid': self.get_vpc(key='id'),
173177
}
174178
ip_address = None
175179
if not self.module.check_mode:
@@ -203,15 +207,15 @@ def disassociate_ip_address(self):
203207
def main():
204208
argument_spec = cs_argument_spec()
205209
argument_spec.update(dict(
206-
ip_address = dict(required=False),
207-
state = dict(choices=['present', 'absent'], default='present'),
208-
vpc = dict(default=None),
209-
network = dict(default=None),
210-
zone = dict(default=None),
211-
domain = dict(default=None),
212-
account = dict(default=None),
213-
project = dict(default=None),
214-
poll_async = dict(type='bool', default=True),
210+
ip_address=dict(required=False),
211+
state=dict(choices=['present', 'absent'], default='present'),
212+
vpc=dict(),
213+
network=dict(),
214+
zone=dict(),
215+
domain=dict(),
216+
account=dict(),
217+
project=dict(),
218+
poll_async=dict(type='bool', default=True),
215219
))
216220

217221
module = AnsibleModule(
@@ -239,7 +243,6 @@ def main():
239243

240244
module.exit_json(**result)
241245

242-
# import module snippets
243-
from ansible.module_utils.basic import *
246+
244247
if __name__ == '__main__':
245248
main()

0 commit comments

Comments
 (0)