From 3bbbf9b69a361be9a4609156012f2efbac1fee47 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 26 May 2023 08:04:04 +0000
Subject: [PATCH] Load Generator component:

- Updated VLAN Ids
---
 src/load_generator/load_gen/RequestGenerator.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/load_generator/load_gen/RequestGenerator.py b/src/load_generator/load_gen/RequestGenerator.py
index fdd400a21..149c2568b 100644
--- a/src/load_generator/load_gen/RequestGenerator.py
+++ b/src/load_generator/load_gen/RequestGenerator.py
@@ -256,8 +256,8 @@ class RequestGenerator:
                 json_constraint_sla_latency(e2e_latency_ms),
             ]
 
-            vlan_id = num_request % 1000
-            circuit_id = '{:03d}'.format(vlan_id + 100)
+            vlan_id = 300 + num_request % 1000
+            circuit_id = '{:03d}'.format(vlan_id)
 
             src_device_name = self._device_data[src_device_uuid]['name']
             src_endpoint_name = self._device_endpoint_data[src_device_uuid][src_endpoint_uuid]['name']
@@ -307,7 +307,7 @@ class RequestGenerator:
 
             bgp_as = 65000 + (num_request % 10000)
 
-            vlan_id = num_request % 100 +100
+            vlan_id = 300 + num_request % 1000
             x = num_request % 255
             y = num_request % 25 * num_request % 10
             route_distinguisher = '{:5d}:{:03d}'.format(bgp_as, vlan_id)
@@ -427,7 +427,7 @@ class RequestGenerator:
         ]
 
         if request_type == RequestType.SLICE_L2NM:
-            vlan_id = num_request % 1000
+            vlan_id = 300 + num_request % 1000
             circuit_id = '{:03d}'.format(vlan_id)
 
             src_device_name = self._device_data[src_device_uuid]['name']
@@ -459,7 +459,8 @@ class RequestGenerator:
             ]
 
         elif request_type == RequestType.SLICE_L3NM:
-            vlan_id = num_request % 1000
+            vlan_id = 300 + num_request % 1000
+            circuit_id = '{:03d}'.format(vlan_id)
             bgp_as = 60000 + (num_request % 10000)
             bgp_route_target = '{:5d}:{:03d}'.format(bgp_as, 333)
             route_distinguisher = '{:5d}:{:03d}'.format(bgp_as, vlan_id)
-- 
GitLab