Skip to content

Add UT for ReconcileVPCSecurityGroups function #2011

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Add UT for ReconcileVPCSecurityGroups function #2011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions cloud/scope/powervs_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,7 @@ func (s *PowerVSClusterScope) ReconcileVPCSecurityGroups() error {
if securityGroup.Name != nil {
securityGroupID, securityGroupRuleIDs, _ = s.GetVPCSecurityGroupByName(*securityGroup.Name)
} else {
_, securityGroupRuleIDs, _ = s.GetVPCSecurityGroupByID(*securityGroup.ID)
securityGroupID, securityGroupRuleIDs, _ = s.GetVPCSecurityGroupByID(*securityGroup.ID)
}

if securityGroupID != nil && securityGroupRuleIDs != nil {
Expand Down Expand Up @@ -1333,7 +1333,7 @@ func (s *PowerVSClusterScope) createVPCSecurityGroupRule(securityGroupID, direct
if err != nil {
return fmt.Errorf("failed to find VPC security group by name '%s', err: %w", *remote.SecurityGroupName, err)
}
if sg.Name != nil {
if sg == nil {
return fmt.Errorf("VPC security group by name '%s' does not exist", *remote.SecurityGroupName)
}
s.V(3).Info("Creating VPC security group rule", "securityGroupID", *securityGroupID, "direction", *direction, "protocol", *protocol, "securityGroup", *remote.SecurityGroupName, "securityGroupCRN", *sg.CRN)
Expand Down Expand Up @@ -1511,10 +1511,6 @@ func (s *PowerVSClusterScope) validateSecurityGroupRule(originalSecurityGroupRul
}

protocol := string(rule.Protocol)
portMin := rule.PortRange.MinimumPort
portMax := rule.PortRange.MaximumPort
icmpCode := rule.ICMPCode
icmpType := rule.ICMPType

for _, ogRuleIntf := range originalSecurityGroupRules {
switch reflect.TypeOf(ogRuleIntf).String() {
Expand All @@ -1531,6 +1527,8 @@ func (s *PowerVSClusterScope) validateSecurityGroupRule(originalSecurityGroupRul
}
}
case "*vpcv1.SecurityGroupRuleSecurityGroupRuleProtocolTcpudp":
portMin := rule.PortRange.MinimumPort
portMax := rule.PortRange.MaximumPort
ogRule := ogRuleIntf.(*vpcv1.SecurityGroupRuleSecurityGroupRuleProtocolTcpudp)
ruleID = ogRule.ID

Expand All @@ -1543,6 +1541,8 @@ func (s *PowerVSClusterScope) validateSecurityGroupRule(originalSecurityGroupRul
}
}
case "*vpcv1.SecurityGroupRuleSecurityGroupRuleProtocolIcmp":
icmpCode := rule.ICMPCode
icmpType := rule.ICMPType
ogRule := ogRuleIntf.(*vpcv1.SecurityGroupRuleSecurityGroupRuleProtocolIcmp)
ruleID = ogRule.ID

Expand Down Expand Up @@ -1624,7 +1624,7 @@ func (s *PowerVSClusterScope) validateVPCSecurityGroup(securityGroup infrav1beta
return nil, nil, nil
}
}
if securityGroupDet != nil && *securityGroupDet.VPC.ID != *s.GetVPCID() {
if securityGroupDet.VPC == nil || securityGroupDet.VPC.ID == nil || *securityGroupDet.VPC.ID != *s.GetVPCID() {
return nil, nil, fmt.Errorf("VPC security group by name exists but is not attached to VPC")
}

Expand All @@ -1633,7 +1633,7 @@ func (s *PowerVSClusterScope) validateVPCSecurityGroup(securityGroup infrav1beta
return nil, nil, fmt.Errorf("failed to validate VPC security group rules: %v", err)
}
if !ok {
if _, _, controllerCreated := s.GetVPCSecurityGroupByName(*securityGroup.Name); !*controllerCreated {
if _, _, controllerCreated := s.GetVPCSecurityGroupByName(*securityGroup.Name); controllerCreated != nil && !*controllerCreated {
return nil, nil, fmt.Errorf("VPC security group by name exists but rules are not matching")
}
return nil, nil, s.createVPCSecurityGroupRulesAndSetStatus(securityGroup.Rules, securityGroupDet.ID, securityGroupDet.Name)
Expand Down
Loading