Commit f6b780b6 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

NFV-SDN'22 scenario:

- updated endpoint types to specify border/internal
parent 58d1ae72
Loading
Loading
Loading
Loading
+17 −17
Changes for src/tests/scenario2/descriptors/domain1.json: 17 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -35,8 +35,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", "uuid": "eth1"},
                    {"sample_types": [], "type": "copper", "uuid": "int"}
                    {"sample_types": [], "type": "copper/border", "uuid": "eth1"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "int"}
                ]}}}
            ]}
        },
@@ -46,9 +46,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", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "5"},
                    {"sample_types": [], "type": "copper", "uuid": "100"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "2"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "5"},
                    {"sample_types": [], "type": "copper/border", "uuid": "100"}
                ]}}}
            ]}
        },
@@ -58,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", "uuid": "1"},
                    {"sample_types": [], "type": "copper", "uuid": "3"},
                    {"sample_types": [], "type": "copper", "uuid": "5"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "1"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "3"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "5"}
                ]}}}
            ]}
        },
@@ -70,8 +70,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", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "4"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "2"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "4"}
                ]}}}
            ]}
        },
@@ -81,9 +81,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", "uuid": "3"},
                    {"sample_types": [], "type": "copper", "uuid": "5"},
                    {"sample_types": [], "type": "copper", "uuid": "10"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "3"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "5"},
                    {"sample_types": [], "type": "copper/border", "uuid": "10"}
                ]}}}
            ]}
        },
@@ -93,10 +93,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", "uuid": "1"},
                    {"sample_types": [], "type": "copper", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "4"},
                    {"sample_types": [], "type": "copper", "uuid": "10"}
                    {"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": "10"}
                ]}}}
            ]}
        }
+21 −21
Changes for src/tests/scenario2/descriptors/domain2.json: 21 added lines, 21 removed lines.
Original line number Diff line number Diff line
@@ -18,10 +18,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", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "5"},
                    {"sample_types": [], "type": "copper", "uuid": "6"},
                    {"sample_types": [], "type": "copper", "uuid": "10"}
                    {"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": "10"}
                ]}}}
            ]}
        },
@@ -31,11 +31,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", "uuid": "1"},
                    {"sample_types": [], "type": "copper", "uuid": "3"},
                    {"sample_types": [], "type": "copper", "uuid": "4"},
                    {"sample_types": [], "type": "copper", "uuid": "5"},
                    {"sample_types": [], "type": "copper", "uuid": "6"}
                    {"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"}
                ]}}}
            ]}
        },
@@ -45,8 +45,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", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "6"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "2"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "6"}
                ]}}}
            ]}
        },
@@ -56,9 +56,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", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "5"},
                    {"sample_types": [], "type": "copper", "uuid": "10"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "2"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "5"},
                    {"sample_types": [], "type": "copper/border", "uuid": "10"}
                ]}}}
            ]}
        },
@@ -68,10 +68,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", "uuid": "1"},
                    {"sample_types": [], "type": "copper", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "4"},
                    {"sample_types": [], "type": "copper", "uuid": "10"}
                    {"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": "10"}
                ]}}}
            ]}
        },
@@ -81,9 +81,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", "uuid": "1"},
                    {"sample_types": [], "type": "copper", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "3"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "1"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "2"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "3"}
                ]}}}
            ]}
        }
+13 −13
Changes for src/tests/scenario2/descriptors/domain3.json: 13 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -18,9 +18,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", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "4"},
                    {"sample_types": [], "type": "copper", "uuid": "10"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "2"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "4"},
                    {"sample_types": [], "type": "copper/border", "uuid": "10"}
                ]}}}
            ]}
        },
@@ -30,10 +30,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", "uuid": "1"},
                    {"sample_types": [], "type": "copper", "uuid": "3"},
                    {"sample_types": [], "type": "copper", "uuid": "4"},
                    {"sample_types": [], "type": "copper", "uuid": "10"}
                    {"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/border", "uuid": "10"}
                ]}}}
            ]}
        },
@@ -43,9 +43,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", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "4"},
                    {"sample_types": [], "type": "copper", "uuid": "10"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "2"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "4"},
                    {"sample_types": [], "type": "copper/border", "uuid": "10"}
                ]}}}
            ]}
        },
@@ -55,9 +55,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", "uuid": "1"},
                    {"sample_types": [], "type": "copper", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "3"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "1"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "2"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "3"}
                ]}}}
            ]}
        }
+11 −11
Changes for src/tests/scenario2/descriptors/domain4.json: 11 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -18,8 +18,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", "uuid": "eth1"},
                    {"sample_types": [], "type": "copper", "uuid": "int"}
                    {"sample_types": [], "type": "copper/border", "uuid": "eth1"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "int"}
                ]}}}
            ]}
        },
@@ -29,9 +29,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", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "3"},
                    {"sample_types": [], "type": "copper", "uuid": "10"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "2"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "3"},
                    {"sample_types": [], "type": "copper/border", "uuid": "10"}
                ]}}}
            ]}
        },
@@ -41,9 +41,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", "uuid": "1"},
                    {"sample_types": [], "type": "copper", "uuid": "3"},
                    {"sample_types": [], "type": "copper", "uuid": "10"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "1"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "3"},
                    {"sample_types": [], "type": "copper/border", "uuid": "10"}
                ]}}}
            ]}
        },
@@ -53,9 +53,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", "uuid": "1"},
                    {"sample_types": [], "type": "copper", "uuid": "2"},
                    {"sample_types": [], "type": "copper", "uuid": "100"}
                    {"sample_types": [], "type": "copper/internal", "uuid": "1"},
                    {"sample_types": [], "type": "copper/internal", "uuid": "2"},
                    {"sample_types": [], "type": "copper/border", "uuid": "100"}
                ]}}}
            ]}
        }