openstack/python-openstackclient
Code Issues Proposed changes

Merge "Use correct terminology for subnets"

Browse Source
This commit is contained in:
Jenkins 2016-01-27 23:29:05 +00:00 committed by Gerrit Code Review
commit fa2242b669
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/commands.rst
View File

@ -116,7 +116,7 @@ referring to both Compute and Volume quotas.
* ``service``: (**Identity**) a cloud service * ``service``: (**Identity**) a cloud service
* ``service provider``: (**Identity**) a resource that consumes assertions from an ``identity provider`` * ``service provider``: (**Identity**) a resource that consumes assertions from an ``identity provider``
* ``snapshot``: (**Volume**) a point-in-time copy of a volume * ``snapshot``: (**Volume**) a point-in-time copy of a volume
* ``subnet``: (**Network**) - a pool of private IP addresses that can be assigned to instances or other resources * ``subnet``: (**Network**) - a contiguous range of IP addresses assigned to a network
* ``token``: (**Identity**) a bearer token managed by Identity service * ``token``: (**Identity**) a bearer token managed by Identity service
* ``usage``: (**Compute**) display host resources being consumed * ``usage``: (**Compute**) display host resources being consumed
* ``user``: (**Identity**) individual cloud resources users * ``user``: (**Identity**) individual cloud resources users

4
openstackclient/network/v2/subnet.py
View File

@ -53,10 +53,10 @@ class ListSubnet(lister.Lister):
data = self.app.client_manager.network.subnets() data = self.app.client_manager.network.subnets()
headers = ('ID', 'Name', 'Network', 'CIDR') headers = ('ID', 'Name', 'Network', 'Subnet')
columns = ('id', 'name', 'network_id', 'cidr') columns = ('id', 'name', 'network_id', 'cidr')
if parsed_args.long: if parsed_args.long:
headers += ('Project', 'DHCP', 'DNS Nameservers', headers += ('Project', 'DHCP', 'Name Servers',
'Allocation Pools', 'Host Routes', 'IP Version', 'Allocation Pools', 'Host Routes', 'IP Version',
'Gateway') 'Gateway')
columns += ('tenant_id', 'enable_dhcp', 'dns_nameservers', columns += ('tenant_id', 'enable_dhcp', 'dns_nameservers',

4
openstackclient/tests/network/v2/test_subnet.py
View File

@ -34,12 +34,12 @@ class TestListSubnet(TestSubnet):
'ID', 'ID',
'Name', 'Name',
'Network', 'Network',
'CIDR' 'Subnet'
) )
columns_long = columns + ( columns_long = columns + (
'Project', 'Project',
'DHCP', 'DHCP',
'DNS Nameservers', 'Name Servers',
'Allocation Pools', 'Allocation Pools',
'Host Routes', 'Host Routes',
'IP Version', 'IP Version',