Display network information of checkpoints created with Podman #162
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -116,7 +116,11 @@ func (ic *ImageBuilder) getCheckpointAnnotations() (map[string]string, error) { | |
| return nil, err | ||
| } | ||
|
|
||
| task := Task{ | ||
| OutputDir: tempDir, | ||
| CheckpointFilePath: ic.checkpointPath, | ||
| } | ||
| info.containerInfo, err = getContainerInfo(info.specDump, info.configDump, task) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package internal | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "os" | ||
| ) | ||
|
|
||
| // PodmanNetworkStatus represents the network status structure for Podman | ||
| type PodmanNetworkStatus struct { | ||
| Podman struct { | ||
| Interfaces map[string]struct { | ||
| Subnets []struct { | ||
| IPNet string `json:"ipnet"` | ||
| Gateway string `json:"gateway"` | ||
| } `json:"subnets"` | ||
| MacAddress string `json:"mac_address"` | ||
| } `json:"interfaces"` | ||
| } `json:"podman"` | ||
| } | ||
|
|
||
| // getPodmanNetworkInfo reads and parses the network.status file from a Podman checkpoint | ||
| func getPodmanNetworkInfo(networkStatusFile string) (string, string, error) { | ||
| data, err := os.ReadFile(networkStatusFile) | ||
| if err != nil { | ||
| // Return empty strings if file doesn't exist or can't be read | ||
| // This maintains compatibility with containers that don't have network info | ||
| return "", "", nil | ||
| } | ||
|
|
||
| var status PodmanNetworkStatus | ||
| if err := json.Unmarshal(data, &status); err != nil { | ||
| return "", "", fmt.Errorf("failed to parse network status: %w", err) | ||
| } | ||
|
|
||
| // Get the first interface's information | ||
| // Most containers will have a single interface (eth0) | ||
| for _, info := range status.Podman.Interfaces { | ||
| if len(info.Subnets) > 0 { | ||
| return info.Subnets[0].IPNet, info.MacAddress, nil | ||
| } | ||
| } | ||
|
|
||
| return "", "", nil | ||
| } | ||
|
There was a problem hiding this comment. Please add a newline at the end of the file :) |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| package internal | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| metadata "github.com/checkpoint-restore/checkpointctl/lib" | ||
| ) | ||
|
|
||
| func TestGetPodmanNetworkInfo(t *testing.T) { | ||
| // Test case 1: Valid network status file | ||
| networkStatus := `{ | ||
| "podman": { | ||
| "interfaces": { | ||
| "eth0": { | ||
| "subnets": [ | ||
| { | ||
| "ipnet": "10.88.0.9/16", | ||
| "gateway": "10.88.0.1" | ||
| } | ||
| ], | ||
| "mac_address": "f2:99:8d:fb:5a:57" | ||
| } | ||
| } | ||
| } | ||
| }` | ||
|
|
||
| networkStatusFile := filepath.Join(t.TempDir(), metadata.NetworkStatusFile) | ||
| if err := os.WriteFile(networkStatusFile, []byte(networkStatus), 0644); err != nil { | ||
| t.Fatalf("Failed to write test file: %v", err) | ||
| } | ||
|
|
||
| ip, mac, err := getPodmanNetworkInfo(networkStatusFile) | ||
| if err != nil { | ||
| t.Errorf("getPodmanNetworkInfo failed: %v", err) | ||
| } | ||
|
|
||
| expectedIP := "10.88.0.9/16" | ||
| expectedMAC := "f2:99:8d:fb:5a:57" | ||
|
|
||
| if ip != expectedIP { | ||
| t.Errorf("Expected IP %s, got %s", expectedIP, ip) | ||
| } | ||
| if mac != expectedMAC { | ||
| t.Errorf("Expected MAC %s, got %s", expectedMAC, mac) | ||
| } | ||
|
|
||
| // Test case 2: Missing network status file | ||
| nonExistentFile := filepath.Join(t.TempDir(), metadata.NetworkStatusFile) | ||
| ip, mac, err = getPodmanNetworkInfo(nonExistentFile) | ||
| if err != nil { | ||
| t.Errorf("getPodmanNetworkInfo with missing file should not return error, got: %v", err) | ||
| } | ||
| if ip != "" || mac != "" { | ||
| t.Errorf("Expected empty IP and MAC for missing file, got IP=%s, MAC=%s", ip, mac) | ||
| } | ||
|
|
||
| // Test case 3: Invalid JSON | ||
| invalidJSONFile := filepath.Join(t.TempDir(), metadata.NetworkStatusFile) | ||
| if err := os.WriteFile(invalidJSONFile, []byte("invalid json"), 0644); err != nil { | ||
| t.Fatalf("Failed to write test file: %v", err) | ||
| } | ||
|
|
||
| ip, mac, err = getPodmanNetworkInfo(invalidJSONFile) | ||
| if err == nil { | ||
| t.Error("getPodmanNetworkInfo should fail with invalid JSON") | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Please add a newline at the end of the file :) |
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We would like to return the error here (possible wrapped with some context)