ca5e8e6c85
There was not a default IP version in "ip availability list" command, if we used this command without "--ip-version" option, the output was different from the outputs with the option "--ip-version 4" and "--ip-version 6" and it is not right. This patch add default IP version (default is 4) in ``ip availability list`` command and make this command work properly without ``--ip-version`` option. And also fix the help message. Change-Id: Idc08ab6eaf05946eb2ab59bfb3d4497a383d987d Closes-Bug: #1592761
113 lines
3.5 KiB
Python
113 lines
3.5 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
"""IP Availability Info implementations"""
|
|
|
|
from osc_lib.command import command
|
|
from osc_lib import utils
|
|
|
|
from openstackclient.i18n import _
|
|
from openstackclient.identity import common as identity_common
|
|
|
|
|
|
_formatters = {
|
|
'subnet_ip_availability': utils.format_list_of_dicts,
|
|
}
|
|
|
|
|
|
def _get_columns(item):
|
|
columns = list(item.keys())
|
|
if 'tenant_id' in columns:
|
|
columns.remove('tenant_id')
|
|
columns.append('project_id')
|
|
return tuple(sorted(columns))
|
|
|
|
|
|
class ListIPAvailability(command.Lister):
|
|
"""List IP availability for network"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ListIPAvailability, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'--ip-version',
|
|
type=int,
|
|
default=4,
|
|
choices=[4, 6],
|
|
metavar='<ip-version>',
|
|
dest='ip_version',
|
|
help=_("List IP availability of given IP version "
|
|
"networks (default is 4)"),
|
|
)
|
|
parser.add_argument(
|
|
'--project',
|
|
metavar='<project>',
|
|
help=_("List IP availability of given project (name or ID)"),
|
|
)
|
|
identity_common.add_project_domain_option_to_parser(parser)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
client = self.app.client_manager.network
|
|
|
|
columns = (
|
|
'network_id',
|
|
'network_name',
|
|
'total_ips',
|
|
'used_ips',
|
|
)
|
|
column_headers = (
|
|
'Network ID',
|
|
'Network Name',
|
|
'Total IPs',
|
|
'Used IPs',
|
|
)
|
|
|
|
filters = {}
|
|
if parsed_args.ip_version:
|
|
filters['ip_version'] = parsed_args.ip_version
|
|
|
|
if parsed_args.project:
|
|
identity_client = self.app.client_manager.identity
|
|
project_id = identity_common.find_project(
|
|
identity_client,
|
|
parsed_args.project,
|
|
parsed_args.project_domain,
|
|
).id
|
|
filters['tenant_id'] = project_id
|
|
data = client.network_ip_availabilities(**filters)
|
|
return (column_headers,
|
|
(utils.get_item_properties(
|
|
s, columns,
|
|
) for s in data))
|
|
|
|
|
|
class ShowIPAvailability(command.ShowOne):
|
|
"""Show network IP availability details"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ShowIPAvailability, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'network',
|
|
metavar="<network>",
|
|
help=_("Show IP availability for a specific network (name or ID)"),
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
client = self.app.client_manager.network
|
|
obj = client.find_network_ip_availability(parsed_args.network,
|
|
ignore_missing=False)
|
|
columns = _get_columns(obj)
|
|
data = utils.get_item_properties(obj, columns, formatters=_formatters)
|
|
return (columns, data)
|