VR: do not restart conntrackd if no guest networks

[weizhouapache]

Description

This PR fixes #6702

The service conntrackd will be started by the script /opt/cloud/bin/cs/CsRedundant.py, therefore add it to disabled_svcs so it is not started automatically when VR is started.

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)

Feature/Enhancement Scale or Bug Severity

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

[sonarqubecloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

[codecov]

Codecov Report

Merging #7265 (2fd6cfb) into main (d12e9cb) will increase coverage by 0.00%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #7265   +/-   ##
=========================================
  Coverage     12.67%   12.67%           
- Complexity     8639     8641    +2     
=========================================
  Files          2716     2716           
  Lines        256112   256112           
  Branches      39926    39926           
=========================================
+ Hits          32456    32461    +5     
+ Misses       219528   219522    -6     
- Partials       4128     4129    +1     

Impacted Files	Coverage Δ
...com/cloud/agent/manager/ConnectedAgentAttache.java	37.50% <0.00%> (+12.50%)	⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

[weizhouapache]

@blueorangutan package

[blueorangutan]

@weizhouapache a 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: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5614

[weizhouapache]

@blueorangutan test matrix

[blueorangutan]

@weizhouapache a Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

[blueorangutan]

Trillian test result (tid-6206)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 45420 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7265-t6206-vmware-67u3.zip
Smoke tests completed. 108 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

[blueorangutan]

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

Test	Result	Time (s)	Test File
test_08_upgrade_kubernetes_ha_cluster	Error	4032.16	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	Failure	0.05	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	Error	79.84	test_kubernetes_clusters.py

[blueorangutan]

Trillian test result (tid-6205)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 50188 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7265-t6205-xenserver-71.zip
Smoke tests completed. 107 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_08_upgrade_kubernetes_ha_cluster	Error	4067.60	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	Failure	0.09	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	Error	85.80	test_kubernetes_clusters.py

[kiranchavala]

Verified the issue LGTM

Found that conntrackd service is disabled when using vpc redundant offering

Please find the screenshots

Before fix

After fix

[weizhouapache]

@kiranchavala
thanks for testing. it looks like expected behaviour

[DaanHoogland]

isn´t ignoring the contracd service here enough?

[weizhouapache]

@DaanHoogland
it is better to stop it

[DaanHoogland]

ok

[shwstppr]

LGTM. Test by @kiranchavala 👍

[weizhouapache]

@blueorangutan package

[blueorangutan]

@weizhouapache a 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: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6043

[weizhouapache]

@blueorangutan test

[yadvr]

LGTM, manual testing and previous smoketests LGTM. Re-testing isn't required as changes are striclty in the VR codebase and has been manually tested by @kiranchavala