diff options
| -rw-r--r-- | doc/source/commands.rst | 2 | ||||
| -rw-r--r-- | openstackclient/network/v2/subnet.py | 4 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/test_subnet.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 92b89637..85b0b879 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -116,7 +116,7 @@ referring to both Compute and Volume quotas. * ``service``: (**Identity**) a cloud service * ``service provider``: (**Identity**) a resource that consumes assertions from an ``identity provider`` * ``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 * ``usage``: (**Compute**) display host resources being consumed * ``user``: (**Identity**) individual cloud resources users diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py index cd0e52ff..62747125 100644 --- a/openstackclient/network/v2/subnet.py +++ b/openstackclient/network/v2/subnet.py @@ -53,10 +53,10 @@ class ListSubnet(lister.Lister): data = self.app.client_manager.network.subnets() - headers = ('ID', 'Name', 'Network', 'CIDR') + headers = ('ID', 'Name', 'Network', 'Subnet') columns = ('id', 'name', 'network_id', 'cidr') if parsed_args.long: - headers += ('Project', 'DHCP', 'DNS Nameservers', + headers += ('Project', 'DHCP', 'Name Servers', 'Allocation Pools', 'Host Routes', 'IP Version', 'Gateway') columns += ('tenant_id', 'enable_dhcp', 'dns_nameservers', diff --git a/openstackclient/tests/network/v2/test_subnet.py b/openstackclient/tests/network/v2/test_subnet.py index 74b4d332..5fca5edd 100644 --- a/openstackclient/tests/network/v2/test_subnet.py +++ b/openstackclient/tests/network/v2/test_subnet.py @@ -34,12 +34,12 @@ class TestListSubnet(TestSubnet): 'ID', 'Name', 'Network', - 'CIDR' + 'Subnet' ) columns_long = columns + ( 'Project', 'DHCP', - 'DNS Nameservers', + 'Name Servers', 'Allocation Pools', 'Host Routes', 'IP Version', |