Skip to content
Snippets Groups Projects
Commit 1f7b5225 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

EuCNC24: Updated CI/CD pipeline

parent adc0c12e
No related branches found
No related tags found
2 merge requests!294Release TeraFlowSDN 4.0,!172Resolve "(CTTC) Extend gNMI-OpenConfig SBI driver"
Hide whitespace changes
Inline Side-by-side
src/tests/eucnc24/data/ietf-l3vpn-service.json
+ 69
− 217
View file @ 1f7b5225
{ {
"ietf-l3vpn-svc:l3vpn-svc": { "ietf-l3vpn-svc:l3vpn-svc": {
"vpn-services": { "vpn-services": {"vpn-service": [{"vpn-id": "ietf-l3vpn-svc"}]},
"vpn-service": [ "sites": {
{ "site": [
"vpn-id": "vpn1" {
} "site-id": "site_DC1",
] "management": {"type": "ietf-l3vpn-svc:provider-managed"},
}, "locations": {"location": [{"location-id": "DC1"}]},
"sites": { "devices": {"device": [{"device-id": "dc1", "location": "DC1"}]},
"site": [ "site-network-accesses": {
{ "site-network-access": [
"site-id": "site_OLT",
"management": {
"type": "ietf-l3vpn-svc:provider-managed"
},
"locations": {
"location": [
{
"location-id": "OLT"
}
]
},
"devices": {
"device": [
{
"device-id": "128.32.33.5",
"location": "OLT"
}
]
},
"routing-protocols": {
"routing-protocol": [
{
"type": "ietf-l3vpn-svc:static",
"static": {
"cascaded-lan-prefixes": {
"ipv4-lan-prefixes": [
{
"lan": "128.32.10.1/24",
"lan-tag": "vlan21",
"next-hop": "128.32.33.2"
},
{
"lan": "128.32.20.1/24",
"lan-tag": "vlan21",
"next-hop": "128.32.33.2"
}
]
}
}
}
]
},
"site-network-accesses": {
"site-network-access": [
{
"site-network-access-id": "500",
"site-network-access-type": "ietf-l3vpn-svc:multipoint",
"device-reference": "128.32.33.5",
"vpn-attachment": {
"vpn-id": "vpn1",
"site-role": "ietf-l3vpn-svc:spoke-role"
},
"ip-connection": {
"ipv4": {
"address-allocation-type": "ietf-l3vpn-svc:static-address",
"addresses": {
"provider-address": "128.32.33.254",
"customer-address": "128.32.33.2",
"prefix-length": 24
}
}
},
"routing-protocols": {
"routing-protocol": [
{
"type": "ietf-l3vpn-svc:static",
"static": {
"cascaded-lan-prefixes": {
"ipv4-lan-prefixes": [
{ {
"lan": "172.1.101.1/24", "site-network-access-id": "int",
"lan-tag": "vlan21", "site-network-access-type": "ietf-l3vpn-svc:multipoint",
"next-hop": "128.32.33.254" "device-reference": "dc1",
} "vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:spoke-role"},
] "ip-connection": {
} "ipv4": {
} "address-allocation-type": "ietf-l3vpn-svc:static-address",
} "addresses": {
] "provider-address": "192.168.1.1",
}, "customer-address": "192.168.1.10",
"service": { "prefix-length": 24
"svc-mtu": 1500, }
"svc-input-bandwidth": 1000000000, }
"svc-output-bandwidth": 1000000000, },
"qos": { "service": {
"qos-profile": { "svc-mtu": 1500,
"classes": { "svc-input-bandwidth": 1000000000,
"class": [ "svc-output-bandwidth": 1000000000,
{ "qos": {"qos-profile": {"classes": {"class": [{
"class-id": "qos-realtime", "class-id": "qos-realtime",
"direction": "ietf-l3vpn-svc:both", "direction": "ietf-l3vpn-svc:both",
"latency": { "latency": {"latency-boundary": 10},
"latency-boundary": 10 "bandwidth": {"guaranteed-bw-percent": 100}
}, }]}}}
"bandwidth": { }
"guaranteed-bw-percent": 100
} }
}
] ]
}
} }
}
}
}
]
}
},
{
"site-id": "site_POP",
"management": {
"type": "ietf-l3vpn-svc:provider-managed"
},
"locations": {
"location": [
{
"location-id": "POP"
}
]
},
"devices": {
"device": [
{
"device-id": "172.10.33.5",
"location": "POP"
}
]
},
"routing-protocols": {
"routing-protocol": [
{
"type": "ietf-l3vpn-svc:static",
"static": {
"cascaded-lan-prefixes": {
"ipv4-lan-prefixes": [
{
"lan": "172.1.101.1/24",
"lan-tag": "vlan101",
"next-hop": "172.10.33.2"
}
]
}
}
}
]
},
"site-network-accesses": {
"site-network-access": [
{
"site-network-access-id": "500",
"site-network-access-type": "ietf-l3vpn-svc:multipoint",
"device-reference": "172.10.33.5",
"vpn-attachment": {
"vpn-id": "vpn1",
"site-role": "ietf-l3vpn-svc:hub-role"
}, },
"ip-connection": { {
"ipv4": { "site-id": "site_DC2",
"address-allocation-type": "ietf-l3vpn-svc:static-address", "management": {"type": "ietf-l3vpn-svc:provider-managed"},
"addresses": { "locations": {"location": [{"location-id": "DC2"}]},
"provider-address": "172.10.33.254", "devices": {"device": [{"device-id": "dc2", "location": "DC2"}]},
"customer-address": "172.10.33.2", "site-network-accesses": {
"prefix-length": 24 "site-network-access": [
}
}
},
"routing-protocols": {
"routing-protocol": [
{
"type": "ietf-l3vpn-svc:static",
"static": {
"cascaded-lan-prefixes": {
"ipv4-lan-prefixes": [
{
"lan": "128.32.10.1/24",
"lan-tag": "vlan101",
"next-hop": "172.10.33.254"
},
{ {
"lan": "128.32.20.1/24", "site-network-access-id": "int",
"lan-tag": "vlan101", "site-network-access-type": "ietf-l3vpn-svc:multipoint",
"next-hop": "172.10.33.254" "device-reference": "dc2",
} "vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:hub-role"},
] "ip-connection": {
} "ipv4": {
} "address-allocation-type": "ietf-l3vpn-svc:static-address",
} "addresses": {
] "provider-address": "192.168.2.1",
}, "customer-address": "192.168.2.10",
"service": { "prefix-length": 24
"svc-mtu": 1500, }
"svc-input-bandwidth": 1000000000, }
"svc-output-bandwidth": 1000000000, },
"qos": { "service": {
"qos-profile": { "svc-mtu": 1500,
"classes": { "svc-input-bandwidth": 1000000000,
"class": [ "svc-output-bandwidth": 1000000000,
{ "qos": {"qos-profile": {"classes": {"class": [{
"class-id": "qos-realtime", "class-id": "qos-realtime",
"direction": "ietf-l3vpn-svc:both", "direction": "ietf-l3vpn-svc:both",
"latency": { "latency": {"latency-boundary": 10},
"latency-boundary": 10 "bandwidth": {"guaranteed-bw-percent": 100}
}, }]}}}
"bandwidth": { }
"guaranteed-bw-percent": 100
} }
}
] ]
}
} }
}
} }
}
] ]
}
} }
]
} }
} }
}
\ No newline at end of file
src/tests/eucnc24/data/tfs-service.json
+ 1
− 1
View file @ 1f7b5225
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"services": [ "services": [
{ {
"service_id": { "service_id": {
"context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "dc1-2-dc2-l3svc"} "context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "tfs-l3vpn-svc"}
}, },
"service_type": "SERVICETYPE_L3NM", "service_type": "SERVICETYPE_L3NM",
"service_status": {"service_status": "SERVICESTATUS_PLANNED"}, "service_status": {"service_status": "SERVICESTATUS_PLANNED"},
......
src/tests/eucnc24/tests/test_functional_service_tfs.py
+ 9
− 10
View file @ 1f7b5225
...@@ -98,19 +98,18 @@ def test_service_tfs_removal( ...@@ -98,19 +98,18 @@ def test_service_tfs_removal(
for service in response.services: for service in response.services:
service_id = service.service_id service_id = service.service_id
assert service.service_status.service_status == ServiceStatusEnum.SERVICESTATUS_ACTIVE assert service.service_status.service_status == ServiceStatusEnum.SERVICESTATUS_ACTIVE
assert service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM
response = context_client.ListConnections(service_id) response = context_client.ListConnections(service_id)
LOGGER.warning(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format( LOGGER.warning(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
grpc_message_to_json_string(service_id), len(response.connections), grpc_message_to_json_string(response))) grpc_message_to_json_string(service_id), len(response.connections),
grpc_message_to_json_string(response)
if service.service_type == ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY: ))
assert len(response.connections) == 2 assert len(response.connections) == 1
context_uuid = service_id.context_id.context_uuid.uuid
service_uuid = service_id.service_uuid.uuid context_uuid = service_id.context_id.context_uuid.uuid
context_service_uuids.add((context_uuid, service_uuid)) service_uuid = service_id.service_uuid.uuid
else: context_service_uuids.add((context_uuid, service_uuid))
str_service = grpc_message_to_json_string(service)
raise Exception('Unexpected ServiceType: {:s}'.format(str_service))
# Identify service to delete # Identify service to delete
assert len(context_service_uuids) == 1 assert len(context_service_uuids) == 1
......
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