Skip to content

Commit 192b8a7

Browse files
caberoscaberos
caberos
authored and
caberos
committed
fix the merge conflicts
2 parents a8fad38 + d589ba4 commit 192b8a7

File tree

16 files changed

+190
-37
lines changed

16 files changed

+190
-37
lines changed

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Release Snapcraft and PyPi (Testing)
1+
name: Release Snapcraft and PyPi
22

33
on:
44
release:
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-18.04
1010
strategy:
1111
matrix:
12-
arch: ['armhf','amd64','arm64','ppc64el','s390x','i386']
12+
arch: ['armhf','amd64','arm64','ppc64el','s390x']
1313
steps:
1414
- name: Install Snapcraft
1515
uses: samuelmeuli/action-snapcraft@v1.2.0
@@ -44,7 +44,7 @@ jobs:
4444
--outdir dist/
4545
.
4646
- name: Publish 📦 to Test PyPI
47-
uses: pypa/gh-action-pypi-publish@master
47+
uses: pypa/gh-action-pypi-publish@release/v1
4848
with:
4949
user: __token__
5050
password: ${{ secrets.CGALLO_PYPI }}

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: [3.7,3.8,3.9,'3.10']
13+
python-version: [3.7,3.8,3.9,'3.10',3.11]
1414

1515
steps:
1616
- uses: actions/checkout@v2

‎CHANGELOG.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,34 @@
11
# Change Log
22

3+
## [6.1.3] - 2022-11-30
4+
5+
#### What's Changed
6+
* New Command: Hardware notifications by @caberos in https://github.com/softlayer/softlayer-python/pull/1756
7+
* New Command: virtual notifications by @caberos in https://github.com/softlayer/softlayer-python/pull/1758
8+
* Change regex in rich text in simple option in help text by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1759
9+
* pip prod(deps): bump rich from 12.5.1 to 12.6.0 by @dependabot in https://github.com/softlayer/softlayer-python/pull/1760
10+
* add more information to vs credentials by @caberos in https://github.com/softlayer/softlayer-python/pull/1762
11+
* Fixed maxint issue by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1765
12+
* Added csv output format by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1766
13+
* add more information on hw credentials by @caberos in https://github.com/softlayer/softlayer-python/pull/1767
14+
* Delete twitter link in documentation by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1769
15+
* new command hw create-credential by @caberos in https://github.com/softlayer/softlayer-python/pull/1774
16+
* fix the hw credential error by @caberos in https://github.com/softlayer/softlayer-python/pull/1781
17+
* Added test suite for py311 by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1784
18+
* New feature to change theme in slcli like dark, light o maintain in default by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1775
19+
* Match `virtual detail --prices` option with `hardware detail --prices` option by @BrianSantivanez in https://github.com/softlayer/softlayer-python/pull/1780
20+
* Fixing preset-list pricing table by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1782
21+
* fix the call api cannot handle empty results by @caberos in https://github.com/softlayer/softlayer-python/pull/1789
22+
* Debug output changed to a valid JSON by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1791
23+
* slcli hw add-notifications crashes with a bad user by @caberos in https://github.com/softlayer/softlayer-python/pull/1786
24+
* del-notification commands, rename the commands to notifications-add by @caberos in https://github.com/softlayer/softlayer-python/pull/1785
25+
* Add --extras to slcli order quote by @caberos in https://github.com/softlayer/softlayer-python/pull/1792
26+
* An error is displaying for volume with replica in slcli for Active pr… by @caberos in https://github.com/softlayer/softlayer-python/pull/1794
27+
28+
29+
**Full Changelog**: https://github.com/softlayer/softlayer-python/compare/v6.1.2...v6.1.3
30+
31+
332
## [6.1.2] - 2022-09-23
433

534
#### What's Changed

