Skip to content
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

fixes #191 #193

Closed
wants to merge 1 commit into from
Closed

fixes #191 #193

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
68 changes: 47 additions & 21 deletions modules/user_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,31 +286,57 @@ def get_vm_access_details(vm):
ip_Public = None
ip_Forwarder = None
services = []
internals = []
# Get private IPs
if 'autoIpConfig' in nic['ipConfig']:
internal = nic['ipConfig']['autoIpConfig']['allocatedIp']
elif 'staticIpConfig' in nic['ipConfig']:
internal = nic['ipConfig']['staticIpConfig']['ip']
n['internalIP'] = internal
if nic.get('ipConfig'):
if 'autoIpConfig' in nic['ipConfig']:
internal = nic['ipConfig']['autoIpConfig']['allocatedIp']
elif 'staticIpConfig' in nic['ipConfig']:
internal = nic['ipConfig']['staticIpConfig']['ip']
# Get FQDN
if 'fqdn' in nic['ipConfig']:
fqdn = nic['ipConfig']['fqdn']
n['fqdn'] = fqdn
# Get public IP
if nic['ipConfig']['hasPublicIp']:
try:
ip_Elastic = nic['ipConfig']['elasticIpAddress']
except:
try:
ip_Public = nic['ipConfig']['publicIp']
except:
pass
elif 'publicIp' in nic['ipConfig']:
ip_Forwarder = nic['ipConfig']['publicIp']
#Handles vlan interfaces
elif nic.get('vlanInterfaces'):
for vlan in nic['vlanInterfaces']:
if vlan.get('ipConfigurations'):
for ipConfig in vlan['ipConfigurations']:
# Get FQDN
if 'fqdn' in ipConfig:
fqdn = ipConfig['fqdn']
n['fqdn'] = fqdn
# Get public IP
if ipConfig['hasPublicIp']:
try:
ip_Elastic = ipConfig['elasticIpAddress']
except:
try:
ip_Public = ipConfig['publicIp']
except:
pass
elif 'publicIp' in ipConfig:
ip_Forwarder = ipConfig['publicIp']
#Get private IPs
if ipConfig.get('staticIpConfig'):
internals.append(str(ipConfig['staticIpConfig']['ip'].encode('ascii','ignore')))
internal = ' '.join(map(str, internals))
# Get extra private IPs
for addtlIp in nic.get('additionalIpConfig', []):
ip_Additional.append(addtlIp['staticIpConfig']['ip'])
n['internalIPs'] = ip_Additional
# Get FQDN
if 'fqdn' in nic['ipConfig']:
fqdn = nic['ipConfig']['fqdn']
n['fqdn'] = fqdn
# Get public IP
if nic['ipConfig']['hasPublicIp']:
try:
ip_Elastic = nic['ipConfig']['elasticIpAddress']
except:
try:
ip_Public = nic['ipConfig']['publicIp']
except:
pass
elif 'publicIp' in nic['ipConfig']:
ip_Forwarder = nic['ipConfig']['publicIp']
n['internalIPs'] = ip_Additional

# Check for services
for svc in vm.get('suppliedServices', []):
if svc['external'] and 'externalPort' in svc and svc['useLuidForIpConfig'] and nic['ipConfig']['id'] == svc['ipConfigLuid'] and not svc['name'].startswith('dummy'):
Expand Down