From ad015728605b25b1fe83cffbb53f2bc228bbaaf6 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 14 Jun 2023 16:22:17 +0000
Subject: [PATCH] Service component:
- Minor code cleanup
---
src/service/service/service_handler_api/Tools.py | 1 +
.../service_handlers/l2nm_emulated/ConfigRules.py | 9 ---------
.../service_handlers/l3nm_openconfig/ConfigRules.py | 3 ---
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/service/service/service_handler_api/Tools.py b/src/service/service/service_handler_api/Tools.py
index 787b0f499..b06d128d9 100644
--- a/src/service/service/service_handler_api/Tools.py
+++ b/src/service/service/service_handler_api/Tools.py
@@ -11,6 +11,7 @@
# 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 functools, re
from typing import Any, List, Optional, Tuple, Union
from common.method_wrappers.ServiceExceptions import NotFoundException
diff --git a/src/service/service/service_handlers/l2nm_emulated/ConfigRules.py b/src/service/service/service_handlers/l2nm_emulated/ConfigRules.py
index 747e6c498..ef85550f2 100644
--- a/src/service/service/service_handlers/l2nm_emulated/ConfigRules.py
+++ b/src/service/service/service_handlers/l2nm_emulated/ConfigRules.py
@@ -27,12 +27,6 @@ def setup_config_rules(
json_settings : Dict = service_settings.value
json_endpoint_settings : Dict = endpoint_settings.value
- if service_settings is None: return []
- if endpoint_settings is None: return []
-
- json_settings : Dict = service_settings.value
- json_endpoint_settings : Dict = endpoint_settings.value
-
#mtu = json_settings.get('mtu', 1450 ) # 1512
#address_families = json_settings.get('address_families', [] ) # ['IPV4']
#bgp_as = json_settings.get('bgp_as', 0 ) # 65000
@@ -98,9 +92,6 @@ def teardown_config_rules(
json_settings : Dict = service_settings.value
json_endpoint_settings : Dict = endpoint_settings.value
- if service_settings is None: return []
- if endpoint_settings is None: return []
-
#json_settings : Dict = service_settings.value
json_endpoint_settings : Dict = endpoint_settings.value
diff --git a/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py b/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
index b2ae12c31..b25d3b684 100644
--- a/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
+++ b/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
@@ -29,9 +29,6 @@ def setup_config_rules(
json_settings : Dict = service_settings.value
json_endpoint_settings : Dict = endpoint_settings.value
- json_settings : Dict = {} if service_settings is None else service_settings.value
- json_endpoint_settings : Dict = {} if endpoint_settings is None else endpoint_settings.value
-
mtu = json_settings.get('mtu', 1450 ) # 1512
#address_families = json_settings.get('address_families', [] ) # ['IPV4']
bgp_as = json_settings.get('bgp_as', 65000 ) # 65000
--
GitLab