Skip to content

Fix issue 966 - order NETWORK_GATEWAY_APPLINCE with slcli but meet error Price does not have an id #986

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
merged 3 commits into from
Jun 26, 2018
Merged

Fix issue 966 - order NETWORK_GATEWAY_APPLINCE with slcli but meet error Price does not have an id #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13e6383
Adding order into orderContainers, unittests were also updated, it sh…
Jun 22, 2018
a14537e
Adding "orderContainers" in CLI module, the table should be printed a…
Jun 22, 2018
d7b66fe
Updating the unittests for the CLI module, I added support for "order…
Jun 22, 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
2 changes: 1 addition & 1 deletion SoftLayer/CLI/order/place.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def cli(env, package_keyname, location, preset, verify, billing, complex_type,
if verify:
table = formatting.Table(COLUMNS)
order_to_place = manager.verify_order(*args, **kwargs)
for price in order_to_place['prices']:
for price in order_to_place['orderContainers'][0]['prices']:
cost_key = 'hourlyRecurringFee' if billing == 'hourly' else 'recurringFee'
table.add_row([
price['item']['keyName'],
Expand Down
6 changes: 5 additions & 1 deletion SoftLayer/managers/ordering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ def generate_order(self, package_keyname, location, item_keynames, complex_type=
:param int quantity: The number of resources to order

"""
container = {}
order = {}
extras = extras or {}

Expand All @@ -470,7 +471,10 @@ def generate_order(self, package_keyname, location, item_keynames, complex_type=

price_ids = self.get_price_id_list(package_keyname, item_keynames)
order['prices'] = [{'id': price_id} for price_id in price_ids]
return order

container['orderContainers'] = [order]

return container

def package_locations(self, package_keyname):
"""List datacenter locations for a package keyname
Expand Down
6 changes: 3 additions & 3 deletions tests/CLI/modules/order_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def test_verify_hourly(self):
self.assert_called_with('SoftLayer_Product_Order', 'verifyOrder')
expected_results = []

for price in order['prices']:
for price in order['orderContainers'][0]['prices']:
expected_results.append({'keyName': price['item']['keyName'],
'description': price['item']['description'],
'cost': price['hourlyRecurringFee']})
Expand All @@ -160,7 +160,7 @@ def test_verify_monthly(self):
self.assert_called_with('SoftLayer_Product_Order', 'verifyOrder')
expected_results = []

for price in order['prices']:
for price in order['orderContainers'][0]['prices']:
expected_results.append({'keyName': price['item']['keyName'],
'description': price['item']['description'],
'cost': price['recurringFee']})
Expand Down Expand Up @@ -222,4 +222,4 @@ def _get_verified_order_return(self):
'recurringFee': '120'}
price2 = {'item': item2, 'hourlyRecurringFee': '0.05',
'recurringFee': '150'}
return {'prices': [price1, price2]}
return {'orderContainers': [{'prices': [price1, price2]}]}
30 changes: 17 additions & 13 deletions tests/managers/ordering_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,13 +321,15 @@ def test_generate_order_with_preset(self):
complex_type = 'SoftLayer_Container_Foo'
items = ['ITEM1', 'ITEM2']
preset = 'PRESET_KEYNAME'
expected_order = {'complexType': 'SoftLayer_Container_Foo',
'location': 1854895,
'packageId': 1234,
'presetId': 5678,
'prices': [{'id': 1111}, {'id': 2222}],
'quantity': 1,
'useHourlyPricing': True}
expected_order = {'orderContainers': [
{'complexType': 'SoftLayer_Container_Foo',
'location': 1854895,
'packageId': 1234,
'presetId': 5678,
'prices': [{'id': 1111}, {'id': 2222}],
'quantity': 1,
'useHourlyPricing': True}
]}

mock_pkg, mock_preset, mock_get_ids = self._patch_for_generate()

Expand All @@ -342,12 +344,14 @@ def test_generate_order(self):
pkg = 'PACKAGE_KEYNAME'
items = ['ITEM1', 'ITEM2']
complex_type = 'My_Type'
expected_order = {'complexType': 'My_Type',
'location': 1854895,
'packageId': 1234,
'prices': [{'id': 1111}, {'id': 2222}],
'quantity': 1,
'useHourlyPricing': True}
expected_order = {'orderContainers': [
{'complexType': 'My_Type',
'location': 1854895,
'packageId': 1234,
'prices': [{'id': 1111}, {'id': 2222}],
'quantity': 1,
'useHourlyPricing': True}
]}

mock_pkg, mock_preset, mock_get_ids = self._patch_for_generate()

Expand Down