From dda9a41312ab02c26f1d6f585f3560dd13faeb6c Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 23 Feb 2023 17:45:04 +0000
Subject: [PATCH] Load Generator:
- Fixed L2NM service generation
---
src/load_generator/load_gen/RequestGenerator.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/load_generator/load_gen/RequestGenerator.py b/src/load_generator/load_gen/RequestGenerator.py
index 7e0acbe76..29ec6a90b 100644
--- a/src/load_generator/load_gen/RequestGenerator.py
+++ b/src/load_generator/load_gen/RequestGenerator.py
@@ -255,10 +255,16 @@ class RequestGenerator:
circuit_id = '{:03d}'.format(vlan_id + 100)
src_device_name = self._device_data[src_device_uuid]['name']
- src_router_id = ROUTER_ID.get(src_device_name, '10.0.0.{:d}'.format(int(src_device_name.replace('R', ''))))
+ src_endpoint_name = self._device_endpoint_data[src_device_uuid][src_endpoint_uuid]['name']
+ src_router_id = ROUTER_ID.get(src_device_name)
+ src_router_num = int(src_device_name.replace('R', ''))
+ if src_router_id is None: src_router_id = '10.0.0.{:d}'.format(src_router_num)
dst_device_name = self._device_data[dst_device_uuid]['name']
- dst_router_id = ROUTER_ID.get(dst_device_name, '10.0.0.{:d}'.format(int(dst_device_name.replace('R', ''))))
+ dst_endpoint_name = self._device_endpoint_data[dst_device_uuid][dst_endpoint_uuid]['name']
+ dst_router_num = int(dst_device_name.replace('R', ''))
+ dst_router_id = ROUTER_ID.get(dst_device_name)
+ if dst_router_id is None: dst_router_id = '10.0.0.{:d}'.format(dst_router_num)
config_rules = [
json_config_rule_set('/settings', {
--
GitLab