69e97e204d
Add missing correlation type "mpls" to Port Pair create
command's help (PortPairCreate).
The merged Port Pair command was still using the older help
description, before MPLS correlation support was merged to
networking-sfc.
Also add unit test coverage for correlation type "mpls".
Closes-Bug: #1708968
Change-Id: I708345b25b600ca94504725f1559988ae29413b8
(cherry picked from commit ff86783fd4)
216 lines
7.9 KiB
Python
Executable File
216 lines
7.9 KiB
Python
Executable File
# Copyright (c) 2017 Huawei Technologies India Pvt.Limited.
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
import logging
|
|
|
|
from osc_lib.cli import parseractions
|
|
from osc_lib.command import command
|
|
from osc_lib import exceptions
|
|
from osc_lib import utils
|
|
|
|
from neutronclient._i18n import _
|
|
from neutronclient.osc import utils as nc_osc_utils
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
resource = 'port_pair'
|
|
|
|
_attr_map = (
|
|
('id', 'ID', nc_osc_utils.LIST_BOTH),
|
|
('name', 'Name', nc_osc_utils.LIST_BOTH),
|
|
('ingress', 'Ingress Logical Port', nc_osc_utils.LIST_BOTH),
|
|
('egress', 'Egress Logical Port', nc_osc_utils.LIST_BOTH),
|
|
('service_function_parameters', 'Service Function Parameters',
|
|
nc_osc_utils.LIST_LONG_ONLY),
|
|
('description', 'Description', nc_osc_utils.LIST_LONG_ONLY),
|
|
('project_id', 'Project', nc_osc_utils.LIST_LONG_ONLY),
|
|
)
|
|
|
|
|
|
class CreateSfcPortPair(command.ShowOne):
|
|
_description = _("Create a port pair")
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(CreateSfcPortPair, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'name',
|
|
metavar='<name>',
|
|
help=_('Name of the port pair'))
|
|
parser.add_argument(
|
|
'--description',
|
|
metavar='<description>',
|
|
help=_('Description for the port pair'))
|
|
parser.add_argument(
|
|
'--service-function-parameters',
|
|
metavar='correlation=<correlation-type>,weight=<weight>',
|
|
action=parseractions.MultiKeyValueAction,
|
|
optional_keys=['correlation', 'weight'],
|
|
help=_('Dictionary of service function parameters. '
|
|
'Currently, correlation=(None|mpls) and weight '
|
|
'are supported. Weight is an integer that influences '
|
|
'the selection of a port pair within a port pair group '
|
|
'for a flow. The higher the weight, the more flows will '
|
|
'hash to the port pair. The default weight is 1.'))
|
|
parser.add_argument(
|
|
'--ingress',
|
|
metavar='<ingress>',
|
|
required=True,
|
|
help=_('Ingress neutron port (name or ID)'))
|
|
parser.add_argument(
|
|
'--egress',
|
|
metavar='<egress>',
|
|
required=True,
|
|
help=_('Egress neutron port (name or ID)'))
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
client = self.app.client_manager.neutronclient
|
|
attrs = _get_common_attrs(self.app.client_manager, parsed_args)
|
|
body = {resource: attrs}
|
|
obj = client.create_port_pair(body)[resource]
|
|
columns, display_columns = nc_osc_utils.get_columns(obj, _attr_map)
|
|
data = utils.get_dict_properties(obj, columns)
|
|
return display_columns, data
|
|
|
|
|
|
class DeleteSfcPortPair(command.Command):
|
|
_description = _("Delete a given port pair")
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(DeleteSfcPortPair, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'port_pair',
|
|
metavar="<port-pair>",
|
|
help=_("Port pair to delete (name or ID)")
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
# TODO(mohan): Add support for deleting multiple resources.
|
|
client = self.app.client_manager.neutronclient
|
|
port_pair_id = _get_id(client, parsed_args.port_pair, resource)
|
|
try:
|
|
client.delete_port_pair(port_pair_id)
|
|
except Exception as e:
|
|
msg = (_("Failed to delete port pair with name "
|
|
"or ID '%(port_pair)s': %(e)s")
|
|
% {'port_pair': parsed_args.port_pair, 'e': e})
|
|
raise exceptions.CommandError(msg)
|
|
|
|
|
|
class ListSfcPortPair(command.Lister):
|
|
_description = _("List port pairs")
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ListSfcPortPair, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'--long',
|
|
action='store_true',
|
|
help=_("List additional fields in output")
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
client = self.app.client_manager.neutronclient
|
|
data = client.list_port_pair()
|
|
headers, columns = nc_osc_utils.get_column_definitions(
|
|
_attr_map, long_listing=parsed_args.long)
|
|
return (headers,
|
|
(utils.get_dict_properties(
|
|
s, columns,
|
|
) for s in data['port_pairs']))
|
|
|
|
|
|
class SetSfcPortPair(command.Command):
|
|
_description = _("Set port pair properties")
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(SetSfcPortPair, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'--name',
|
|
metavar='<name>',
|
|
help=_('Name of the port pair'))
|
|
parser.add_argument(
|
|
'--description',
|
|
metavar='<description>',
|
|
help=_('Description for the port pair'))
|
|
parser.add_argument(
|
|
'port_pair',
|
|
metavar='<port-pair>',
|
|
help=_("Port pair to modify (name or ID)")
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
client = self.app.client_manager.neutronclient
|
|
port_pair_id = _get_id(client, parsed_args.port_pair, resource)
|
|
attrs = _get_common_attrs(self.app.client_manager, parsed_args,
|
|
is_create=False)
|
|
body = {resource: attrs}
|
|
try:
|
|
client.update_port_pair(port_pair_id, body)
|
|
except Exception as e:
|
|
msg = (_("Failed to update port pair '%(port_pair)s': %(e)s")
|
|
% {'port_pair': parsed_args.port_pair, 'e': e})
|
|
raise exceptions.CommandError(msg)
|
|
|
|
|
|
class ShowSfcPortPair(command.ShowOne):
|
|
_description = _("Display port pair details")
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ShowSfcPortPair, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'port_pair',
|
|
metavar='<port-pair>',
|
|
help=_("Port pair to display (name or ID)")
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
client = self.app.client_manager.neutronclient
|
|
port_pair_id = _get_id(client, parsed_args.port_pair, resource)
|
|
obj = client.show_port_pair(port_pair_id)[resource]
|
|
columns, display_columns = nc_osc_utils.get_columns(obj, _attr_map)
|
|
data = utils.get_dict_properties(obj, columns)
|
|
return display_columns, data
|
|
|
|
|
|
def _get_common_attrs(client_manager, parsed_args, is_create=True):
|
|
attrs = {}
|
|
if parsed_args.name is not None:
|
|
attrs['name'] = parsed_args.name
|
|
if parsed_args.description is not None:
|
|
attrs['description'] = parsed_args.description
|
|
if is_create:
|
|
_get_attrs(client_manager, attrs, parsed_args)
|
|
return attrs
|
|
|
|
|
|
def _get_attrs(client_manager, attrs, parsed_args):
|
|
if parsed_args.ingress is not None:
|
|
attrs['ingress'] = _get_id(client_manager.neutronclient,
|
|
parsed_args.ingress, 'port')
|
|
if parsed_args.egress is not None:
|
|
attrs['egress'] = _get_id(client_manager.neutronclient,
|
|
parsed_args.egress, 'port')
|
|
if 'service_function_parameters' in parsed_args:
|
|
attrs['service_function_parameters'] = (
|
|
parsed_args.service_function_parameters)
|
|
|
|
|
|
def _get_id(client, id_or_name, resource):
|
|
return client.find_resource(resource, id_or_name)['id']
|