Commit 96bbb3e0 authored by Waleed Akbar's avatar Waleed Akbar
Browse files

feat: Update LINKS_CAPACITY values and add latency ranges for synthetic... 

feat: Update LINKS_CAPACITY values and add latency ranges for synthetic samplers; modify slice IDs in teardown scripts
parent 35b63a64

src/simap_connector/service/simap_updater/AllowedLinks.py

+3 −3
Original line number Original line Diff line number Diff line
@@ -32,8 +32,8 @@ ALLOWED_LINKS_PER_CONTROLLER = { 
    #     description "0–100 percent value.";

    #     description "0–100 percent value.";

    # }

    # }

LINKS_CAPACITY = {

LINKS_CAPACITY = {

    'L1'    : 5,   'L2'   : 5,   'L3'   : 30,  'L4'   : 30,

    'L1'    : 100, 'L2'   : 100,   'L3'   : 100,  'L4'   : 100,

    'L5'    : 15,  'L6'   : 15,  'L9'   : 15,  'L10'  : 15,

    'L5'    : 100, 'L6'   : 100,  'L9'   : 100,  'L10'  : 100,

    'L7ab'  : 100, 'L7ba' : 100, 'L8ab' : 100, 'L8ba' : 100, 'L11ab' : 100,

    'L7ab'  : 100, 'L7ba' : 100, 'L8ab' : 100, 'L8ba' : 100, 'L11ab' : 100,

    'L11ba' : 100, 'L12ab': 100, 'L12ba': 100, 'L13'  : 50,  'L14'   : 50,

    'L11ba' : 100, 'L12ab': 100, 'L12ba': 100, 'L13'  : 100,  'L14'   : 100,

}
 
}

src/simap_connector/service/telemetry/worker/data/SyntheticSamplers.py

+9 −4
Original line number Original line Diff line number Diff line
@@ -54,6 +54,13 @@ class SyntheticSampler: 
        3: (65, 60, 80),

        3: (65, 60, 80),

        4: (85, 80, 95),

        4: (85, 80, 95),

    }

    }

    LAT_RANGES = {

        0: (0.5, 0.0, 1.0),

        1: (1.5, 1.0, 2.0),

        2: (2.5, 2.0, 3.0),

        3: (3.5, 3.0, 4.0),

        4: (4.5, 4.0, 5.0),

    }





    @classmethod

    @classmethod

    def create_random(

    def create_random(
@@ -89,10 +96,8 @@ class SyntheticSampler: 
        bw_utilization = max(min_bw, min(max_bw, bw_utilization))

        bw_utilization = max(min_bw, min(max_bw, bw_utilization))

        self.prev_bw   = bw_utilization

        self.prev_bw   = bw_utilization

        

        

        # Generate latency using same pattern as bandwidth (BW ranges / 11 = 0-10ms range)

        # Generate latency using same connection count key

        avg_lat  = avg / 11.0

        avg_lat, min_lat, max_lat = self.LAT_RANGES[conn_key]

        min_lat  = min_bw / 11.0

        max_lat  = max_bw / 11.0

        

        

        if self.prev_latency is None:

        if self.prev_latency is None:

            # First sample: start at average for this connection count

            # First sample: start at average for this connection count

src/tests/mwc26-f5ga/data/slices/network-slice1_background.json

+1 −1
Original line number Original line Diff line number Diff line 
{

{

    "slice-service": [

    "slice-service": [

        {

        {

            "id": "initial_background_slice",

            "id": "initial_background_slice_1",

            "description": "network slice, PC1-VM1 - using IP transport network",

            "description": "network slice, PC1-VM1 - using IP transport network",

            "sdps": {

            "sdps": {

                "sdp": [

                "sdp": [

src/tests/mwc26-f5ga/data/slices/network-slice3_background.json

+1 −1
Original line number Original line Diff line number Diff line 
{

{

    "slice-service": [

    "slice-service": [

        {

        {

            "id": "another_background_slice",

            "id": "another_background_slice_3",

            "description": "network slice, PC1-VM1 - using IP transport network",

            "description": "network slice, PC1-VM1 - using IP transport network",

            "sdps": {

            "sdps": {

                "sdp": [

                "sdp": [

src/tests/mwc26-f5ga/teardown-slice1_background.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




echo "[E2E] Tear Down slice2..."

echo "[E2E] Tear Down slice2..."

curl --request DELETE --location \

curl --request DELETE --location \

    http://0.0.0.0:80/restconf/data/ietf-network-slice-service:network-slice-services/slice-service=initial_background_slice

    http://0.0.0.0:80/restconf/data/ietf-network-slice-service:network-slice-services/slice-service=initial_background_slice_1

echo

echo