From 281f093e53c60f8fe631d12779fedd76097e04ae Mon Sep 17 00:00:00 2001
From: hajipour <shajipour@cttc.es>
Date: Wed, 1 Jan 2025 15:46:11 +0100
Subject: [PATCH] debug: - delay and bandwidth passed as integer instead of str
in IETF Slice model - packet_loss passed as float instead of str in IETF
Slice model - ip and prefix passed to the SBI IETF Slice model instead of
only ip
---
.../service_handlers/l3slice_ietfslice/ConfigRules.py | 6 +++---
.../l3slice_ietfslice/L3SliceIETFSliceServiceHandler.py | 8 +++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/service/service/service_handlers/l3slice_ietfslice/ConfigRules.py b/src/service/service/service_handlers/l3slice_ietfslice/ConfigRules.py
index cd6072e85..e720f33bb 100644
--- a/src/service/service/service_handlers/l3slice_ietfslice/ConfigRules.py
+++ b/src/service/service/service_handlers/l3slice_ietfslice/ConfigRules.py
@@ -43,9 +43,9 @@ def setup_config_rules(service_uuid: str, json_settings: Dict) -> List[Dict]:
dst_destination_ip_prefix: str = json_settings["dst_destination_ip_prefix"]
dst_destination_tcp_port: str = json_settings["dst_destination_tcp_port"]
slice_id: str = json_settings["slice_id"]
- delay: str = json_settings["delay"]
- bandwidth: str = json_settings["bandwidth"]
- packet_loss: str = json_settings["packet_loss"]
+ delay: str = int(json_settings["delay"])
+ bandwidth: str = int(json_settings["bandwidth"])
+ packet_loss: str = float(json_settings["packet_loss"])
sdps = [
{
diff --git a/src/service/service/service_handlers/l3slice_ietfslice/L3SliceIETFSliceServiceHandler.py b/src/service/service/service_handlers/l3slice_ietfslice/L3SliceIETFSliceServiceHandler.py
index fa4ebd35d..6a63201bb 100644
--- a/src/service/service/service_handlers/l3slice_ietfslice/L3SliceIETFSliceServiceHandler.py
+++ b/src/service/service/service_handlers/l3slice_ietfslice/L3SliceIETFSliceServiceHandler.py
@@ -106,9 +106,9 @@ def extract_match_criterion_ipv4_info(
) -> Ipv4Info:
for type_value in match_criterion["match-type"]:
if type_value["type"] == "ietf-network-slice-service:source-ip-prefix":
- src_ip = type_value["value"][0].split("/")[0]
+ src_ip = type_value["value"][0]
elif type_value["type"] == "ietf-network-slice-service:destination-ip-prefix":
- dst_ip = type_value["value"][0].split("/")[0]
+ dst_ip = type_value["value"][0]
elif type_value["type"] == "ietf-network-slice-service:source-tcp-port":
src_port = type_value["value"][0]
elif type_value["type"] == "ietf-network-slice-service:destination-tcp-port":
@@ -217,7 +217,9 @@ class L3NMSliceIETFSliceServiceHandler(_ServiceHandler):
running_resource_value_dict = json.loads(
running_ietf_slice_cr.custom.resource_value
)
- slice_name = running_resource_value_dict["network-slice-services"]['slice-service'][0]['id']
+ slice_name = running_resource_value_dict["network-slice-services"][
+ "slice-service"
+ ][0]["id"]
if not running_candidate_diff: # Slice Creation
slice_services = candidate_resource_value_dict[
"network-slice-services"
--
GitLab