Commit 22b44d1b authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

NFV-SDN'22 scenario: 

- Updated descriptor files
parent 0ae442f6

src/tests/scenario2/descriptors/domain1.json

+61 −56
Original line number Diff line number Diff line 
{

    "contexts": [

        {

            "context_id": {"context_uuid": {"uuid": "admin"}},

            "topology_ids": [

                {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}}

            ], "service_ids": []

        }

        {"context_id": {"context_uuid": {"uuid": "admin"}}}

    ],

    "topologies": [

        {

            "topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}},

            "device_ids": [

                {"device_uuid": {"uuid": "DC1"}},

                {"device_uuid": {"uuid": "R1@D1"}},

                {"device_uuid": {"uuid": "R2@D1"}},

                {"device_uuid": {"uuid": "R3@D1"}},

                {"device_uuid": {"uuid": "R4@D1"}},

                {"device_uuid": {"uuid": "R5@D1"}}

            ], "link_ids": [

                {"link_uuid": {"uuid": "DC1/D1==R1@D1/DC1"}},

                {"link_uuid": {"uuid": "R1@D1/2==R2@D1/1"}},

                {"link_uuid": {"uuid": "R2@D1/3==R3@D1/2"}},

                {"link_uuid": {"uuid": "R2@D1/5==R5@D1/2"}},

                {"link_uuid": {"uuid": "R3@D1/4==R4@D1/3"}},

                {"link_uuid": {"uuid": "R4@D1/5==R5@D1/4"}},

                {"link_uuid": {"uuid": "R5@D1/1==R1@D1/5"}}

            ]

        }

        {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}}}

    ],

    "devices": [

        {
@@ -35,8 +12,8 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

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

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

                    {"sample_types": [], "type": "copper/border", "uuid": "D1"},

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

                    {"uuid": "D1",  "type": "copper/border",   "context_uuid": "admin", "topology_uuid": "inter"},

                    {"uuid": "int", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"   }

                ]}}}

            ]}

        },
@@ -46,9 +23,9 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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": "2"},

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

                    {"sample_types": [], "type": "copper/border", "uuid": "DC1"}

                    {"uuid": "2",   "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "5",   "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "DC1", "type": "copper/border",   "context_uuid": "admin", "topology_uuid": "D1"}

                ]}}}

            ]}

        },
@@ -58,9 +35,9 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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"},

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

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

                    {"uuid": "1", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "3", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "5", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"}

                ]}}}

            ]}

        },
@@ -70,8 +47,8 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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": "2"},

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

                    {"uuid": "2", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "4", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"}

                ]}}}

            ]}

        },
@@ -81,9 +58,9 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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": "3"},

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

                    {"sample_types": [], "type": "copper/border", "uuid": "D2"}

                    {"uuid": "3",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "5",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "D2", "type": "copper/border",   "context_uuid": "admin", "topology_uuid": "D1"}

                ]}}}

            ]}

        },
@@ -93,10 +70,10 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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"},

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

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

                    {"sample_types": [], "type": "copper/border", "uuid": "D3"}

                    {"uuid": "1",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "2",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "4",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "D3", "type": "copper/border",   "context_uuid": "admin", "topology_uuid": "D1"}

                ]}}}

            ]}

        }
@@ -104,44 +81,72 @@ 
    "links": [

        {

            "link_id": {"link_uuid": {"uuid": "DC1/D1==R1@D1/DC1"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "DC1"}}, "endpoint_uuid": {"uuid": "D1"}},

                {"device_id": {"device_uuid": {"uuid": "R1@D1"}}, "endpoint_uuid": {"uuid": "DC1"}}

                {"device_id": {"device_uuid": {"uuid": "DC1"}}, "endpoint_uuid": {"uuid": "D1"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "inter"}

                }},

                {"device_id": {"device_uuid": {"uuid": "R1@D1"}}, "endpoint_uuid": {"uuid": "DC1"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "R1@D1/2==R2@D1/1"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "R1@D1"}}, "endpoint_uuid": {"uuid": "2"}},

                {"device_id": {"device_uuid": {"uuid": "R2@D1"}}, "endpoint_uuid": {"uuid": "1"}}

                {"device_id": {"device_uuid": {"uuid": "R1@D1"}}, "endpoint_uuid": {"uuid": "2"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }},

                {"device_id": {"device_uuid": {"uuid": "R2@D1"}}, "endpoint_uuid": {"uuid": "1"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "R2@D1/3==R3@D1/2"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "R2@D1"}}, "endpoint_uuid": {"uuid": "3"}},

                {"device_id": {"device_uuid": {"uuid": "R3@D1"}}, "endpoint_uuid": {"uuid": "2"}}

                {"device_id": {"device_uuid": {"uuid": "R2@D1"}}, "endpoint_uuid": {"uuid": "3"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }},

                {"device_id": {"device_uuid": {"uuid": "R3@D1"}}, "endpoint_uuid": {"uuid": "2"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "R2@D1/5==R5@D1/2"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "R2@D1"}}, "endpoint_uuid": {"uuid": "5"}},

                {"device_id": {"device_uuid": {"uuid": "R5@D1"}}, "endpoint_uuid": {"uuid": "2"}}

                {"device_id": {"device_uuid": {"uuid": "R2@D1"}}, "endpoint_uuid": {"uuid": "5"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }},

                {"device_id": {"device_uuid": {"uuid": "R5@D1"}}, "endpoint_uuid": {"uuid": "2"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "R3@D1/4==R4@D1/3"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "R3@D1"}}, "endpoint_uuid": {"uuid": "4"}},

                {"device_id": {"device_uuid": {"uuid": "R4@D1"}}, "endpoint_uuid": {"uuid": "3"}}

                {"device_id": {"device_uuid": {"uuid": "R3@D1"}}, "endpoint_uuid": {"uuid": "4"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }},

                {"device_id": {"device_uuid": {"uuid": "R4@D1"}}, "endpoint_uuid": {"uuid": "3"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "R4@D1/5==R5@D1/4"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "R4@D1"}}, "endpoint_uuid": {"uuid": "5"}},

                {"device_id": {"device_uuid": {"uuid": "R5@D1"}}, "endpoint_uuid": {"uuid": "4"}}

                {"device_id": {"device_uuid": {"uuid": "R4@D1"}}, "endpoint_uuid": {"uuid": "5"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }},

                {"device_id": {"device_uuid": {"uuid": "R5@D1"}}, "endpoint_uuid": {"uuid": "4"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "R5@D1/1==R1@D1/5"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "R5@D1"}}, "endpoint_uuid": {"uuid": "1"}},

                {"device_id": {"device_uuid": {"uuid": "R1@D1"}}, "endpoint_uuid": {"uuid": "5"}}

                {"device_id": {"device_uuid": {"uuid": "R5@D1"}}, "endpoint_uuid": {"uuid": "1"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }},

                {"device_id": {"device_uuid": {"uuid": "R1@D1"}}, "endpoint_uuid": {"uuid": "5"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }}

            ]

        }

    ]

