diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-27 23:29:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-27 23:29:05 +0000 |
| commit | fa2242b669f53f88a3be0ac2c54770755efaf9e5 (patch) | |
| tree | a5e1bd2729f89d59fb7b618bf347467e5fd0582f /openstackclient | |
| parent | a82aa6651b48f8411771dbe6ba81465908b4e9b9 (diff) | |
| parent | db458d7dec6b2cf712a14e54a76305258aedb700 (diff) | |
| download | python-openstackclient-fa2242b669f53f88a3be0ac2c54770755efaf9e5.tar.gz | |
Merge "Use correct terminology for subnets"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/network/v2/subnet.py | 4 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/test_subnet.py | 4 |
2 files changed, 4 insertions, 4 deletions
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', |