Remove duplicate network state checks before shutdown network

[sureshanaparti]

Description

This PR removes duplicate network state checks before shutdown network (seems these checks again are not required, maybe added while resolving conflicts),and adds unit tests for the network state checks in shutdown network.

Keeping this checks after acquiring lock, removed others.

cloudstack/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

Lines 3042 to 3049 in 3f9dd4d

	if (network.getState() == Network.State.Allocated) {
	s_logger.debug("Network is already shutdown: " + network);
	return true;
	}
	if (network.getState() != Network.State.Implemented && network.getState() != Network.State.Shutdown) {
	s_logger.debug("Network is not implemented: " + network);
	return false;

Types of changes

• Breaking change (fix or feature that would cause existing functionality to change)
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Enhancement (improves an existing feature and functionality)
• Cleanup (Code refactoring and cleanup, that may add test cases)
• build/CI

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

• Major
• Minor

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

[sureshanaparti]

@blueorangutan package

[blueorangutan]

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 14.97%. Comparing base (b2ef53b) to head (055f2bc).

Additional details and impacted files

@@            Coverage Diff             @@
##               4.19    #8462    +/-   ##
==========================================
  Coverage     14.96%   14.97%            
- Complexity    11013    11017     +4     
==========================================
  Files          5377     5377            
  Lines        469567   469561     -6     
  Branches      60162    59785   -377     
==========================================
+ Hits          70285    70300    +15     
+ Misses       391498   391473    -25     
- Partials       7784     7788     +4     

Flag	Coverage Δ
uitests	4.29% <ø> (ø)
unittests	15.68% <100.00%> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[blueorangutan]

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 8231

[github-actions]

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

[DaanHoogland]

@blueorangutan package

[blueorangutan]

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

[blueorangutan]

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 8286

[sureshanaparti]

@blueorangutan test

[blueorangutan]

@sureshanaparti a [SL] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

[JoaoJandre]

I would also fix the log message at line 3034 to something like:

s_logger.debug(String.format("Network [%s] is in Allocated state, no need to shutdown.", network));

[github-actions]

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

[sureshanaparti]

@blueorangutan package

[blueorangutan]

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

[blueorangutan]

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 8305

[JoaoJandre]

CLGTM, didn't test it

[sureshanaparti]

@blueorangutan test

[blueorangutan]

@sureshanaparti a [SL] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

[blueorangutan]

[SF] Trillian test result (tid-8853)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 48534 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8462-t8853-kvm-centos7.zip
Smoke tests completed. 120 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_create_pvlan_network	Error	0.05	test_pvlan.py

[DaanHoogland]

clgtm

[vishesh92]

clgtm. didn't test.

[DaanHoogland]

@sureshanaparti , you want to revive this?

[sureshanaparti]

@blueorangutan package

[blueorangutan]

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

[blueorangutan]

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 9905

[vladimirpetrov]

LGTM based on manual testing - did some smoke testing with different network types, create/restart with and without cleanup/destroy - no issues found.