Skip to content

Commit e628ce1

Browse files
committed
rebase complete
Signed-off-by: Plamen Petrov <[email protected]>
1 parent 052bc14 commit e628ce1

File tree

7 files changed

+174
-1028
lines changed

7 files changed

+174
-1028
lines changed

_submodules/runc

Submodule runc updated 629 files

firecracker-control/service.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ func (s *service) CreateVM(ctx context.Context, req *proto.CreateVMRequest) (*pr
7272
return s.local.CreateVM(ctx, req)
7373
}
7474

75+
func (s *service) PauseVM(ctx context.Context, req *proto.PauseVMRequest) (*empty.Empty, error) {
76+
log.G(ctx).Debugf("pause VM request: %+v", req)
77+
return s.local.PauseVM(ctx, req)
78+
}
79+
80+
func (s *service) ResumeVM(ctx context.Context, req *proto.ResumeVMRequest) (*empty.Empty, error) {
81+
log.G(ctx).Debugf("resume VM request: %+v", req)
82+
return s.local.ResumeVM(ctx, req)
83+
}
84+
7585
func (s *service) StopVM(ctx context.Context, req *proto.StopVMRequest) (*empty.Empty, error) {
7686
log.G(ctx).Debugf("stop VM: %+v", req)
7787
return s.local.StopVM(ctx, req)

go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module github.com/firecracker-microvm/firecracker-containerd
22

33
require (
4-
github.com/Microsoft/go-winio v0.4.14 // indirect
54
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
65
github.com/awslabs/tc-redirect-tap v0.0.0-20200708224642-a0300978797d
76
github.com/containerd/containerd v1.5.2
@@ -13,22 +12,20 @@ require (
1312
github.com/containernetworking/plugins v0.9.1
1413
github.com/firecracker-microvm/firecracker-go-sdk v0.22.1-0.20210520223842-abd0815b8bf9
1514
github.com/go-ole/go-ole v1.2.4 // indirect
16-
github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384 // indirect
1715
github.com/gofrs/uuid v3.3.0+incompatible
1816
github.com/gogo/protobuf v1.3.2
1917
github.com/golang/protobuf v1.4.3
2018
github.com/hashicorp/go-multierror v1.1.0
21-
github.com/imdario/mergo v0.3.8 // indirect
2219
github.com/mdlayher/vsock v0.0.0-20190329173812-a92c53d5dcab
2320
github.com/miekg/dns v1.1.16
2421
github.com/opencontainers/runc v1.0.0-rc93
2522
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
2623
github.com/pkg/errors v0.9.1
27-
github.com/prometheus/client_golang v0.9.2 // indirect
2824
github.com/shirou/gopsutil v2.18.12+incompatible
2925
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
3026
github.com/sirupsen/logrus v1.8.0
3127
github.com/stretchr/testify v1.6.1
28+
github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c
3229
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
3330
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
3431
golang.org/x/sys v0.0.0-20210324051608-47abb6519492

go.sum

Lines changed: 2 additions & 344 deletions
Large diffs are not rendered by default.

proto/firecracker.pb.go

Lines changed: 79 additions & 391 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/service/fccontrol/fccontrol.proto

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ service Firecracker {
1010
// Runs new Firecracker VM instance
1111
rpc CreateVM(CreateVMRequest) returns (CreateVMResponse);
1212

13+
// Pauses a VM
14+
rpc PauseVM(PauseVMRequest) returns (google.protobuf.Empty);
15+
16+
// Resumes a VM
17+
rpc ResumeVM(ResumeVMRequest) returns (google.protobuf.Empty);
18+
1319
// Stops existing Firecracker instance by VM ID
1420
rpc StopVM(StopVMRequest) returns (google.protobuf.Empty);
1521

proto/service/fccontrol/ttrpc/fccontrol.pb.go

Lines changed: 75 additions & 288 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)