6c224f5acf
Without this patch, openstackclient has no way to specify to which project a network belongs upon creation. Instead, it uses the project ID that the user is authenticating with to fill the tenant_id column. This is a problem because an admin user is unable to specify a project for a non-admin network. To fix this and to improve feature parity with the neutron client, this patch adds project and domain parameters to the network create command and uses the given project name to look up the project ID. Neutron does not allow the project to be changed after creation, so no such parameter has been added to the neutron set command. Neutron calls the field 'tenant_id', but this change exposes the parameter as '--project' to support the newer terminology. If no project is specified, the client defaults to the previous behavior of using the auth project. Change-Id: Ia33ff7d599542c5b88baf2a69b063a23089a3cc4
317 lines
10 KiB
Python
317 lines
10 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.
|
|
#
|
|
|
|
"""Network action implementations"""
|
|
|
|
import logging
|
|
import six
|
|
|
|
from cliff import command
|
|
from cliff import lister
|
|
from cliff import show
|
|
|
|
from openstackclient.common import exceptions
|
|
from openstackclient.common import utils
|
|
from openstackclient.identity import common as identity_common
|
|
from openstackclient.network import common
|
|
|
|
|
|
def _prep_network_detail(net):
|
|
"""Prepare network object for output"""
|
|
|
|
if 'subnets' in net:
|
|
net['subnets'] = utils.format_list(net['subnets'])
|
|
if 'admin_state_up' in net:
|
|
net['state'] = 'UP' if net['admin_state_up'] else 'DOWN'
|
|
net.pop('admin_state_up')
|
|
if 'router:external' in net:
|
|
net['router_type'] = 'External' if net['router:external'] \
|
|
else 'Internal'
|
|
net.pop('router:external')
|
|
if 'tenant_id' in net:
|
|
net['project_id'] = net.pop('tenant_id')
|
|
return net
|
|
|
|
|
|
class CreateNetwork(show.ShowOne):
|
|
"""Create new network"""
|
|
|
|
log = logging.getLogger(__name__ + '.CreateNetwork')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(CreateNetwork, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'name',
|
|
metavar='<name>',
|
|
help='New network name',
|
|
)
|
|
admin_group = parser.add_mutually_exclusive_group()
|
|
admin_group.add_argument(
|
|
'--enable',
|
|
dest='admin_state',
|
|
action='store_true',
|
|
default=True,
|
|
help='Enable network (default)',
|
|
)
|
|
admin_group.add_argument(
|
|
'--disable',
|
|
dest='admin_state',
|
|
action='store_false',
|
|
help='Disable network',
|
|
)
|
|
share_group = parser.add_mutually_exclusive_group()
|
|
share_group.add_argument(
|
|
'--share',
|
|
dest='shared',
|
|
action='store_true',
|
|
default=None,
|
|
help='Share the network between projects',
|
|
)
|
|
share_group.add_argument(
|
|
'--no-share',
|
|
dest='shared',
|
|
action='store_false',
|
|
help='Do not share the network between projects',
|
|
)
|
|
parser.add_argument(
|
|
'--project',
|
|
metavar='<project>',
|
|
help="Owner's project (name or ID)")
|
|
parser.add_argument(
|
|
'--domain',
|
|
metavar='<domain>',
|
|
help="Owner's domain (name or ID)")
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
self.log.debug('take_action(%s)' % parsed_args)
|
|
client = self.app.client_manager.network
|
|
body = self.get_body(parsed_args)
|
|
create_method = getattr(client, "create_network")
|
|
data = create_method(body)['network']
|
|
if data:
|
|
data = _prep_network_detail(data)
|
|
else:
|
|
data = {'': ''}
|
|
return zip(*sorted(six.iteritems(data)))
|
|
|
|
def get_body(self, parsed_args):
|
|
body = {'name': str(parsed_args.name),
|
|
'admin_state_up': parsed_args.admin_state}
|
|
if parsed_args.shared is not None:
|
|
body['shared'] = parsed_args.shared
|
|
if parsed_args.project is not None:
|
|
identity_client = self.app.client_manager.identity
|
|
if parsed_args.domain is not None:
|
|
domain = identity_common.find_domain(identity_client,
|
|
parsed_args.domain)
|
|
project_id = utils.find_resource(identity_client.projects,
|
|
parsed_args.project,
|
|
domain_id=domain.id).id
|
|
else:
|
|
project_id = utils.find_resource(identity_client.projects,
|
|
parsed_args.project).id
|
|
body['tenant_id'] = project_id
|
|
return {'network': body}
|
|
|
|
|
|
class DeleteNetwork(command.Command):
|
|
"""Delete network(s)"""
|
|
|
|
log = logging.getLogger(__name__ + '.DeleteNetwork')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(DeleteNetwork, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'networks',
|
|
metavar="<network>",
|
|
nargs="+",
|
|
help=("Network to delete (name or ID)")
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
self.log.debug('take_action(%s)' % parsed_args)
|
|
client = self.app.client_manager.network
|
|
delete_method = getattr(client, "delete_network")
|
|
for network in parsed_args.networks:
|
|
_id = common.find(client, 'network', 'networks', network)
|
|
delete_method(_id)
|
|
return
|
|
|
|
|
|
class ListNetwork(lister.Lister):
|
|
"""List networks"""
|
|
|
|
log = logging.getLogger(__name__ + '.ListNetwork')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ListNetwork, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'--external',
|
|
action='store_true',
|
|
default=False,
|
|
help='List external networks',
|
|
)
|
|
parser.add_argument(
|
|
'--dhcp',
|
|
metavar='<dhcp-id>',
|
|
help='DHCP agent ID')
|
|
parser.add_argument(
|
|
'--long',
|
|
action='store_true',
|
|
default=False,
|
|
help='List additional fields in output',
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
self.log.debug('take_action(%s)' % parsed_args)
|
|
client = self.app.client_manager.network
|
|
|
|
if parsed_args.dhcp:
|
|
data = client.api.dhcp_agent_list(dhcp_id=parsed_args.dhcp)
|
|
|
|
columns = ('ID',)
|
|
column_headers = columns
|
|
else:
|
|
data = client.api.network_list(external=parsed_args.external)
|
|
|
|
if parsed_args.long:
|
|
columns = (
|
|
'ID',
|
|
'Name',
|
|
'Status',
|
|
'project_id',
|
|
'state',
|
|
'Shared',
|
|
'Subnets',
|
|
'provider:network_type',
|
|
'router_type',
|
|
)
|
|
column_headers = (
|
|
'ID',
|
|
'Name',
|
|
'Status',
|
|
'Project',
|
|
'State',
|
|
'Shared',
|
|
'Subnets',
|
|
'Network Type',
|
|
'Router Type',
|
|
)
|
|
else:
|
|
columns = ('ID', 'Name', 'Subnets')
|
|
column_headers = columns
|
|
|
|
for d in data:
|
|
d = _prep_network_detail(d)
|
|
|
|
return (column_headers,
|
|
(utils.get_dict_properties(
|
|
s, columns,
|
|
formatters={'subnets': utils.format_list},
|
|
) for s in data))
|
|
|
|
|
|
class SetNetwork(command.Command):
|
|
"""Set network properties"""
|
|
|
|
log = logging.getLogger(__name__ + '.SetNetwork')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(SetNetwork, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'identifier',
|
|
metavar="<network>",
|
|
help=("Network to modify (name or ID)")
|
|
)
|
|
parser.add_argument(
|
|
'--name',
|
|
metavar='<name>',
|
|
help='Set network name',
|
|
)
|
|
admin_group = parser.add_mutually_exclusive_group()
|
|
admin_group.add_argument(
|
|
'--enable',
|
|
dest='admin_state',
|
|
action='store_true',
|
|
default=None,
|
|
help='Enable network',
|
|
)
|
|
admin_group.add_argument(
|
|
'--disable',
|
|
dest='admin_state',
|
|
action='store_false',
|
|
help='Disable network',
|
|
)
|
|
share_group = parser.add_mutually_exclusive_group()
|
|
share_group.add_argument(
|
|
'--share',
|
|
dest='shared',
|
|
action='store_true',
|
|
default=None,
|
|
help='Share the network between projects',
|
|
)
|
|
share_group.add_argument(
|
|
'--no-share',
|
|
dest='shared',
|
|
action='store_false',
|
|
help='Do not share the network between projects',
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
self.log.debug('take_action(%s)' % parsed_args)
|
|
client = self.app.client_manager.network
|
|
_id = common.find(client, 'network', 'networks',
|
|
parsed_args.identifier)
|
|
body = {}
|
|
if parsed_args.name is not None:
|
|
body['name'] = str(parsed_args.name)
|
|
if parsed_args.admin_state is not None:
|
|
body['admin_state_up'] = parsed_args.admin_state
|
|
if parsed_args.shared is not None:
|
|
body['shared'] = parsed_args.shared
|
|
if body == {}:
|
|
msg = "Nothing specified to be set"
|
|
raise exceptions.CommandError(msg)
|
|
update_method = getattr(client, "update_network")
|
|
update_method(_id, {'network': body})
|
|
return
|
|
|
|
|
|
class ShowNetwork(show.ShowOne):
|
|
"""Show network details"""
|
|
|
|
log = logging.getLogger(__name__ + '.ShowNetwork')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ShowNetwork, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'identifier',
|
|
metavar="<network>",
|
|
help=("Network to display (name or ID)")
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
self.log.debug('take_action(%s)' % parsed_args)
|
|
client = self.app.client_manager.network
|
|
net = client.api.find_attr(
|
|
'networks',
|
|
parsed_args.identifier,
|
|
)
|
|
data = _prep_network_detail(net)
|
|
return zip(*sorted(six.iteritems(data)))
|