Skip to content

Commit

Permalink
Pass context from caller to ocicni
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Cambria <mcambria@redhat.com>
  • Loading branch information
mccv1r0 authored and haircommander committed Apr 24, 2020
1 parent 52c072a commit 40fd3a2
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 4 deletions.
6 changes: 3 additions & 3 deletions server/sandbox_network.go
Expand Up @@ -41,7 +41,7 @@ func (s *Server) networkStart(ctx context.Context, sb *sandbox.Sandbox) (podIPs
}()

podSetUpStart := time.Now()
_, err = s.netPlugin.SetUpPod(podNetwork)
_, err = s.netPlugin.SetUpPodWithContext(ctx, podNetwork)
if err != nil {
err = fmt.Errorf("failed to create pod network sandbox %s(%s): %v", sb.Name(), sb.ID(), err)
return
Expand All @@ -50,7 +50,7 @@ func (s *Server) networkStart(ctx context.Context, sb *sandbox.Sandbox) (podIPs
metrics.CRIOOperationsLatency.WithLabelValues("network_setup_pod").
Observe(metrics.SinceInMicroseconds(podSetUpStart))

tmp, err := s.netPlugin.GetPodNetworkStatus(podNetwork)
tmp, err := s.netPlugin.GetPodNetworkStatusWithContext(ctx, podNetwork)
if err != nil {
err = fmt.Errorf("failed to get network status for pod sandbox %s(%s): %v", sb.Name(), sb.ID(), err)
return
Expand Down Expand Up @@ -148,7 +148,7 @@ func (s *Server) networkStop(ctx context.Context, sb *sandbox.Sandbox) error {
if err != nil {
return err
}
if err := s.netPlugin.TearDownPod(podNetwork); err != nil {
if err := s.netPlugin.TearDownPodWithContext(ctx, podNetwork); err != nil {
return errors.Wrapf(err, "failed to destroy network for pod sandbox %s(%s)", sb.Name(), sb.ID())
}

Expand Down
2 changes: 1 addition & 1 deletion server/sandbox_stop_test.go
Expand Up @@ -51,7 +51,7 @@ var _ = t.Describe("PodSandboxStatus", func() {
addContainerAndSandbox()
gomock.InOrder(
cniPluginMock.EXPECT().GetDefaultNetworkName().Return(""),
cniPluginMock.EXPECT().TearDownPod(gomock.Any()).Return(t.TestError),
cniPluginMock.EXPECT().TearDownPodWithContext(context.Background(), gomock.Any()).Return(t.TestError),
)

// When
Expand Down
45 changes: 45 additions & 0 deletions test/mocks/ocicni/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 40fd3a2

Please sign in to comment.