drop non required sysctl; streamline method name

srl-labs · Jun 14, 2021 · 0e48e7c · 0e48e7c
1 parent d89e783
commit 0e48e7c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/clab/srl.go b/clab/srl.go
@@ -107,7 +107,6 @@ func initSRLNode(c *CLab, nodeCfg NodeConfig, node *types.Node, user string, env
 	node.Sysctls["net.ipv6.conf.default.accept_dad"] = "0"
 	node.Sysctls["net.ipv6.conf.all.autoconf"] = "0"
 	node.Sysctls["net.ipv6.conf.default.autoconf"] = "0"
-	node.Sysctls["net.ipv4.ip_unprivileged_port_start"] = "0"
 
 	// we mount a fixed path node.Labdir/license.key as the license referenced in topo file will be copied to that path
 	// in (c *cLab) CreateNodeDirStructure

diff --git a/runtime/containerd/containerd.go b/runtime/containerd/containerd.go
@@ -474,7 +474,7 @@ func (c *ContainerdRuntime) ListContainers(ctx context.Context, filter []*types.
 	ctx = namespaces.WithNamespace(ctx, containerdNamespace)
 	// TODO add containerlab label as filter criteria
 
-	filterstring := c.filterStringBuilder(filter)
+	filterstring := c.buildFilterString(filter)
 
 	containerlist, err := c.client.Containers(ctx, filterstring)
 	if err != nil {
@@ -484,7 +484,7 @@ func (c *ContainerdRuntime) ListContainers(ctx context.Context, filter []*types.
 	return c.produceGenericContainerList(ctx, containerlist)
 }
 
-func (c *ContainerdRuntime) filterStringBuilder(filter []*types.GenericFilter) string {
+func (c *ContainerdRuntime) buildFilterString(filter []*types.GenericFilter) string {
 	filterstring := ""
 	delim := ""
 	for _, filterEntry := range filter {

diff --git a/runtime/docker/docker.go b/runtime/docker/docker.go
@@ -299,7 +299,6 @@ func (c *DockerRuntime) PullImageIfRequired(ctx context.Context, imageName strin
 		return nil
 	}
 
-
 	canonicalImageName := utils.GetCanonicalImageName(imageName)
 	log.Infof("Pulling %s Docker image", canonicalImageName)
 	reader, err := c.Client.ImagePull(ctx, canonicalImageName, dockerTypes.ImagePullOptions{})
@@ -331,7 +330,7 @@ func (c *DockerRuntime) StartContainer(ctx context.Context, id string) error {
 func (c *DockerRuntime) ListContainers(ctx context.Context, gfilters []*types.GenericFilter) ([]types.GenericContainer, error) {
 	ctx, cancel := context.WithTimeout(ctx, c.timeout)
 	defer cancel()
-	filter := c.containerFilterBuilder(gfilters)
+	filter := c.buildFilterString(gfilters)
 	ctrs, err := c.Client.ContainerList(ctx, dockerTypes.ContainerListOptions{
 		All:     true,
 		Filters: filter,
@@ -356,7 +355,7 @@ func (c *DockerRuntime) ListContainers(ctx context.Context, gfilters []*types.Ge
 	return c.produceGenericContainerList(ctrs, nr)
 }
 
-func (c *DockerRuntime) containerFilterBuilder(gfilters []*types.GenericFilter) filters.Args {
+func (c *DockerRuntime) buildFilterString(gfilters []*types.GenericFilter) filters.Args {
 	filter := filters.NewArgs()
 	for _, filterentry := range gfilters {
 		filterstring := filterentry.Field