src/tests/scenario2/descriptors/domain2.json

+23 −48
Original line number Diff line number Diff line 
{

    "contexts": [

        {

            "context_id": {"context_uuid": {"uuid": "admin"}},

            "topology_ids": [

                {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D2"}}

            ], "service_ids": []

        }

        {"context_id": {"context_uuid": {"uuid": "admin"}}}

    ],

    "topologies": [

        {

            "topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D2"}},

            "device_ids": [

                {"device_uuid": {"uuid": "R1@D2"}},

                {"device_uuid": {"uuid": "R2@D2"}},

                {"device_uuid": {"uuid": "R3@D2"}},

                {"device_uuid": {"uuid": "R4@D2"}},

                {"device_uuid": {"uuid": "R5@D2"}},

                {"device_uuid": {"uuid": "R6@D2"}}

            ], "link_ids": [

                {"link_uuid": {"uuid": "R1@D2/2==R2@D2/1"}},

                {"link_uuid": {"uuid": "R1@D2/6==R6@D2/1"}},

                {"link_uuid": {"uuid": "R1@D2/5==R5@D2/1"}},

                {"link_uuid": {"uuid": "R2@D2/3==R3@D2/2"}},

                {"link_uuid": {"uuid": "R2@D2/4==R4@D2/2"}},

                {"link_uuid": {"uuid": "R2@D2/5==R5@D2/2"}},

                {"link_uuid": {"uuid": "R2@D2/6==R6@D2/2"}},

                {"link_uuid": {"uuid": "R3@D2/6==R6@D2/3"}},

                {"link_uuid": {"uuid": "R4@D2/5==R5@D2/4"}}

            ]

        }

        {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D2"}}}

    ],

    "devices": [

        {
@@ -37,10 +12,10 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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": "2"},

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

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

                    {"sample_types": [], "type": "copper/border", "uuid": "D1"}

                    {"uuid": "2",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "5",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "6",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "D1", "type": "copper/border",   "context_uuid": "admin", "topology_uuid": "inter"}

                ]}}}

            ]}

        },
@@ -50,11 +25,11 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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"},

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

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

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

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

                    {"uuid": "1", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "3", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "4", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "5", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "6", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"}

                ]}}}

            ]}

        },
@@ -64,8 +39,8 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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": "2"},

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

                    {"uuid": "2", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "6", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"}

                ]}}}

            ]}

        },
@@ -75,9 +50,9 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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": "2"},

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

                    {"sample_types": [], "type": "copper/border", "uuid": "D4"}

                    {"uuid": "2",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "5",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "D4", "type": "copper/border",   "context_uuid": "admin", "topology_uuid": "inter"}

                ]}}}

            ]}

        },
@@ -87,10 +62,10 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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"},

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

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

                    {"sample_types": [], "type": "copper/border", "uuid": "D3"}

                    {"uuid": "1",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "2",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "4",  "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "D3", "type": "copper/border",   "context_uuid": "admin", "topology_uuid": "inter"}

                ]}}}

            ]}

        },
@@ -100,9 +75,9 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"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"},

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

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

                    {"uuid": "1", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "2", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"},

                    {"uuid": "3", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "admin"}

                ]}}}

            ]}

        }

src/tests/scenario2/descriptors/domain3.json

+15 −34

File changed.

Preview size limit exceeded, changes collapsed.

src/tests/scenario2/descriptors/domain4.json

+19 −33

File changed.

Preview size limit exceeded, changes collapsed.