Skip to content

aem: fix a bug on detecting linux os type #51

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
yugangw-msft merged 2 commits into from
Feb 8, 2018
Merged

aem: fix a bug on detecting linux os type #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2260b3d
fix a bug on detecting linux os type
yugangw-msft Feb 8, 2018
98794c1
fix lint
yugangw-msft Feb 8, 2018
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
12 changes: 6 additions & 6 deletions src/aem/azext_aem/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ def __init__(self, cmd, resource_group, vm_name, vm_client,
self._resource_group = resource_group
self._cmd = cmd
self._vm = vm_client.virtual_machines.get(resource_group, vm_name, expand='instanceView')
self._extension = (aem_extension_info['Linux'] if bool(self._vm.os_profile.linux_configuration)
else aem_extension_info['Windows'])
os_type = self._vm.storage_profile.os_disk.os_type.value.lower()
self._extension = aem_extension_info['Linux'] if (os_type == 'linux') else aem_extension_info['Windows']
self._skip_storage_analytics = skip_storage_analytics

def enable(self):
Expand Down Expand Up @@ -268,10 +268,10 @@ def _build_extension_cfgs(self, disk_info):

def _get_aem_extension(self):
existing_ext = None
if self._vm.instance_view.extensions:
full_type_name = '.'.join([self._extension['publisher'], self._extension['name']])
existing_ext = next((x for x in self._vm.instance_view.extensions
if x.type and (x.type.lower() == full_type_name.lower())), None)
if self._vm.resources:
existing_ext = next((x for x in self._vm.resources
if x.virtual_machine_extension_type.lower() == self._extension['name'].lower() and
x.publisher.lower() == self._extension['publisher'].lower()), None)
return existing_ext

def _get_disk_info(self):
Expand Down