Skip to content
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.

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

small fixes #158

Merged
merged 4 commits into from
Nov 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 2 additions & 8 deletions clab/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var srlTypes = map[string]string{
// mgmtNet struct defines the management network options
// it is provided via docker network object
type mgmtNet struct {
Network string // docker network name
Network string `yaml:"network,omitempty"` // docker network name
Ipv4Subnet string `yaml:"ipv4_subnet,omitempty"`
Ipv6Subnet string `yaml:"ipv6_subnet,omitempty"`
}
Expand Down Expand Up @@ -77,12 +77,6 @@ type Config struct {
ConfigPath string `yaml:"config_path,omitempty"`
}

type volume struct {
Source string
Destination string
ReadOnly bool
}

// Node is a struct that contains the information of a container element
type Node struct {
ShortName string
Expand Down Expand Up @@ -480,7 +474,7 @@ func (c *cLab) VerifyBridgesExist() error {
for name, node := range c.Nodes {
if node.Kind == "bridge" {
if _, err := netlink.LinkByName(name); err != nil {
return fmt.Errorf("Bridge %s is referenced in the endpoints section but was not found in the default network namespace", name)
return fmt.Errorf("fridge %s is referenced in the endpoints section but was not found in the default network namespace", name)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion clab/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func (c *cLab) CreateBridge(ctx context.Context) (err error) {
log.Debugf("Disabling TX checksum offloading for the %s bridge interface...", bridgeName)
err = EthtoolTXOff(bridgeName)
if err != nil {
return fmt.Errorf("Failed to disable TX checksum offloading for the %s bridge interface: %v", bridgeName, err)
return fmt.Errorf("failed to disable TX checksum offloading for the %s bridge interface: %v", bridgeName, err)
}
return nil
}
Expand Down
49 changes: 0 additions & 49 deletions cmd/config.go

This file was deleted.