Skip to content

Fix drivenets default node services and interface count #683

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

Open
msupinodn wants to merge 3 commits into
base: main
Choose a base branch
from
+35 −23
Open

Fix drivenets default node services and interface count #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ac78a4
Fix DriveNets default node services and interface count
msupinodn Mar 18, 2026
5e376cf
retrigger CI
msupinodn Mar 24, 2026
5062611
Fix CI lint: upgrade golangci-lint v1->v2 and migrate config
msupinodn Apr 12, 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
34 changes: 19 additions & 15 deletions .github/linters/.golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
version: "2"

#########################
#########################
## Golang Linter rules ##
Expand All @@ -10,6 +12,7 @@
run:
timeout: 10m
issues:
new-from-rev: origin/main
exclude-rules:
- path: _test\.go
linters:
Expand All @@ -27,26 +30,27 @@ linters:
enable:
- gosec
- unconvert
- goimports
- gofmt
- gocritic
- govet
- revive
- staticcheck
- unconvert
- unparam
- unused
- wastedassign
- whitespace
linters-settings:
errcheck:
# report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
# default is false: such cases aren't reported by default.
check-blank: true
gocritic:
disabled-checks:
- singleCaseSwitch
- appendAssign
revive:
ignore-generated-header: true
severity: warning
settings:
errcheck:
# report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
# default is false: such cases aren't reported by default.
check-blank: true
gocritic:
disabled-checks:
- singleCaseSwitch
- appendAssign
revive:
ignore-generated-header: true
severity: warning
formatters:
enable:
- gofmt
- goimports
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
go:
uses: openconfig/common-ci/.github/workflows/go.yml@v0.2.0
uses: openconfig/common-ci/.github/workflows/go.yml@v0.3.0
with:
coverage-excludes-regex: /cloudbuild
tests-excludes-regex: /cloudbuild
Expand All @@ -18,4 +18,4 @@ jobs:
go-versions: "['1.21']"

linter:
uses: openconfig/common-ci/.github/workflows/linter.yml@v0.2.0
uses: openconfig/common-ci/.github/workflows/linter.yml@v0.3.0
20 changes: 14 additions & 6 deletions topo/node/drivenets/drivenets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,24 @@ var (
// https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=gnmi
22: {
Names: []string{"ssh"},
Inside: 9339,
Inside: 22,
},
830: {
Names: []string{"netconf"},
Inside: 830,
},
50051: {
Names: []string{"gnmi"},
Names: []string{"grpc"},
Inside: 50051,
},
51337: {
Names: []string{"gnmi"},
Inside: 51337,
},
52443: {
Names: []string{"gnmi-ssl"},
Inside: 52443,
},
},
Config: &tpb.Config{
ConfigFile: "default",
Expand Down Expand Up @@ -121,7 +129,7 @@ var clientFn = func(c *rest.Config) (clientset.Interface, error) {
}

func (n *Node) Create(ctx context.Context) error {
if n.Impl.Proto.Model != modelCdnos {
if n.Proto.Model != modelCdnos {
return fmt.Errorf("cannot create an instance of an unknown model")
}
return n.cdnosCreate(ctx)
Expand Down Expand Up @@ -171,7 +179,7 @@ func (n *Node) cdnosCreate(ctx context.Context) error {
ConfigFile: config.ConfigFile,
InitImage: config.InitImage,
Ports: ports,
InterfaceCount: len(nodeSpec.Interfaces),
InterfaceCount: len(nodeSpec.Interfaces) + 1,
InitSleep: int(config.Sleep),
Resources: node.ToResourceRequirements(nodeSpec.Constraints),
Labels: nodeSpec.Labels,
Expand Down Expand Up @@ -200,7 +208,7 @@ func (n *Node) cdnosCreate(ctx context.Context) error {
}

func (n *Node) Status(ctx context.Context) (node.Status, error) {
if n.Impl.Proto.Model != modelCdnos {
if n.Proto.Model != modelCdnos {
return node.StatusUnknown, fmt.Errorf("invalid model specified")
}
return n.cdnosStatus(ctx)
Expand Down Expand Up @@ -228,7 +236,7 @@ func (n *Node) cdnosStatus(ctx context.Context) (node.Status, error) {
}

func (n *Node) Delete(ctx context.Context) error {
if n.Impl.Proto.Model != modelCdnos {
if n.Proto.Model != modelCdnos {
return fmt.Errorf("unknown model")
}
return n.cdnosDelete(ctx)
Expand Down
Loading