[WIP] vr: fix packet interface mismatch

[shwstppr]

Description

Fixes #6615

Types of changes

• [ ] Breaking change (fix or feature that would cause existing functionality to change)
• [ ] New feature (non-breaking change which adds functionality)
• [x] 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

Feature/Enhancement Scale

• [ ] Major
• [ ] Minor

Bug Severity

• [ ] BLOCKER
• [ ] Critical
• [ ] Major
• [ ] Minor
• [ ] Trivial

Screenshots (if appropriate):

How Has This Been Tested?

[codecov[bot]]

Codecov Report

Merging #6656 (7010f6a) into main (65c7070) will increase coverage by 4.54%. The diff coverage is 70.00%.

@@             Coverage Diff              @@
##               main    #6656      +/-   ##
============================================
+ Coverage      5.88%   10.42%   +4.54%     
- Complexity     3942     6701    +2759     
============================================
  Files          2454     2457       +3     
  Lines        242723   243180     +457     
  Branches      37988    38063      +75     
============================================
+ Hits          14289    25360   +11071     
+ Misses       226850   214643   -12207     
- Partials       1584     3177    +1593     

Impacted Files	Coverage Δ
.../cloud/configuration/ConfigurationManagerImpl.java	11.24% <0.00%> (+11.24%)	:arrow_up:
...org/apache/cloudstack/utils/linux/KVMHostInfo.java	56.38% <71.42%> (+6.38%)	:arrow_up:
...c/main/java/com/cloud/network/Ipv6ServiceImpl.java	66.93% <100.00%> (+66.93%)	:arrow_up:
...rg/apache/cloudstack/quota/QuotaStatementImpl.java	36.28% <0.00%> (-3.99%)	:arrow_down:
...ain/java/com/cloud/consoleproxy/AgentHookBase.java	0.00% <0.00%> (ø)
...ava/com/cloud/servlet/ConsoleProxyClientParam.java	0.00% <0.00%> (ø)
...va/com/cloud/consoleproxy/ConsoleProxyManager.java	0.00% <0.00%> (ø)
...n/java/com/cloud/vm/VirtualMachineManagerImpl.java	0.00% <0.00%> (ø)
...ud/consoleproxy/AgentBasedConsoleProxyManager.java	0.00% <0.00%> (ø)
...om/cloud/hypervisor/kvm/resource/LibvirtVMDef.java	62.60% <0.00%> (ø)
... and 480 more

:mega: 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: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 4022

[sonarqubecloud[bot]]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

[weizhouapache]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

Trillian test result (tid-4756) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 42157 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6656-t4756-kvm-centos7.zip Smoke tests completed. 100 look OK, 1 have errors Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_02_upgrade_kubernetes_cluster	Failure	494.17	test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster	Failure	3611.48	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	Failure	0.05	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	Failure	0.04	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	Error	69.68	test_kubernetes_clusters.py

[blueorangutan]

Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. LL-JID 184

[DaanHoogland]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File
test_02_upgrade_kubernetes_cluster	Failure	838.25	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	Failure	664.37	test_kubernetes_clusters.py

[DaanHoogland]

@shwstppr @weizhouapache I rebased this on 4.17 and added a small change to the configure.py code: https://github.com/apache/cloudstack/pull/6656/commits/7010f6a1341643aed036d60aedec9c1af1c6afa2 tested this and it seems correct. please review.

[acs-robot]

Found UI changes, kicking a new UI QA build @blueorangutan ui

[blueorangutan]

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

[blueorangutan]

UI build: :heavy_check_mark: Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6656 (SL-JID-2408)

[DaanHoogland]

@blueorangutan package

[blueorangutan]

@DaanHoogland 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.

[sonarqubecloud[bot]]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

[blueorangutan]

Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 4258

[weizhouapache]

@DaanHoogland code lgtm, but I am not 100% confident about the changes.

btw, can you kick off smoke tests ?

[DaanHoogland]

@DaanHoogland code lgtm, but I am not 100% confident about the changes.

btw, can you kick off smoke tests ?

I have hack-tested this, but I'll update my test env with these new packages and retest to make sure, @weizhouapache and yes af course ;) @blueorangutan test

[blueorangutan]

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

[blueorangutan]

Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. LL-JID 148

[weizhouapache]

@blueorangutan test

[DaanHoogland]

@blueorangutan test

[blueorangutan]

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

[DaanHoogland]

@DaanHoogland code lgtm, but I am not 100% confident about the changes.

I have hack-tested this, but I'll update my test env with these new packages and retest to make sure, @weizhouapache and yes

@weizhouapache , I manually checked the ping on the extra interface in the router (eth3) and it contains both incoming and outgoing data. Than I checked doing ls in an ssh connection and again both incoming and outgoing data where on eth3

[blueorangutan]

Packaging result: :heavy_check_mark: el7 :heavy_multiplication_x: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. LL-JID 150

[DaanHoogland]

@nvazquez @weizhouapache can you review please?