From 42f80771cddb63ecd78cf9b831e721b018779dc9 Mon Sep 17 00:00:00 2001 From: sousaedu Date: Tue, 2 Mar 2021 00:15:52 +0100 Subject: [PATCH] Fix bug 1407 Change-Id: I694f47c2403983c87850447f027f370a6f375eb2 Signed-off-by: sousaedu --- .dockerignore | 29 +++++++++++++++++++++++++++++ NG-RO/osm_ng_ro/ns.py | 11 +++++++++++ 2 files changed, 40 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..715b6fd8 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,29 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### + +.tox +.idea +charms +deprecated +devops-stages +docker +instance-scenarios +scenarios +sdn +test-docker +venv +vnfs \ No newline at end of file diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py index 2db33e49..e62eef59 100644 --- a/NG-RO/osm_ng_ro/ns.py +++ b/NG-RO/osm_ng_ro/ns.py @@ -785,6 +785,17 @@ class Ns(object): continue # interface not connected to any vld extra_dict["depends_on"].append(net_text) + + if "port-security-enabled" in interface: + interface["port_security"] = ( + interface.pop("port-security-enabled") + ) + + if "port-security-disable-strategy" in interface: + interface["port_security_disable_strategy"] = ( + interface.pop("port-security-disable-strategy") + ) + net_item = { x: v for x, v in interface.items() -- 2.25.1