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

Unable to get VSI details when last TXN is "Software install is finis… #1625

Merged
merged 2 commits into from
Apr 28, 2022
Merged

Unable to get VSI details when last TXN is "Software install is finis… #1625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7813c79
Unable to get VSI details when last TXN is "Software install is finis…
Apr 26, 2022
fbed4c2
fix team code review comments
Apr 28, 2022
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
8 changes: 5 additions & 3 deletions SoftLayer/CLI/virt/detail.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,13 @@ def cli(env, identifier, passwords=False, price=False):
table.add_row(['transient', result.get('transientGuestFlag', False)])
table.add_row(['created', result['createDate']])
table.add_row(['modified', result['modifyDate']])
last_transaction = "{} ({})".format(utils.lookup(result, 'lastTransaction', 'transactionGroup', 'name'),
utils.clean_time(utils.lookup(result, 'lastTransaction', 'modifyDate')))
last_transaction = ''
if result.get('lastTransaction'):
last_transaction = "{} ({})".format(utils.lookup(result, 'lastTransaction', 'transactionGroup', 'name'),
utils.clean_time(utils.lookup(result, 'lastTransaction', 'modifyDate')))

table.add_row(['last_transaction', last_transaction])
table.add_row(['billing', 'Hourly' if result['hourlyBillingFlag'] else'Monthly'])
table.add_row(['billing', 'Hourly' if result['hourlyBillingFlag'] else 'Monthly'])
table.add_row(['preset', utils.lookup(result, 'billingItem',
'orderItem',
'preset',
Expand Down
10 changes: 10 additions & 0 deletions tests/CLI/modules/vs/vs_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,3 +947,13 @@ def test_authorize_volume_and_portable_storage_vs(self):
def test_monitoring_vs(self):
result = self.run_command(['vs', 'monitoring', '1234'])
self.assert_no_fail(result)

def test_last_transaction_empty(self):
vg_return = SoftLayer_Virtual_Guest.getObject
transaction = []

vg_return['lastTransaction'] = transaction
mock = self.set_mock('SoftLayer_Virtual_Guest', 'getObject')
mock.return_value = vg_return
result = self.run_command(['vs', 'detail', '100'])
self.assert_no_fail(result)