Commit 27c6cf40 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

ECOC F5GA Telemetry Demo: 

- Fixed slice2 VLAN tags
- Fixed VLANs and IP addresses in topology descriptors
parent bbf9e2eb

src/tests/ecoc25-f5ga-telemetry/data/slices/network-slice2.json

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
                        "service-match-criteria": {"match-criterion": [{

                            "index": 1,

                            "match-type": [

                                {"type": "ietf-network-slice-service:vlan", "value": ["21"]},

                                {"type": "ietf-network-slice-service:vlan", "value": ["31"]},

                                {"type": "ietf-network-slice-service:source-ip-prefix", "value": ["172.16.104.221/24"]},

                                {"type": "ietf-network-slice-service:source-tcp-port", "value": ["10500"]},

                                {"type": "ietf-network-slice-service:destination-ip-prefix", "value": ["172.1.201.22/24"]},

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

+2 −4
Original line number Diff line number Diff line
@@ -45,12 +45,11 @@ 
            }}},

            {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[201]", "resource_value": {

                "uuid": "201", "name": "201", "type": "optical",

                "address_ip": "0.0.0.0", "address_prefix": "24",

                "site_location": "transport", "mtu": "1500"

            }}},

            {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[500]", "resource_value": {

                "uuid": "500", "name": "500", "type": "optical",

                "address_ip": "172.10.33.2", "address_prefix": "24",

                "address_ip": "172.10.44.2", "address_prefix": "24", "vlan_tag": 101,

                "site_location": "transport", "mtu": "1500"

            }}}

        ]}},
@@ -72,12 +71,11 @@ 
            }}},

            {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[201]", "resource_value": {

                "uuid": "201", "name": "201", "type": "optical",

                "address_ip": "0.0.0.0", "address_prefix": "24",

                "site_location": "transport", "mtu": "1500"

            }}},

            {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[500]", "resource_value": {

                "uuid": "500", "name": "500", "type": "optical",

                "address_ip": "172.10.44.2", "address_prefix": "24",

                "address_ip": "172.10.44.2", "address_prefix": "24", "vlan_tag": 201,

                "site_location": "transport", "mtu": "1500"

            }}}

        ]}}

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

+11 −11
Original line number Diff line number Diff line
@@ -21,17 +21,17 @@ 
                ]}}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[200]", "resource_value": {

                    "uuid": "200", "name": "200", "type": "optical",

                    "address_ip": "128.32.44.254", "address_prefix": "24",

                    "address_ip": "128.32.44.254", "address_prefix": "24", "vlan_tag": 21,

                    "site_location": "access", "mtu": "1500"

                }}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[500]", "resource_value": {

                    "uuid": "500", "name": "500", "type": "optical",

                    "address_ip": "0.0.0.0", "address_prefix": "24",

                    "address_ip": "10.44.1.1", "address_prefix": "24",

                    "site_location": "transport", "mtu": "1500"

                }}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[501]", "resource_value": {

                    "uuid": "501", "name": "501", "type": "optical",

                    "address_ip": "0.0.0.0", "address_prefix": "24",

                    "address_ip": "10.44.2.1", "address_prefix": "24",

                    "site_location": "transport", "mtu": "1500"

                }}}

            ]}
@@ -49,12 +49,12 @@ 
                ]}}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[500]", "resource_value": {

                    "uuid": "500", "name": "500", "type": "optical",

                    "address_ip": "0.0.0.0", "address_prefix": "24",

                    "address_ip": "10.44.1.2", "address_prefix": "24",

                    "site_location": "transport", "mtu": "1500"

                }}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[501]", "resource_value": {

                    "uuid": "501", "name": "501", "type": "optical",

                    "address_ip": "0.0.0.0", "address_prefix": "24",

                    "address_ip": "10.44.3.2", "address_prefix": "24",

                    "site_location": "transport", "mtu": "1500"

                }}}

            ]}
@@ -72,12 +72,12 @@ 
                ]}}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[500]", "resource_value": {

                    "uuid": "500", "name": "500", "type": "optical",

                    "address_ip": "0.0.0.0", "address_prefix": "24",

                    "address_ip": "10.44.2.2", "address_prefix": "24",

                    "site_location": "transport", "mtu": "1500"

                }}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[501]", "resource_value": {

                    "uuid": "501", "name": "501", "type": "optical",

                    "address_ip": "0.0.0.0", "address_prefix": "24",

                    "address_ip": "10.44.4.2", "address_prefix": "24",

                    "site_location": "transport", "mtu": "1500"

                }}}

            ]}
@@ -96,17 +96,17 @@ 
                ]}}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[200]", "resource_value": {

                    "uuid": "200", "name": "200", "type": "optical",

                    "address_ip": "172.10.44.254", "address_prefix": "24",

                    "site_location": "cloud", "mtu": "1500", "ce-ip": "172.10.44.2"

                    "address_ip": "172.10.44.254", "address_prefix": "24", "vlan_tag": 201,

                    "site_location": "cloud", "mtu": "1500"

                }}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[500]", "resource_value": {

                    "uuid": "500", "name": "500", "type": "optical",

                    "address_ip": "0.0.0.0", "address_prefix": "24",

                    "address_ip": "10.44.3.1", "address_prefix": "24",

                    "site_location": "transport", "mtu": "1500"

                }}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[501]", "resource_value": {

                    "uuid": "501", "name": "501", "type": "optical",

                    "address_ip": "0.0.0.0", "address_prefix": "24",

                    "address_ip": "10.44.4.1", "address_prefix": "24",

                    "site_location": "transport", "mtu": "1500"

                }}}

            ]}