Commit 7e9a189b authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

ECOC F5GA Telemetry Demo: 

- Corrected deploy specs
- Corrected topology descriptors
- Added/Updated redeploy scripts
parent 9d772ce5

src/tests/ecoc25-f5ga-telemetry/data/topology-agg.json

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
            }}}

        ]}},

        {"device_id": {"device_uuid": {"uuid": "172.16.58.10"}}, "name": "172.16.58.10", "device_type": "emu-packet-router",

        "device_drivers": ["DEVICEDRIVER_UNKNOWN"], "device_config": {"config_rules": [

        "device_drivers": ["DEVICEDRIVER_UNDEFINED"], "device_config": {"config_rules": [

            {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address",  "resource_value": "127.0.0.1"}},

            {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port",     "resource_value": "0"        }},

            {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
@@ -35,7 +35,7 @@ 
            ]}}}

        ]}},

        {"device_id": {"device_uuid": {"uuid": "172.16.204.22x"}}, "device_type": "emu-datacenter",

        "device_drivers": ["DEVICEDRIVER_UNKNOWN"], "device_config": {"config_rules": [

        "device_drivers": ["DEVICEDRIVER_UNDEFINED"], "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address",  "resource_value": "127.0.0.1"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port",     "resource_value": "0"        }},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [

src/tests/ecoc25-f5ga-telemetry/data/topology-e2e.json

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
        ]}},



        {"device_id": {"device_uuid": {"uuid": "172.16.204.220"}}, "device_type": "emu-datacenter",

        "device_drivers": ["DEVICEDRIVER_UNKNOWN"], "device_config": {"config_rules": [

        "device_drivers": ["DEVICEDRIVER_UNDEFINED"], "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address",  "resource_value": "127.0.0.1"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port",     "resource_value": "0"        }},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
@@ -37,7 +37,7 @@ 
            ]}

        },

        {"device_id": {"device_uuid": {"uuid": "172.16.204.220"}}, "device_type": "emu-datacenter",

        "device_drivers": ["DEVICEDRIVER_UNKNOWN"], "device_config": {"config_rules": [

        "device_drivers": ["DEVICEDRIVER_UNDEFINED"], "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address",  "resource_value": "127.0.0.1"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port",     "resource_value": "0"        }},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
@@ -48,7 +48,7 @@ 
            ]}

        },

        {"device_id": {"device_uuid": {"uuid": "172.16.204.220"}}, "device_type": "emu-datacenter",

        "device_drivers": ["DEVICEDRIVER_UNKNOWN"], "device_config": {"config_rules": [

        "device_drivers": ["DEVICEDRIVER_UNDEFINED"], "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address",  "resource_value": "127.0.0.1"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port",     "resource_value": "0"        }},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
@@ -59,7 +59,7 @@ 
            ]}

        },

        {"device_id": {"device_uuid": {"uuid": "172.16.204.220"}}, "device_type": "emu-datacenter",

        "device_drivers": ["DEVICEDRIVER_UNKNOWN"], "device_config": {"config_rules": [

        "device_drivers": ["DEVICEDRIVER_UNDEFINED"], "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address",  "resource_value": "127.0.0.1"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port",     "resource_value": "0"        }},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [

src/tests/ecoc25-f5ga-telemetry/data/topology-ip.json

+28 −28
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
    "devices": [

        {

            "device_id": {"device_uuid": {"uuid": "172.16.125.25"}}, "name": "172.16.125.25", "device_type": "emu-packet-router",

            "device_drivers": ["DEVICEDRIVER_UNKNOWN"],

            "device_drivers": ["DEVICEDRIVER_UNDEFINED"],

            "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address",  "resource_value": "127.0.0.1"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port",     "resource_value": "0"        }},
@@ -21,7 +21,7 @@ 
        },

        {

            "device_id": {"device_uuid": {"uuid": "172.16.125.31"}}, "name": "172.16.125.31", "device_type": "emu-packet-router",

            "device_drivers": ["DEVICEDRIVER_UNKNOWN"],

            "device_drivers": ["DEVICEDRIVER_UNDEFINED"],

            "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address",  "resource_value": "127.0.0.1"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port",     "resource_value": "0"        }},
@@ -33,7 +33,7 @@ 
        },

        {

            "device_id": {"device_uuid": {"uuid": "172.16.125.33"}}, "name": "172.16.125.33", "device_type": "emu-packet-router",

            "device_drivers": ["DEVICEDRIVER_UNKNOWN"],

            "device_drivers": ["DEVICEDRIVER_UNDEFINED"],

            "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address",  "resource_value": "127.0.0.1"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port",     "resource_value": "0"        }},
@@ -45,7 +45,7 @@ 
        },

        {

            "device_id": {"device_uuid": {"uuid": "172.16.125.32"}}, "name": "172.16.125.32", "device_type": "emu-packet-router",

            "device_drivers": ["DEVICEDRIVER_UNKNOWN"],

            "device_drivers": ["DEVICEDRIVER_UNDEFINED"],

            "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address",  "resource_value": "127.0.0.1"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port",     "resource_value": "0"        }},
@@ -59,70 +59,70 @@ 
    ],

    "links": [

        {

            "link_id": {"link_uuid": {"uuid": "172.16.122.25-500"}}, "name": "172.16.122.25-500",

            "link_id": {"link_uuid": {"uuid": "172.16.125.25-500"}}, "name": "172.16.125.25-500",

            "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0},

            "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "172.16.122.25"}}, "endpoint_uuid": {"uuid": "500"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.122.31"}}, "endpoint_uuid": {"uuid": "500"}}

                {"device_id": {"device_uuid": {"uuid": "172.16.125.25"}}, "endpoint_uuid": {"uuid": "500"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.125.31"}}, "endpoint_uuid": {"uuid": "500"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "172.16.122.31-500"}}, "name": "172.16.122.31-500",

            "link_id": {"link_uuid": {"uuid": "172.16.125.31-500"}}, "name": "172.16.125.31-500",

            "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0},

            "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "172.16.122.31"}}, "endpoint_uuid": {"uuid": "500"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.122.25"}}, "endpoint_uuid": {"uuid": "500"}}

                {"device_id": {"device_uuid": {"uuid": "172.16.125.31"}}, "endpoint_uuid": {"uuid": "500"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.125.25"}}, "endpoint_uuid": {"uuid": "500"}}

            ]

        },



        {

            "link_id": {"link_uuid": {"uuid": "172.16.122.25-501"}}, "name": "172.16.122.25-501",

            "link_id": {"link_uuid": {"uuid": "172.16.125.25-501"}}, "name": "172.16.125.25-501",

            "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0},

            "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "172.16.122.25"}}, "endpoint_uuid": {"uuid": "501"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.122.33"}}, "endpoint_uuid": {"uuid": "500"}}

                {"device_id": {"device_uuid": {"uuid": "172.16.125.25"}}, "endpoint_uuid": {"uuid": "501"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.125.33"}}, "endpoint_uuid": {"uuid": "500"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "172.16.122.33-500"}}, "name": "172.16.122.33-500",

            "link_id": {"link_uuid": {"uuid": "172.16.125.33-500"}}, "name": "172.16.125.33-500",

            "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0},

            "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "172.16.122.33"}}, "endpoint_uuid": {"uuid": "500"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.122.25"}}, "endpoint_uuid": {"uuid": "501"}}

                {"device_id": {"device_uuid": {"uuid": "172.16.125.33"}}, "endpoint_uuid": {"uuid": "500"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.125.25"}}, "endpoint_uuid": {"uuid": "501"}}

            ]

        },



        {

            "link_id": {"link_uuid": {"uuid": "172.16.122.31-501"}}, "name": "172.16.122.31-501",

            "link_id": {"link_uuid": {"uuid": "172.16.125.31-501"}}, "name": "172.16.125.31-501",

            "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0},

            "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "172.16.122.31"}}, "endpoint_uuid": {"uuid": "501"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.122.32"}}, "endpoint_uuid": {"uuid": "500"}}

                {"device_id": {"device_uuid": {"uuid": "172.16.125.31"}}, "endpoint_uuid": {"uuid": "501"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.125.32"}}, "endpoint_uuid": {"uuid": "500"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "172.16.122.32-500"}}, "name": "172.16.122.32-500",

            "link_id": {"link_uuid": {"uuid": "172.16.125.32-500"}}, "name": "172.16.125.32-500",

            "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0},

            "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "172.16.122.32"}}, "endpoint_uuid": {"uuid": "500"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.122.31"}}, "endpoint_uuid": {"uuid": "501"}}

                {"device_id": {"device_uuid": {"uuid": "172.16.125.32"}}, "endpoint_uuid": {"uuid": "500"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.125.31"}}, "endpoint_uuid": {"uuid": "501"}}

            ]

        },



        {

            "link_id": {"link_uuid": {"uuid": "172.16.122.32-501"}}, "name": "172.16.122.32-501",

            "link_id": {"link_uuid": {"uuid": "172.16.125.32-501"}}, "name": "172.16.125.32-501",

            "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0},

            "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "172.16.122.32"}}, "endpoint_uuid": {"uuid": "501"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.122.33"}}, "endpoint_uuid": {"uuid": "501"}}

                {"device_id": {"device_uuid": {"uuid": "172.16.125.32"}}, "endpoint_uuid": {"uuid": "501"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.125.33"}}, "endpoint_uuid": {"uuid": "501"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "172.16.122.33-501"}}, "name": "172.16.122.33-501",

            "link_id": {"link_uuid": {"uuid": "172.16.125.33-501"}}, "name": "172.16.125.33-501",

            "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0},

            "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "172.16.122.33"}}, "endpoint_uuid": {"uuid": "501"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.122.32"}}, "endpoint_uuid": {"uuid": "501"}}

                {"device_id": {"device_uuid": {"uuid": "172.16.125.33"}}, "endpoint_uuid": {"uuid": "501"}},

                {"device_id": {"device_uuid": {"uuid": "172.16.125.32"}}, "endpoint_uuid": {"uuid": "501"}}

            ]

        }

    ]

src/tests/ecoc25-f5ga-telemetry/deploy-specs-agg.sh

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui" 
#    export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"

#fi



# Uncomment to activate SIMAP Connector

export TFS_COMPONENTS="${TFS_COMPONENTS} simap_connector"



# Uncomment to activate Load Generator

#export TFS_COMPONENTS="${TFS_COMPONENTS} load_generator"

src/tests/ecoc25-f5ga-telemetry/deploy-specs-e2e.sh

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui" 
#    export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"

#fi



# Uncomment to activate SIMAP Connector

export TFS_COMPONENTS="${TFS_COMPONENTS} simap_connector"



# Uncomment to activate Load Generator

#export TFS_COMPONENTS="${TFS_COMPONENTS} load_generator"