fix match string for chainsaw tests

Author: alexandernorth

internal/controller/iprange_controller.go

@@ -166,7 +166,7 @@ func (r *IpRangeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		}
 
 		if err = r.EventStatusRecorder.Report(ctx, o, netboxv1.ConditionIpRangeReadyFalse,
-			corev1.EventTypeWarning, err, fmt.Sprintf("%s-%s ", o.Spec.StartAddress, o.Spec.EndAddress)); err != nil {
+			corev1.EventTypeWarning, err, fmt.Sprintf("range: %s-%s", o.Spec.StartAddress, o.Spec.EndAddress)); err != nil {
 			return ctrl.Result{}, err
 		}
 

internal/controller/utils.go

@@ -89,7 +89,7 @@ func (esr *EventStatusRecorder) Report(ctx context.Context, o ObjectWithConditio
 	logger := log.FromContext(ctx)
 
 	if errExt != nil {
-		condition.Message = condition.Message + ", " + errExt.Error()
+		condition.Message = condition.Message + ": " + errExt.Error()
 		logger.Error(errExt, condition.Message)
 	}
 

tests/e2e/Prefix/IPv4/prefixclaim-ipv4-invalid-parentprefixselector/chainsaw-test.yaml

@@ -45,7 +45,7 @@ spec:
               reason: ParentPrefixNotSelected
               source:
                 component: prefix-claim-controller
-              message: "The parent prefix was not able to be selected. no parent prefix can be obtained with the query conditions set in ParentPrefixSelector, err = failed to fetch tenant 'niltenant': not found, number of candidates = 0"
+              message: "The parent prefix was not able to be selected, no parent prefix can be obtained with the query conditions set in ParentPrefixSelector, err = failed to fetch tenant 'niltenant': not found, number of candidates = 0"
               involvedObject:
                 apiVersion: netbox.dev/v1
                 kind: PrefixClaim

tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/chainsaw-test.yaml

@@ -94,7 +94,7 @@ spec:
               reason: PrefixCRNotCreated
               source:
                 component: prefix-claim-controller
-              message: Failed to fetch new Prefix from NetBox. parent prefix exhausted, will restart the parent prefix selection process
+              message: Failed to fetch new Prefix from NetBox, parent prefix exhausted, will restart the parent prefix selection process
               involvedObject:
                 apiVersion: netbox.dev/v1
                 kind: PrefixClaim

tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/chainsaw-test.yaml

@@ -129,7 +129,7 @@ spec:
               reason: IPAddressCRNotCreated
               source:
                 component: ip-address-claim-controller
-              message: Failed to fetch new IP from NetBox. parent prefix exhausted
+              message: "Failed to fetch new IP from NetBox: parent prefix exhausted"
               involvedObject:
                 apiVersion: netbox.dev/v1
                 kind: IpAddressClaim

tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/chainsaw-test.yaml

@@ -129,7 +129,7 @@ spec:
               reason: IPAddressCRNotCreated
               source:
                 component: ip-address-claim-controller
-              message: Failed to fetch new IP from NetBox. parent prefix exhausted
+              message: "Failed to fetch new IP from NetBox: parent prefix exhausted"
               involvedObject:
                 apiVersion: netbox.dev/v1
                 kind: IpAddressClaim

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldnotexisting/chainsaw-test.yaml

@@ -55,7 +55,7 @@ spec:
               reason: FailedToReserveIPRangeInNetbox
               source:
                 component: ip-range-controller
-              message: Failed to reserve IP Range in NetBox. 3.2.3.1/32-3.2.3.30/32 . Check the logs for more information.
+              message: "Failed to reserve IP Range in NetBox: failed to reserve IP Range: [POST /ipam/ip-ranges/][400] ipam_ip-ranges_create default  map[__all__:[Unknown field name 'justmade' in custom field data.]], range: 3.2.3.1/32-3.2.3.30/32"
               involvedObject:
                 apiVersion: netbox.dev/v1
                 kind: IpRange

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldwrongdatatype/chainsaw-test.yaml

@@ -55,7 +55,7 @@ spec:
               reason: FailedToReserveIPRangeInNetbox
               source:
                 component: ip-range-controller
-              message: Failed to reserve IP Range in NetBox. 3.2.3.1/32-3.2.3.30/32 . Check the logs for more information.
+              message: "Failed to reserve IP Range in NetBox: failed to reserve IP Range: [POST /ipam/ip-ranges/][400] ipam_ip-ranges_create default  map[__all__:[Unknown field name 'cfDataTypeInteger' in custom field data.]], range: 3.2.3.1/32-3.2.3.30/32"
               involvedObject:
                 apiVersion: netbox.dev/v1
                 kind: IpRange

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-parentprefix/chainsaw-test.yaml

@@ -30,7 +30,7 @@ spec:
               reason: IPRangeCRNotCreated
               source:
                 component: ip-range-claim-controller
-              message: Failed to fetch new IP Range from NetBox. Check the logs for more information.
+              message: "Failed to fetch new IP Range from NetBox: failed to fetch parent prefix: not found"
               involvedObject:
                 apiVersion: netbox.dev/v1
                 kind: IpRangeClaim

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-tenant/chainsaw-test.yaml

@@ -36,7 +36,7 @@ spec:
               reason: IPRangeCRNotCreated
               source:
                 component: ip-range-claim-controller
-              message: Failed to fetch new IP Range from NetBox. Check the logs for more information.
+              message: "Failed to fetch new IP Range from NetBox: failed to fetch tenant 'nonexistingtenant': not found"
               involvedObject:
                 apiVersion: netbox.dev/v1
                 kind: IpRangeClaim

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml

@@ -138,7 +138,7 @@ spec:
               reason: IPRangeCRNotCreated
               source:
                 component: ip-range-claim-controller
-              message: Failed to fetch new IP Range from NetBox. Check the logs for more information.
+              message: "Failed to fetch new IP Range from NetBox: not enough consecutive IPs available"
               involvedObject:
                 apiVersion: netbox.dev/v1
                 kind: IpRangeClaim

tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml

@@ -139,7 +139,7 @@ spec:
               reason: IPRangeCRNotCreated
               source:
                 component: ip-range-claim-controller
-              message: Failed to fetch new IP Range from NetBox. Check the logs for more information.
+              message: "Failed to fetch new IP Range from NetBox: not enough consecutive IPs available"
               involvedObject:
                 apiVersion: netbox.dev/v1
                 kind: IpRangeClaim