Skip to content

Fix sros ports #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FloSch62 merged 2 commits into from
Jul 10, 2026
Merged

Fix sros ports #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7d12d1
Fix sros port caging and respect grouping
FloSch62 Jul 10, 2026
b995dd7
bump version
FloSch62 Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ PROJECT_TARGETS += dev
PROJECT_TARGETS += dev-cluster
PROJECT_TARGETS += preview
PROJECT_TARGETS += lint
PROJECT_TARGETS += ui-test
PROJECT_TARGETS += frontpanel-labels-check
PROJECT_TARGETS += ts-contract
PROJECT_TARGETS += ts-contract-check
PROJECT_TARGETS += ui-build
Expand Down Expand Up @@ -65,6 +67,16 @@ HELP_lint := Run frontend lint checks
lint:
$(FRONTEND) lint

.PHONY: ui-test
HELP_ui-test := Run frontend unit tests
ui-test:
$(FRONTEND) test

.PHONY: frontpanel-labels-check
HELP_frontpanel-labels-check := Fail if generated front-panel silkscreen labels are stale
frontpanel-labels-check:
$(FRONTEND) check:frontpanel-labels

TYGO ?= github.com/gzuidhof/tygo@v0.2.21

.PHONY: ts-contract
Expand Down Expand Up @@ -119,7 +131,7 @@ deploy-local:

.PHONY: check
HELP_check := Run lint, the contract-drift guard, Go tests, and a full embedded binary build
check: lint ts-contract-check test build
check: lint ui-test frontpanel-labels-check ts-contract-check test build

.PHONY: clean
HELP_clean := Remove generated frontend, embedded frontend, and operator build output
Expand Down
176 changes: 176 additions & 0 deletions cable_map/frontend/dev/fixtures/mixed-sros-topology.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,15 @@
"type": "interSwitch",
"lldpStatus": "ok",
"lldpPeer": "mix-sros-sr2se-m36-mse24 1/1/c1/1"
},
{
"label": "ethernet-1-25",
"desc": "dcgw fabric",
"remoteNode": "pod1",
"remotePort": "1/1/c1/1",
"type": "interSwitch",
"lldpStatus": "ok",
"lldpPeer": "pod1 1/1/c1/1"
}
],
"raw": {
Expand Down Expand Up @@ -1082,6 +1091,160 @@
}
}
},
{
"name": "pod1",
"platform": "7750 SR-1s",
"os": "sros",
"role": "dcgw",
"tier": 4,
"namespace": "dev-mixed-sros",
"version": "dev-mixed-sros",
"labels": {
"eda.nokia.com/role": "dcgw",
"eda.nokia.com/os": "sros",
"eda.nokia.com/dev-fixture": "mixed-sros",
"eda.nokia.com/pod": "pod1",
"eda.nokia.com/fabric-node-group": "dcgw"
},
"table": [
{
"label": "1/1/c1/1",
"desc": "dcgw fabric",
"remoteNode": "mix-spine-srl",
"remotePort": "ethernet-1-25",
"type": "interSwitch",
"lldpStatus": "ok",
"lldpPeer": "mix-spine-srl ethernet-1-25"
}
],
"raw": {
"apiVersion": "core.eda.nokia.com/v1",
"kind": "TopoNode",
"metadata": {
"name": "pod1",
"namespace": "dev-mixed-sros",
"labels": {
"eda.nokia.com/role": "dcgw",
"eda.nokia.com/os": "sros",
"eda.nokia.com/dev-fixture": "mixed-sros",
"eda.nokia.com/pod": "pod1",
"eda.nokia.com/fabric-node-group": "dcgw"
}
},
"spec": {
"platform": "7750 SR-1s",
"operatingSystem": "sros",
"component": [
{
"kind": "lineCard",
"type": "xcm-1s",
"slot": "1"
},
{
"kind": "mda",
"type": "s18-100gb-qsfp28",
"slot": "1-a"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-1"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-2"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-3"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-4"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-5"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-6"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-7"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-8"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-9"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-10"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-11"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-12"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-13"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-14"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-15"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-16"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-17"
},
{
"kind": "connector",
"type": "c1-100g",
"slot": "1-a-18"
}
]
},
"status": {
"platform": "7750 SR-1s",
"operatingSystem": "sros",
"version": "24.7.r1",
"node-state": "connected"
}
}
},
{
"name": "mix-sros-sr1-46s",
"platform": "7750 SR-1",
Expand Down Expand Up @@ -2349,6 +2512,14 @@
"sourcePort": "1/1/c2/1",
"targetPort": "1/1/c22/1",
"type": "interSwitch"
},
{
"id": "mix-pod1-mix-spine-srl-44",
"source": "pod1",
"target": "mix-spine-srl",
"sourcePort": "1/1/c1/1",
"targetPort": "ethernet-1-25",
"type": "interSwitch"
}
],
"lags": {
Expand Down Expand Up @@ -2438,6 +2609,9 @@
"eda.nokia.com/dev-fixture": [
"mixed-sros"
],
"eda.nokia.com/fabric-node-group": [
"dcgw"
],
"eda.nokia.com/os": [
"srl",
"sros"
Expand All @@ -2449,6 +2623,7 @@
"eda.nokia.com/pod": [
"edge",
"pod-00",
"pod1",
"sros-variants"
],
"eda.nokia.com/rack": [
Expand All @@ -2474,6 +2649,7 @@
],
"eda.nokia.com/role": [
"borderleaf",
"dcgw",
"leaf",
"spine",
"superspine"
Expand Down
4 changes: 4 additions & 0 deletions cable_map/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@
"type": "module",
"scripts": {
"dev": "vite",
"test": "vitest run",
"build": "tsc -b && vite build",
"lint": "oxlint .",
"preview": "vite preview",
"gen:frontpanel-labels": "node scripts/gen-frontpanel-labels.mjs",
"check:frontpanel-labels": "node scripts/gen-frontpanel-labels.mjs --check",
"gen:golden-topology": "node scripts/gen-golden-topology.mjs"
},
"devDependencies": {
Expand All @@ -30,6 +33,7 @@
"react-dom": "^19.2.6",
"typescript": "~6.0.2",
"vite": "^8.0.12",
"vitest": "^4.1.10",
"write-excel-file": "^4.1.1"
}
}
Loading
Loading