Commit 8ee31f1f authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

OFC'23 demo: 

- Extended child descriptor with full-mesh topology
- Extended parent descriptor with import topology setting for XR
parent c796e0bc

src/tests/ofc23/descriptors/descriptor_child.json

+99 −5
Original line number Diff line number Diff line
@@ -13,7 +13,11 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},

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

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/2"}

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/2"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/1"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/2"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/3"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/4"}

                ]}}}

            ]}

        },
@@ -24,7 +28,11 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},

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

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/2"}

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/2"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/1"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/2"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/3"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/4"}

                ]}}}

            ]}

        },
@@ -35,7 +43,11 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},

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

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/2"}

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/2"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/1"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/2"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/3"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/4"}

                ]}}}

            ]}

        },
@@ -46,10 +58,92 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},

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

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/2"}

                    {"sample_types": [], "type": "copper/internal", "uuid": "1/2"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/1"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/2"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/3"},

                    {"sample_types": [], "type": "copper/internal", "uuid": "2/4"}

                ]}}}

            ]}

        }

    ],

    "links": []

    "links": [



        {

            "link_id": {"link_uuid": {"uuid": "PE1/2/2==PE2/2/1"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE1"}}, "endpoint_uuid": {"uuid": "2/2"}},

                {"device_id": {"device_uuid": {"uuid": "PE2"}}, "endpoint_uuid": {"uuid": "2/1"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "PE1/2/3==PE3/2/1"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE1"}}, "endpoint_uuid": {"uuid": "2/3"}},

                {"device_id": {"device_uuid": {"uuid": "PE3"}}, "endpoint_uuid": {"uuid": "2/1"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "PE1/2/4==PE4/2/1"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE1"}}, "endpoint_uuid": {"uuid": "2/4"}},

                {"device_id": {"device_uuid": {"uuid": "PE4"}}, "endpoint_uuid": {"uuid": "2/1"}}

            ]

        },



        {

            "link_id": {"link_uuid": {"uuid": "PE2/2/1==PE1/2/2"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE2"}}, "endpoint_uuid": {"uuid": "2/1"}},

                {"device_id": {"device_uuid": {"uuid": "PE1"}}, "endpoint_uuid": {"uuid": "2/2"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "PE2/2/3==PE3/2/2"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE2"}}, "endpoint_uuid": {"uuid": "2/3"}},

                {"device_id": {"device_uuid": {"uuid": "PE3"}}, "endpoint_uuid": {"uuid": "2/2"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "PE2/2/4==PE4/2/2"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE2"}}, "endpoint_uuid": {"uuid": "2/4"}},

                {"device_id": {"device_uuid": {"uuid": "PE4"}}, "endpoint_uuid": {"uuid": "2/2"}}

            ]

        },



        {

            "link_id": {"link_uuid": {"uuid": "PE3/2/1==PE1/2/3"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE3"}}, "endpoint_uuid": {"uuid": "2/1"}},

                {"device_id": {"device_uuid": {"uuid": "PE1"}}, "endpoint_uuid": {"uuid": "2/3"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "PE3/2/2==PE2/2/3"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE3"}}, "endpoint_uuid": {"uuid": "2/2"}},

                {"device_id": {"device_uuid": {"uuid": "PE2"}}, "endpoint_uuid": {"uuid": "2/3"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "PE4/2/2==PE2/2/4"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE4"}}, "endpoint_uuid": {"uuid": "2/2"}},

                {"device_id": {"device_uuid": {"uuid": "PE2"}}, "endpoint_uuid": {"uuid": "2/4"}}

            ]

        },



        {

            "link_id": {"link_uuid": {"uuid": "PE4/2/1==PE1/2/4"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE4"}}, "endpoint_uuid": {"uuid": "2/1"}},

                {"device_id": {"device_uuid": {"uuid": "PE1"}}, "endpoint_uuid": {"uuid": "2/4"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "PE4/2/2==PE2/2/4"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE4"}}, "endpoint_uuid": {"uuid": "2/2"}},

                {"device_id": {"device_uuid": {"uuid": "PE2"}}, "endpoint_uuid": {"uuid": "2/4"}}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "PE4/2/3==PE3/2/4"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "PE4"}}, "endpoint_uuid": {"uuid": "2/3"}},

                {"device_id": {"device_uuid": {"uuid": "PE3"}}, "endpoint_uuid": {"uuid": "2/4"}}

            ]

        }



    ]

}

src/tests/ofc23/descriptors/descriptor_parent.json

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8444"}},

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {

                    "username": "xr-user-1", "password": "xr-user-1", "hub_module_name": "OFC HUB 1",

                    "consistency-mode": "lifecycle"

                    "consistency-mode": "lifecycle", "import_topology": "devices"

                }}}

            ]}

        },