‎SoftLayer/CLI/subnet/detail.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def cli(env, identifier, no_vs, no_hardware):
3939
table.add_row(['identifier',
4040
'%s/%s' % (subnet['networkIdentifier'],
4141
str(subnet['cidr']))])
42-
table.add_row(['subnet type', subnet['subnetType']])
42+
table.add_row(['subnet type', subnet.get('subnetType', formatting.blank())])
4343
table.add_row(['network space',
4444
utils.lookup(subnet, 'networkVlan', 'networkSpace')])
4545
table.add_row(['gateway', subnet.get('gateway', formatting.blank())])

‎SoftLayer/CLI/subnet/list.py‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ def cli(env, sortby, datacenter, identifier, subnet_type, network_space, ipv4, i
3535
mgr = SoftLayer.NetworkManager(env.client)
3636

3737
table = formatting.Table([
38-
'id', 'identifier', 'type', 'network_space', 'datacenter', 'vlan_id',
39-
'IPs', 'hardware', 'vs',
38+
'Id', 'Identifier', 'Network', 'Type', 'VLAN', 'Location', 'Target',
39+
'IPs', 'Hardware', 'Vs', 'Tags', 'Note'
4040
])
4141
table.sortby = sortby
4242

@@ -55,18 +55,36 @@ def cli(env, sortby, datacenter, identifier, subnet_type, network_space, ipv4, i
5555
)
5656

5757
for subnet in subnets:
58+
subnet_type = subnet.get('subnetType', formatting.blank())
59+
if subnet_type == 'PRIMARY' or subnet_type == 'PRIMARY_6' or subnet_type == 'ADDITIONAL_PRIMARY':
60+
subnet_type = 'Primary'
61+
if subnet_type == 'SECONDARY_ON_VLAN':
62+
subnet_type = 'Portable'
63+
if subnet_type == 'STATIC_IP_ROUTED':
64+
subnet_type = 'Static'
65+
if subnet_type == 'GLOBAL_IP':
66+
subnet_type = 'Global'
67+
68+
network = subnet.get('addressSpace', formatting.blank())
69+
if network is not None:
70+
network = str(network).capitalize()
71+
72+
vlan = utils.lookup(subnet, 'networkVlan', 'fullyQualifiedName')
73+
if vlan is None:
74+
vlan = 'Unrouted'
5875
table.add_row([
5976
subnet['id'],
6077
'%s/%s' % (subnet['networkIdentifier'], str(subnet['cidr'])),
61-
subnet.get('subnetType', formatting.blank()),
62-
utils.lookup(subnet,
63-
'networkVlan',
64-
'networkSpace') or formatting.blank(),
65-
utils.lookup(subnet, 'datacenter', 'name',) or formatting.blank(),
66-
subnet['networkVlanId'],
78+
network,
79+
subnet_type,
80+
vlan,
81+
utils.lookup(subnet, 'datacenter', 'name') or formatting.blank(),
82+
utils.lookup(subnet, 'endPointIpAddress', 'ipAddress') or formatting.blank(),
6783
subnet['ipAddressCount'],
6884
len(subnet['hardware']),
6985
len(subnet['virtualGuests']),
86+
formatting.tags(subnet.get('tagReferences')),
87+
utils.lookup(subnet, 'note') or formatting.blank(),
7088
])
7189

7290
env.fout(table)

‎SoftLayer/CLI/ticket/list.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# :license: MIT, see LICENSE for more details.
33

44
import click
5+
from SoftLayer import utils
56

67
import SoftLayer
78
from SoftLayer.CLI import environment
@@ -30,7 +31,7 @@ def cli(env, is_open):
3031
ticket['serviceProviderResourceId'],
3132
user,
3233
click.wrap_text(ticket['title']),
33-
ticket['lastEditDate'],
34+
utils.clean_time(ticket.get('lastEditDate'), out_format="%Y-%m-%d"),
3435
ticket['status']['name'],
3536
ticket.get('updateCount', 0),
3637
ticket.get('priority', 0)

‎SoftLayer/consts.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
:license: MIT, see LICENSE for more details.
77
"""
8-
VERSION = 'v6.1.2'
8+
VERSION = 'v6.1.3'
99
API_PUBLIC_ENDPOINT = 'https://api.softlayer.com/xmlrpc/v3.1/'
1010
API_PRIVATE_ENDPOINT = 'https://api.service.softlayer.com/xmlrpc/v3.1/'
1111
API_PUBLIC_ENDPOINT_REST = 'https://api.softlayer.com/rest/v3.1/'

‎SoftLayer/fixtures/SoftLayer_Product_Package.py‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,3 +2216,63 @@
22162216
}
22172217
]
22182218
}]
2219+
2220+
getVSDiskItemPrices = [
2221+
{
2222+
"id": 2255,
2223+
"locationGroupId": None,
2224+
"categories": [
2225+
{
2226+
"categoryCode": "guest_disk1",
2227+
"id": 82,
2228+
"name": "Second Disk",
2229+
"quantityLimit": 0,
2230+
"sortOrder": None
2231+
},
2232+
{
2233+
"categoryCode": "guest_disk2",
2234+
"id": 92,
2235+
"name": "Third Disk",
2236+
"quantityLimit": 0,
2237+
"sortOrder": None
2238+
},
2239+
{
2240+
"categoryCode": "guest_disk3",
2241+
"id": 93,
2242+
"name": "Fourth Disk",
2243+
"quantityLimit": 0,
2244+
"sortOrder": None
2245+
},
2246+
{
2247+
"categoryCode": "guest_disk4",
2248+
"id": 116,
2249+
"name": "Fifth Disk",
2250+
"quantityLimit": 0,
2251+
"sortOrder": None
2252+
}
2253+
],
2254+
"item": {
2255+
"capacity": "10",
2256+
"description": "10 GB (SAN)",
2257+
"keyName": "GUEST_DISK_10_GB_SAN"
2258+
}
2259+
},
2260+
{
2261+
"id": 1639,
2262+
"locationGroupId": None,
2263+
"categories": [
2264+
{
2265+
"categoryCode": "guest_disk0",
2266+
"id": 81,
2267+
"name": "First Disk",
2268+
"quantityLimit": 0,
2269+
"sortOrder": None
2270+
}
2271+
],
2272+
"item": {
2273+
"capacity": "10",
2274+
"description": "10 GB (SAN)",
2275+
"keyName": "GUEST_DISK_10_GB_SAN"
2276+
}
2277+
}
2278+
]

‎SoftLayer/managers/network.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
'usableIpAddressCount',
3535
'note',
3636
'tagReferences[tag]',
37-
'networkVlan[id,primaryRouter,networkSpace]'])
37+
'networkVlan[id, primaryRouter, networkSpace,fullyQualifiedName]',
38+
'addressSpace',
39+
'endPointIpAddress'
40+
])
3841
DEFAULT_VLAN_MASK = ','.join([
3942
'firewallInterfaces',
4043
'hardwareCount',
@@ -503,9 +506,6 @@ def list_subnets(self, identifier=None, datacenter=None, version=0,
503506
_filter['subnets']['version'] = utils.query_filter(version)
504507
if subnet_type:
505508
_filter['subnets']['subnetType'] = utils.query_filter(subnet_type)
506-
else:
507-
# This filters out global IPs from the subnet listing.
508-
_filter['subnets']['subnetType'] = {'operation': '!= GLOBAL_IP'}
509509
if network_space:
510510
_filter['subnets']['networkVlan']['networkSpace'] = (
511511
utils.query_filter(network_space))

‎SoftLayer/managers/ticket.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def list_tickets(self, open_status=True, closed_status=True):
3939
call = 'getClosedTickets'
4040
else:
4141
raise ValueError("open_status and closed_status cannot both be False")
42-
return self.client.call('Account', call, mask=mask, iter=True)
42+
return self.client.call('Account', call, mask=mask, iter=False, limit=100)
4343

4444
def list_subjects(self):
4545
"""List all ticket subjects."""

0 commit comments

Comments
 (0)