cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes bugs introduced while removing the f5-sdk (#48775)

Browse source
This commit is contained in:
Tim Rupp 2018-11-15 19:54:19 -08:00 • committed by GitHub
parent 5e0effdfcc
commit 8b8aca21c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/ansible/modules/network/f5/bigip_vcmp_guest.py
View file

@ -164,26 +164,26 @@ EXAMPLES = r'''
- name: Create a vCMP guest - name: Create a vCMP guest
bigip_vcmp_guest: bigip_vcmp_guest:
name: foo name: foo
password: secret
server: lb.mydomain.com
state: present
user: admin
mgmt_network: bridge mgmt_network: bridge
mgmt_address: 10.20.30.40/24 mgmt_address: 10.20.30.40/24
provider:
password: secret
server: lb.mydomain.com
user: admin
delegate_to: localhost delegate_to: localhost
- name: Create a vCMP guest with specific VLANs - name: Create a vCMP guest with specific VLANs
bigip_vcmp_guest: bigip_vcmp_guest:
name: foo name: foo
password: secret
server: lb.mydomain.com
state: present
user: admin
mgmt_network: bridge mgmt_network: bridge
mgmt_address: 10.20.30.40/24 mgmt_address: 10.20.30.40/24
vlans: vlans:
- vlan1 - vlan1
- vlan2 - vlan2
provider:
password: secret
server: lb.mydomain.com
user: admin
delegate_to: localhost delegate_to: localhost
- name: Remove vCMP guest and disk - name: Remove vCMP guest and disk
@ -191,6 +191,10 @@ EXAMPLES = r'''
name: guest1 name: guest1
state: absent state: absent
delete_virtual_disk: yes delete_virtual_disk: yes
provider:
password: secret
server: lb.mydomain.com
user: admin
register: result register: result
''' '''
@ -361,7 +365,7 @@ class ModuleParameters(Parameters):
) )
def initial_image_exists(self, image): def initial_image_exists(self, image):
uri = "https://{0}:{1}/mgmt/tm/sys/software/images/".format( uri = "https://{0}:{1}/mgmt/tm/sys/software/image/".format(
self.client.provider['server'], self.client.provider['server'],
self.client.provider['server_port'], self.client.provider['server_port'],
) )
@ -436,7 +440,7 @@ class Difference(object):
want = self.want.mgmt_tuple want = self.want.mgmt_tuple
if want.subnet is None: if want.subnet is None:
raise F5ModuleError( raise F5ModuleError(
"A subnet must be specified when changing the mgmt_address" "A subnet must be specified when changing the mgmt_address."
) )
if self.want.mgmt_address != self.have.mgmt_address: if self.want.mgmt_address != self.have.mgmt_address:
return self.want.mgmt_address return self.want.mgmt_address
@ -776,8 +780,8 @@ class ModuleManager(object):
result = parseStats(response) result = parseStats(response)
if 'stats' in result: if 'stats' in result:
if result['requestedState']['description'] == 'provisioned': if result['stats']['requestedState'] == 'provisioned':
if result['vmStatus']['description'] == 'stopped': if result['stats']['vmStatus'] == 'stopped':
return True return True
return False return False
@ -805,8 +809,8 @@ class ModuleManager(object):
result = parseStats(response) result = parseStats(response)
if 'stats' in result: if 'stats' in result:
if result['requestedState']['description'] == 'deployed': if result['stats']['requestedState'] == 'deployed':
if result['vmStatus']['description'] == 'running': if result['stats']['vmStatus'] == 'running':
return True return True
return False return False