[BugFix] Fix match of source ip for resource group (backport #47732)

[mergify[bot]]

Why I'm doing:

What I'm doing:

Fixes #47437.

1. Match SubnetUtils::isInRange doesn't consider the broadcast and network address as a usable endpoint by default. As a result, 127.0.0.1 cannot matched 127.0.0.1/32.

2. Weight The weight of sourceIP of a resource group classifier is 1 + cidrPrefixLength/64. However, we calculate cidrPrefixLength by Long.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 32, which should be Long.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 31.

What type of PR is this:

• [x] BugFix
• [ ] Feature
• [ ] Enhancement
• [ ] Refactor
• [ ] UT
• [ ] Doc
• [ ] Tool

Does this PR entail a change in behavior?

• [ ] Yes, this PR will result in a change in behavior.
• [x] No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

• [ ] Interface/UI changes: syntax, type conversion, expression evaluation, display information
• [ ] Parameter changes: default values, similar parameters but with different default values
• [ ] Policy changes: use new policy to replace old one, functionality automatically enabled
• [ ] Feature removed
• [ ] Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

• [x] I have added test cases for my bug fix or my new feature
• [ ] This pr needs user documentation (for new or modified features or behaviors)
  • [ ] I have added documentation for my new feature or new function
• [x] This is a backport pr

Bugfix cherry-pick branch check:

• [x] I have checked the version labels which the pr will be auto-backported to the target branch
  • [x] 3.3
  • [x] 3.2
  • [x] 3.1
  • [x] 3.0
  • [x] 2.5

    ---

    This is an automatic backport of pull request #47732 done by Mergify.

    Why I'm doing:

What I'm doing:

Fixes #47437.

1. Match SubnetUtils::isInRange doesn't consider the broadcast and network address as a usable endpoint by default. As a result, 127.0.0.1 cannot matched 127.0.0.1/32.

2. Weight The weight of sourceIP of a resource group classifier is 1 + cidrPrefixLength/64. However, we calculate cidrPrefixLength by Long.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 32, which should be Long.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 31.

What type of PR is this:

• [x] BugFix
• [ ] Feature
• [ ] Enhancement
• [ ] Refactor
• [ ] UT
• [ ] Doc
• [ ] Tool

Does this PR entail a change in behavior?

• [ ] Yes, this PR will result in a change in behavior.
• [x] No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

• [ ] Interface/UI changes: syntax, type conversion, expression evaluation, display information
• [ ] Parameter changes: default values, similar parameters but with different default values
• [ ] Policy changes: use new policy to replace old one, functionality automatically enabled
• [ ] Feature removed
• [ ] Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

• [x] I have added test cases for my bug fix or my new feature
• [ ] This pr needs user documentation (for new or modified features or behaviors)
  • [ ] I have added documentation for my new feature or new function
• [x] This is a backport pr

[sonarcloud[bot]]

Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud