Skip to content

Refresh IP was fixed with the latest CloudShell API changes #249

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

Merged
borismod merged 2 commits into from
Feb 28, 2016
Merged

Refresh IP was fixed with the latest CloudShell API changes #249

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9a1f71
Refresh IP was fixed with the latest CloudShell API changes
borismod Feb 28, 2016
4f7bd63
Merge branch 'develop' into feature/borismod_152_advanced_refresh_ip
borismod Feb 28, 2016
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
16 changes: 3 additions & 13 deletions vCenterShell/commands/refresh_ip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,9 @@ def _get_ip_match_function(session, resource_name):
ip_regexes = []
ip_regex = '.*'

if resource.VmDetails \
and hasattr(resource.VmDetails[0], 'VmCustomParam') \
and resource.VmDetails[0].VmCustomParam\
and hasattr(resource.VmDetails[0].VmCustomParam, 'Name') \
and isinstance(resource.VmDetails[0].VmCustomParam.Name, str) \
and resource.VmDetails[0].VmCustomParam.Name == 'ip_regex' \
and hasattr(resource.VmDetails[0].VmCustomParam, 'Value') \
and isinstance(resource.VmDetails[0].VmCustomParam.Value, str):
ip_regexes = [resource.VmDetails[0].VmCustomParam.Value]
elif resource.VmDetails \
and hasattr(resource.VmDetails[0], 'VmCustomParams') \
and resource.VmDetails[0].VmCustomParams:
custom_params = resource.VmDetails[0].VmCustomParams
vm_details = resource.VmDetails
if vm_details and hasattr(vm_details, 'VmCustomParams') and vm_details.VmCustomParams:
custom_params = vm_details.VmCustomParams
params = custom_params if isinstance(custom_params, list) else [custom_params]
ip_regexes = [custom_param.Value for custom_param
in params
Expand Down