Merge lp:~nuclearbob/utah/vm-teardown-fix into lp:utah
Proposed by
Max Brustkern
Status: | Merged |
---|---|
Approved by: | Javier Collado |
Approved revision: | 725 |
Merged at revision: | 755 |
Proposed branch: | lp:~nuclearbob/utah/vm-teardown-fix |
Merge into: | lp:utah |
Diff against target: |
116 lines (+35/-16) 2 files modified
utah/provisioning/vm/libvirtvm.py (+34/-16) utah/provisioning/vm/vm.py (+1/-0) |
To merge this branch: | bzr merge lp:~nuclearbob/utah/vm-teardown-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Javier Collado (community) | Approve | ||
Max Brustkern (community) | Needs Resubmitting | ||
Review via email:
|
Description of the change
This branch wraps checks if self.vm is None in virtual machine classes to handle things correctly when self.vm has not yet been setup. Also, self.disks in destroy is similarly wrapped in a try/except block to workaround problems.
To post a comment you must log in.
I'm not sure about how all this works, but I think that `vm` attribute
should be initialized to None in the __init_ method and that all the
try/except blocks should be transformed to checks to ensure that `vm`
is not `None`.