aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorPierrick Louin <pierrick.louin@orange.com>2020-12-03 22:18:41 +0000
committerCédric Ollivier <cedric.ollivier@orange.com>2021-01-05 12:20:27 +0100
commit302abd9369e12c6f199216602941ee97ffbb2d37 (patch)
tree5abb6785dc6b170c70fdbb867cf52da47e52b497 /docker
parent7ab8c4f3c2996b05f366ea85032162eff90778ba (diff)
NFVBENCH-195: Work around a fatal error encountered with the latest pip release, building the container.
Signed-off-by: Pierrick Louin <pierrick.louin@orange.com> Change-Id: I7dbfa076360be0c62a1b9893070f059dc2566842
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d871acc..990f07e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update && apt-get install -y \
&& cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python3.6/dist-packages/ \
&& rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \
&& wget https://bootstrap.pypa.io/get-pip.py \
- && python3 get-pip.py \
+ && python3 get-pip.py pip==20.2.4 \
&& pip3 install -U pbr \
&& pip3 install -U setuptools \
&& cd / \
tring.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
# Copyright 2015 Intel Corporation.
#
# 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.

"""Utility functions for working with vSwitches and flows
"""

import copy

def add_ports_to_flow(flow, in_port, out_port):
    """Creates a new flow based on the given flow and adds in port and out port
    to it.

    The flow dictionary structure is described in IVswitch

    :param flow: Description of the flow as a dictionary
    :param in_port: OpenFlow number of the ingress port for the rule
    :param out_port: OpenFlow number of the eggress port for the rule

    :returns: A new dictionary describing a flow combining the parameters
    """
    new_flow = copy.deepcopy(flow)
    new_flow['in_port'] = in_port

    if 'actions' in new_flow:
        new_flow['actions'].append('output:' + str(out_port))
    else:
        new_flow['actions'] = ['output:' + str(out_port)]

    return new_flow