-
Notifications
You must be signed in to change notification settings - Fork 33
Fix wrong subnet in use existing VM flow #314
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.
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
Open
AmitSahastra
wants to merge
1
commit into
spectro-master
Choose a base branch
from
fix_maas_wrong_subnet
base: spectro-master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 |
|---|---|---|
|
|
@@ -286,6 +286,11 @@ func (s *Service) createVMViaMAAS(ctx context.Context, userDataB64 string) (*inf | |
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to get existing VM by system-id") | ||
| } | ||
| // Verify and fix network interfaces (eth0/eth1 subnets) before deploy so that even if MAAS | ||
| // selected the wrong subnet for eth0 after commissioning/acquire, we correct it before deploy. | ||
| if err := s.VerifyVMNetworkInterfaces(ctx, m.SystemID()); err != nil { | ||
| return nil, errors.Wrap(err, "failed to verify VM network interfaces before deploy") | ||
| } | ||
| // Best-effort: set hostname and static IP before deploy | ||
| machineName := s.scope.Machine.Name | ||
| vmName := fmt.Sprintf("vm-%s", machineName) | ||
|
|
@@ -667,9 +672,27 @@ func (s *Service) VerifyVMNetworkInterfaces(ctx context.Context, systemID string | |
| } | ||
| } | ||
|
|
||
| // subnetsMatch returns true if actual and expected represent the same subnet (CIDR or name). | ||
| subnetsMatch := func(actual, expected string) bool { | ||
| if actual == "" || expected == "" { | ||
| return false | ||
| } | ||
| if strings.EqualFold(actual, expected) { | ||
| return true | ||
| } | ||
| // If both parse as CIDR, compare by network equality (robust to formatting) | ||
| _, actualNet, err1 := net.ParseCIDR(actual) | ||
| _, expectedNet, err2 := net.ParseCIDR(expected) | ||
| if err1 == nil && err2 == nil && actualNet != nil && expectedNet != nil { | ||
| return actualNet.IP.Equal(expectedNet.IP) && actualNet.Mask != nil && expectedNet.Mask != nil && | ||
| string(actualNet.Mask) == string(expectedNet.Mask) | ||
|
Comment on lines
+687
to
+688
|
||
| } | ||
| return false | ||
| } | ||
|
|
||
| var aggErr error | ||
| if eth0Iface != nil { | ||
| if eth0Subnet == "" || !strings.EqualFold(eth0Subnet, expected0) { | ||
| if eth0Subnet == "" || !subnetsMatch(eth0Subnet, expected0) { | ||
| s.scope.Info("Fixing eth0 subnet mismatch", "system-id", systemID, "expected", expected0, "actual", eth0Subnet) | ||
| if err := s.fixInterfaceSubnet(ctx, systemID, eth0Iface, expected0, "eth0"); err != nil { | ||
| s.scope.Error(err, "Failed to fix eth0 subnet", "system-id", systemID, "expected", expected0, "actual", eth0Subnet) | ||
|
|
@@ -685,7 +708,7 @@ func (s *Service) VerifyVMNetworkInterfaces(ctx context.Context, systemID string | |
| } | ||
|
|
||
| if eth1Iface != nil { | ||
| if eth1Subnet == "" || !strings.EqualFold(eth1Subnet, expected1) { | ||
| if eth1Subnet == "" || !subnetsMatch(eth1Subnet, expected1) { | ||
| s.scope.Info("Fixing eth1 subnet mismatch", "system-id", systemID, "expected", expected1, "actual", eth1Subnet) | ||
| if err := s.fixInterfaceSubnet(ctx, systemID, eth1Iface, expected1, "eth1"); err != nil { | ||
| s.scope.Error(err, "Failed to fix eth1 subnet", "system-id", systemID, "expected", expected1, "actual", eth1Subnet) | ||
|
|
||
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.
The date format in this version string appears to be "19022026" which could be interpreted as February 19, 2026 (ddmmyyyy format). According to the system information, the current date is February 20, 2026, so this date would be yesterday. However, if this is intended to be a date in the past or a specific versioning convention, please ensure it's intentional. If it's meant to be today's date, it should be updated to "20022026".