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.

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

Jump to bottom

Fix GetNSPath for ignite #2000

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Fix GetNSPath for ignite #2000

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c19ddf
Fix GetNSPath for ignite
robertvolkmann Apr 18, 2024
5b9cafd
address deepsource
hellt Apr 19, 2024
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
23 changes: 13 additions & 10 deletions runtime/ignite/ignite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ import (
"time"

log "github.com/sirupsen/logrus"
"github.com/srl-labs/containerlab/clab/exec"
"github.com/srl-labs/containerlab/runtime"
"github.com/srl-labs/containerlab/types"
"github.com/srl-labs/containerlab/utils"
api "github.com/weaveworks/ignite/pkg/apis/ignite"
meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
igniteConstants "github.com/weaveworks/ignite/pkg/constants"
Expand All @@ -25,6 +21,11 @@ import (
"github.com/weaveworks/ignite/pkg/providers/ignite"
igniteRuntimes "github.com/weaveworks/ignite/pkg/runtime"
"github.com/weaveworks/ignite/pkg/util"

"github.com/srl-labs/containerlab/clab/exec"
"github.com/srl-labs/containerlab/runtime"
"github.com/srl-labs/containerlab/types"
"github.com/srl-labs/containerlab/utils"
)

const (
Expand Down Expand Up @@ -153,6 +154,8 @@ func (*IgniteRuntime) PullImage(_ context.Context, imageName string, _ types.Pul
return nil
}

// StartContainer starts a container with the provided node configuration.
// skipcq: GO-R1005
func (c *IgniteRuntime) StartContainer(ctx context.Context, _ string, node runtime.Node) (interface{}, error) {
vm := c.baseVM.DeepCopy()

Expand Down Expand Up @@ -224,7 +227,7 @@ func (c *IgniteRuntime) StartContainer(ctx context.Context, _ string, node runti
}
defer os.Remove(udevFile.Name())

if _, err := udevFile.Write([]byte(strings.Join(udevRules, "\n") + "\n")); err != nil {
if _, err := udevFile.WriteString(strings.Join(udevRules, "\n") + "\n"); err != nil {
return nil, err
}
if err := udevFile.Close(); err != nil {
Expand Down Expand Up @@ -264,7 +267,7 @@ func (c *IgniteRuntime) StartContainer(ctx context.Context, _ string, node runti
return nil, err
}

nspath, err := c.GetNSPath(ctx, vm.PrefixedID())
nspath, err := c.ctrRuntime.GetNSPath(ctx, vm.PrefixedID())
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -396,12 +399,12 @@ func (ir *IgniteRuntime) produceGenericContainerList(input []*api.VM) ([]runtime
return result, nil
}

func (c *IgniteRuntime) GetNSPath(ctx context.Context, ctrId string) (string, error) {
result, err := c.ctrRuntime.GetNSPath(ctx, ctrId)
func (c *IgniteRuntime) GetNSPath(ctx context.Context, vmName string) (string, error) {
vm, err := providers.Client.VMs().Find(filter.NewVMFilter(vmName))
if err != nil {
return "", err
}
return result, nil
return c.ctrRuntime.GetNSPath(ctx, vm.PrefixedID())
}

func (*IgniteRuntime) Exec(_ context.Context, _ string, _ *exec.ExecCmd) (*exec.ExecResult, error) {
Expand Down Expand Up @@ -464,7 +467,7 @@ func (*IgniteRuntime) GetContainerStatus(_ context.Context, containerID string)
}

// IsHealthy returns true is the container is reported as being healthy, false otherwise.
func (c *IgniteRuntime) IsHealthy(_ context.Context, _ string) (bool, error) {
func (*IgniteRuntime) IsHealthy(_ context.Context, _ string) (bool, error) {
log.Errorf("function GetContainerHealth(...) not implemented in the Containerlab IgniteRuntime")
return true, nil
}
Loading