Skip to content

Commit abd0e6d

Browse files
committed
firecracker: stop sending network_overrides on snapshot load
1 parent 62a391d commit abd0e6d

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

lib/hypervisor/firecracker/config.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,10 @@ type snapshotCreateParams struct {
6767
}
6868

6969
type snapshotLoadParams struct {
70-
MemFilePath string `json:"mem_file_path,omitempty"`
71-
SnapshotPath string `json:"snapshot_path"`
72-
EnableDiffSnapshots bool `json:"enable_diff_snapshots,omitempty"`
73-
ResumeVM bool `json:"resume_vm,omitempty"`
74-
NetworkOverrides []networkOverride `json:"network_overrides,omitempty"`
70+
MemFilePath string `json:"mem_file_path,omitempty"`
71+
SnapshotPath string `json:"snapshot_path"`
72+
EnableDiffSnapshots bool `json:"enable_diff_snapshots,omitempty"`
73+
ResumeVM bool `json:"resume_vm,omitempty"`
7574
}
7675

7776
type networkOverride struct {
@@ -187,13 +186,12 @@ func toSnapshotCreateParams(snapshotDir string) snapshotCreateParams {
187186
}
188187
}
189188

190-
func toSnapshotLoadParams(snapshotDir string, networkOverrides []networkOverride) snapshotLoadParams {
189+
func toSnapshotLoadParams(snapshotDir string, _ []networkOverride) snapshotLoadParams {
191190
return snapshotLoadParams{
192191
MemFilePath: snapshotMemoryPath(snapshotDir),
193192
SnapshotPath: snapshotStatePath(snapshotDir),
194193
EnableDiffSnapshots: true,
195194
ResumeVM: false,
196-
NetworkOverrides: networkOverrides,
197195
}
198196
}
199197

lib/hypervisor/firecracker/config_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package firecracker
22

33
import (
4+
"encoding/json"
45
"testing"
56

67
"github.com/kernel/hypeman/lib/hypervisor"
@@ -71,5 +72,7 @@ func TestSnapshotParamPaths(t *testing.T) {
7172
assert.Equal(t, "/tmp/snapshot-latest/memory", load.MemFilePath)
7273
assert.True(t, load.EnableDiffSnapshots)
7374
assert.False(t, load.ResumeVM)
74-
require.Len(t, load.NetworkOverrides, 1)
75+
loadJSON, err := json.Marshal(load)
76+
require.NoError(t, err)
77+
assert.NotContains(t, string(loadJSON), "network_overrides")
7578
}

0 commit comments

Comments
 (0)