Skip to content
Snippets Groups Projects
Commit d48cfb7b authored by Shayan Hajipour's avatar Shayan Hajipour
Browse files

enhancement: 

- agg-net and ip-transport controllers added to e2e descriptor of CAMARA ofc25 demo to have both in the e2e topology
- agg-net descriptor synced with the latest tests
parent 216ddc4e
No related branches found
No related tags found
2 merge requests!359Release TeraFlowSDN 5.0,!323Resolve "(CTTC) Fixing visual presentation issues regarding the CAMARA demo"
Hide whitespace changes
Inline Side-by-side
src/nbi/tests/data/agg-net-descriptor.json
+ 259
− 29
View file @ d48cfb7b
......@@ -41,7 +41,7 @@
"action": 1,
"custom": {
"resource_key": "_connect/address",
"resource_value": "10.10.10.10"
"resource_value": "10.0.58.29"
}
},
{
......@@ -56,7 +56,13 @@
"custom": {
"resource_key": "_connect/settings",
"resource_value": {
"endpoints": [],
"endpoints": [
{
"uuid": "mgmt",
"name": "mgmt",
"type": "mgmt"
}
],
"scheme": "http",
"username": "admin",
"password": "admin",
......@@ -85,7 +91,7 @@
},
"device_operational_status": 1,
"device_drivers": [
0
13
],
"device_config": {
"config_rules": [
......@@ -118,21 +124,9 @@
"uuid": "200",
"name": "200",
"type": "optical",
"ce-ip": "128.32.33.2",
"address_ip": "128.32.33.254",
"address_prefix": "24",
"site_location": "access",
"mtu": "1500",
"ipv4_lan_prefixes": [
{
"lan": "128.32.10.0/24",
"lan_tag": "10"
},
{
"lan": "128.32.20.0/24",
"lan_tag": "20"
}
]
"site_location": "access"
},
{
"uuid": "500",
......@@ -166,7 +160,7 @@
},
"device_operational_status": 1,
"device_drivers": [
0
13
],
"device_config": {
"config_rules": [
......@@ -227,7 +221,7 @@
},
"device_operational_status": 1,
"device_drivers": [
0
13
],
"device_config": {
"config_rules": [
......@@ -288,7 +282,7 @@
},
"device_operational_status": 1,
"device_drivers": [
0
13
],
"device_config": {
"config_rules": [
......@@ -321,17 +315,9 @@
"uuid": "200",
"name": "200",
"type": "optical",
"ce-ip": "172.10.33.2",
"address_ip": "172.10.33.254",
"address_prefix": "24",
"site_location": "cloud",
"mtu": "1500",
"ipv4_lan_prefixes": [
{
"lan": "172.1.101.0/24",
"lan_tag": "101"
}
]
"site_location": "cloud"
},
{
"uuid": "500",
......@@ -349,9 +335,185 @@
}
]
}
},
{
"device_id": {
"device_uuid": {
"uuid": "172.16.204.220"
}
},
"device_type": "emu-datacenter",
"device_drivers": [
0
],
"device_endpoints": [],
"device_operational_status": 1,
"device_config": {
"config_rules": [
{
"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": "optical",
"uuid": "500"
},
{
"sample_types": [],
"type": "optical",
"uuid": "200"
},
{
"sample_types": [],
"type": "optical",
"uuid": "201"
}
]
}
}
}
]
}
}
],
"links": [
{
"link_id": {
"link_uuid": {
"uuid": "ip-net-controller/mgmt==172.16.182.25/mgmt"
}
},
"name": "ip-net-controller/mgmt==172.16.182.25/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "ip-net-controller"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
},
{
"device_id": {
"device_uuid": {
"uuid": "172.16.182.25"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
}
]
},
{
"link_id": {
"link_uuid": {
"uuid": "ip-net-controller/mgmt==172.16.185.31/mgmt"
}
},
"name": "ip-net-controller/mgmt==172.16.185.31/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "ip-net-controller"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
},
{
"device_id": {
"device_uuid": {
"uuid": "172.16.185.31"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
}
]
},
{
"link_id": {
"link_uuid": {
"uuid": "ip-net-controller/mgmt==172.16.185.33/mgmt"
}
},
"name": "ip-net-controller/mgmt==172.16.185.33/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "ip-net-controller"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
},
{
"device_id": {
"device_uuid": {
"uuid": "172.16.185.33"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
}
]
},
{
"link_id": {
"link_uuid": {
"uuid": "ip-net-controller/mgmt==172.16.185.32/mgmt"
}
},
"name": "ip-net-controller/mgmt==172.16.185.32/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "ip-net-controller"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
},
{
"device_id": {
"device_uuid": {
"uuid": "172.16.185.32"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
}
]
},
{
"link_id": {
"link_uuid": {
......@@ -623,6 +785,74 @@
}
}
]
},
{
"link_id": {
"link_uuid": {
"uuid": "172.16.185.32-200"
}
},
"name": "172.16.185.32-200",
"attributes": {
"total_capacity_gbps": 10,
"used_capacity_gbps": 0
},
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "172.16.185.32"
}
},
"endpoint_uuid": {
"uuid": "200"
}
},
{
"device_id": {
"device_uuid": {
"uuid": "172.16.204.220"
}
},
"endpoint_uuid": {
"uuid": "500"
}
}
]
},
{
"link_id": {
"link_uuid": {
"uuid": "172.16.204.220-500"
}
},
"name": "172.16.204.220-500",
"attributes": {
"total_capacity_gbps": 10,
"used_capacity_gbps": 0
},
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "172.16.204.220"
}
},
"endpoint_uuid": {
"uuid": "500"
}
},
{
"device_id": {
"device_uuid": {
"uuid": "172.16.185.32"
}
},
"endpoint_uuid": {
"uuid": "200"
}
}
]
}
]
}
\ No newline at end of file
}
src/nbi/tests/data/camara-e2e-topology.json
+ 101
− 18
View file @ d48cfb7b
......@@ -23,6 +23,59 @@
}
],
"devices": [
{
"device_id": {
"device_uuid": {
"uuid": "ip-transport-controller"
}
},
"name": "ip-transport-controller",
"device_type": "ietf-slice",
"device_operational_status": 1,
"device_drivers": [
14
],
"device_config": {
"config_rules": [
{
"action": 1,
"custom": {
"resource_key": "_connect/address",
"resource_value": "10.0.58.9"
}
},
{
"action": 1,
"custom": {
"resource_key": "_connect/port",
"resource_value": "80"
}
},
{
"action": 1,
"custom": {
"resource_key": "_connect/settings",
"resource_value": {
"endpoints": [
{
"uuid": "mgmt",
"name": "mgmt",
"type": "mgmt"
}
],
"scheme": "http",
"username": "admin",
"password": "admin",
"base_url": "/restconf/v2/data",
"timeout": 120,
"verify": false
}
}
}
]
},
"device_endpoints": []
},
{
"device_id": {
"device_uuid": {
......@@ -94,7 +147,7 @@
"action": 1,
"custom": {
"resource_key": "_connect/address",
"resource_value": "10.10.10.10"
"resource_value": "1.1.1.1"
}
},
{
......@@ -139,7 +192,7 @@
"device_type": "emu-packet-router",
"controller_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"device_operational_status": 1,
......@@ -210,7 +263,7 @@
"device_type": "emu-packet-router",
"controller_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"device_operational_status": 1,
......@@ -272,7 +325,7 @@
"device_type": "emu-packet-router",
"controller_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"device_operational_status": 1,
......@@ -334,7 +387,7 @@
"device_type": "emu-packet-router",
"controller_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"device_operational_status": 1,
......@@ -748,6 +801,36 @@
}
],
"links": [
{
"link_id": {
"link_uuid": {
"uuid": "agg-net-controller/mgmt==ip-transport-controller/mgmt"
}
},
"name": "agg-net-controller/mgmt==ip-transport-controller/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "agg-net-controller"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
},
{
"device_id": {
"device_uuid": {
"uuid": "ip-transport-controller"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
}
]
},
{
"link_id": {
"link_uuid": {
......@@ -841,15 +924,15 @@
{
"link_id": {
"link_uuid": {
"uuid": "agg-net-controller/mgmt==172.16.185.33/mgmt"
"uuid": "ip-transport-controller/mgmt==172.16.185.33/mgmt"
}
},
"name": "agg-net-controller/mgmt==172.16.185.33/mgmt",
"name": "ip-transport-controller/mgmt==172.16.185.33/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"endpoint_uuid": {
......@@ -871,15 +954,15 @@
{
"link_id": {
"link_uuid": {
"uuid": "agg-net-controller/mgmt==172.16.185.31/mgmt"
"uuid": "ip-transport-controller/mgmt==172.16.185.31/mgmt"
}
},
"name": "agg-net-controller/mgmt==172.16.185.31/mgmt",
"name": "ip-transport-controller/mgmt==172.16.185.31/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"endpoint_uuid": {
......@@ -901,15 +984,15 @@
{
"link_id": {
"link_uuid": {
"uuid": "agg-net-controller/mgmt==172.16.182.25/mgmt"
"uuid": "ip-transport-controller/mgmt==172.16.185.32/mgmt"
}
},
"name": "agg-net-controller/mgmt==172.16.182.25/mgmt",
"name": "ip-transport-controller/mgmt==172.16.185.32/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"endpoint_uuid": {
......@@ -919,7 +1002,7 @@
{
"device_id": {
"device_uuid": {
"uuid": "172.16.182.25"
"uuid": "172.16.185.32"
}
},
"endpoint_uuid": {
......@@ -931,15 +1014,15 @@
{
"link_id": {
"link_uuid": {
"uuid": "agg-net-controller/mgmt==172.16.182.25/mgmt"
"uuid": "ip-transport-controller/mgmt==172.16.182.25/mgmt"
}
},
"name": "agg-net-controller/mgmt==172.16.182.25/mgmt",
"name": "ip-transport-controller/mgmt==172.16.182.25/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"endpoint_uuid": {
......
src/tests/ofc25-camara-e2e-controller/data/camara-e2e-topology.json
+ 101
− 18
View file @ d48cfb7b
......@@ -23,6 +23,59 @@
}
],
"devices": [
{
"device_id": {
"device_uuid": {
"uuid": "ip-transport-controller"
}
},
"name": "ip-transport-controller",
"device_type": "ietf-slice",
"device_operational_status": 1,
"device_drivers": [
14
],
"device_config": {
"config_rules": [
{
"action": 1,
"custom": {
"resource_key": "_connect/address",
"resource_value": "AGG_NET_IP"
}
},
{
"action": 1,
"custom": {
"resource_key": "_connect/port",
"resource_value": "AGG_NET_PORT"
}
},
{
"action": 1,
"custom": {
"resource_key": "_connect/settings",
"resource_value": {
"endpoints": [
{
"uuid": "mgmt",
"name": "mgmt",
"type": "mgmt"
}
],
"scheme": "http",
"username": "admin",
"password": "admin",
"base_url": "/restconf/v2/data",
"timeout": 120,
"verify": false
}
}
}
]
},
"device_endpoints": []
},
{
"device_id": {
"device_uuid": {
......@@ -101,7 +154,7 @@
"action": 1,
"custom": {
"resource_key": "_connect/port",
"resource_value": "NCE_PORT"
"resource_value": "NCE_IP"
}
},
{
......@@ -139,7 +192,7 @@
"device_type": "emu-packet-router",
"controller_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"device_operational_status": 1,
......@@ -210,7 +263,7 @@
"device_type": "emu-packet-router",
"controller_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"device_operational_status": 1,
......@@ -272,7 +325,7 @@
"device_type": "emu-packet-router",
"controller_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"device_operational_status": 1,
......@@ -334,7 +387,7 @@
"device_type": "emu-packet-router",
"controller_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"device_operational_status": 1,
......@@ -748,6 +801,36 @@
}
],
"links": [
{
"link_id": {
"link_uuid": {
"uuid": "agg-net-controller/mgmt==ip-transport-controller/mgmt"
}
},
"name": "agg-net-controller/mgmt==ip-transport-controller/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "agg-net-controller"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
},
{
"device_id": {
"device_uuid": {
"uuid": "ip-transport-controller"
}
},
"endpoint_uuid": {
"uuid": "mgmt"
}
}
]
},
{
"link_id": {
"link_uuid": {
......@@ -841,15 +924,15 @@
{
"link_id": {
"link_uuid": {
"uuid": "agg-net-controller/mgmt==172.16.185.33/mgmt"
"uuid": "ip-transport-controller/mgmt==172.16.185.33/mgmt"
}
},
"name": "agg-net-controller/mgmt==172.16.185.33/mgmt",
"name": "ip-transport-controller/mgmt==172.16.185.33/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"endpoint_uuid": {
......@@ -871,15 +954,15 @@
{
"link_id": {
"link_uuid": {
"uuid": "agg-net-controller/mgmt==172.16.185.31/mgmt"
"uuid": "ip-transport-controller/mgmt==172.16.185.31/mgmt"
}
},
"name": "agg-net-controller/mgmt==172.16.185.31/mgmt",
"name": "ip-transport-controller/mgmt==172.16.185.31/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"endpoint_uuid": {
......@@ -901,15 +984,15 @@
{
"link_id": {
"link_uuid": {
"uuid": "agg-net-controller/mgmt==172.16.182.25/mgmt"
"uuid": "ip-transport-controller/mgmt==172.16.185.32/mgmt"
}
},
"name": "agg-net-controller/mgmt==172.16.182.25/mgmt",
"name": "ip-transport-controller/mgmt==172.16.185.32/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"endpoint_uuid": {
......@@ -919,7 +1002,7 @@
{
"device_id": {
"device_uuid": {
"uuid": "172.16.182.25"
"uuid": "172.16.185.32"
}
},
"endpoint_uuid": {
......@@ -931,15 +1014,15 @@
{
"link_id": {
"link_uuid": {
"uuid": "agg-net-controller/mgmt==172.16.182.25/mgmt"
"uuid": "ip-transport-controller/mgmt==172.16.182.25/mgmt"
}
},
"name": "agg-net-controller/mgmt==172.16.182.25/mgmt",
"name": "ip-transport-controller/mgmt==172.16.182.25/mgmt",
"link_endpoint_ids": [
{
"device_id": {
"device_uuid": {
"uuid": "agg-net-controller"
"uuid": "ip-transport-controller"
}
},
"endpoint_uuid": {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment