remove VmWorkJob after adding a nic to a vm

[DaanHoogland]

Description

This PR intents to

Fixes: #5541 without regressing #5651

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

Feature/Enhancement Scale

• Major
• Minor

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

manual tested

scenario 1: "Parallel adding of multiple networks"

create five shared networks,
create a VM in one of those
run a command line like

for net in \
  "5e998528-6886-4d23-aa20-d8c0c3dfd0d4"\
  "759a94ac-3c36-425c-b3ef-94a2ada9f8a1"\
  "a7ce3c15-8497-4e52-9530-1a1ebf2cb023"\
  "8da9d26a-c139-49f0-ae64-fd38b331d48d"
do
    cmk add nictovirtualmachine networkid=$net virtualmachineid=c22686c7-1ff9-4e66-afe5-348127ef7fe2 &
done

substituting the right IDs

scenarion 2: "Parallel adding the same network multiple times"

create two shared networks,
create a VM in one of those
run a command line like

for net in \
  "5e998528-6886-4d23-aa20-d8c0c3dfd0d4"\
  "5e998528-6886-4d23-aa20-d8c0c3dfd0d4"\
  "5e998528-6886-4d23-aa20-d8c0c3dfd0d4"
do
    cmk add nictovirtualmachine networkid=$net virtualmachineid=c22686c7-1ff9-4e66-afe5-348127ef7fe2 &
done

substituting the right IDs

scenario 3: "re-adding a network"

create two shared networks,
create a VM in one of those
add and remove the second one multiple times.

[DaanHoogland]

still needs testing @weizhouapache m but can you review?

[yadvr]

PR doesn't seem ready cc @DaanHoogland @weizhouapache @nvazquez @sureshanaparti

[weizhouapache]

LGTM

verified the issue #5651 is fixed.

[yadvr]

Adding to Wei's LGTM

[DaanHoogland]

note that travis job 14 is showing regressions. we can't merge this.
it assumes cone in #5541 which should be reverted to get 4.16 out.
cc @div8cn

[yadvr]

Ping any update/news on this @DaanHoogland cc @sureshanaparti @weizhouapache

[DaanHoogland]

No @rhtyd , this will need addressing. The original fix caused a regression.

[sureshanaparti]

@DaanHoogland can you fix the conflicts. thanks.

[DaanHoogland]

@sureshanaparti @weizhouapache I finally weeded out the final crinch here, a job was joined twice leading to an SQL exception. It did work but I'll start another test round for both parallel adding and re-adding of a network.
@blueorangutan package

[blueorangutan]

@DaanHoogland a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

[blueorangutan]

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 2129

[DaanHoogland]

fully works for adding in parallel and re-adding. I did notice however that deleting in parallel sometimes doesn't work. We will need to revisit the general area of this functionality again in the future
@blueorangutan test matrix

[blueorangutan]

@DaanHoogland a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

[weizhouapache]

fully works for adding in parallel and re-adding. I did notice however that deleting in parallel sometimes doesn't work. We will need to revisit the general area of this functionality again in the future @blueorangutan test matrix

great ! @DaanHoogland

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File

[blueorangutan]

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

Test	Result	Time (s)	Test File
ContextSuite context=TestSnapshotRootDisk>:setup	Error	0.00	test_snapshots.py
ContextSuite context=TestRouterIpTablesPolicies>:setup	Error	0.00	test_routers_iptables_default_policy.py
ContextSuite context=TestVPCIpTablesPolicies>:setup	Error	0.00	test_routers_iptables_default_policy.py
ContextSuite context=TestVPCNics>:setup	Error	0.00	test_vpc_router_nics.py

[blueorangutan]

Trillian test result (tid-2824)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34903 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2824-xenserver-71.zip
Smoke tests completed. 91 look OK, 1 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_sys_vm_start	Failure	0.12	test_secondary_storage.py

[blueorangutan]

Trillian test result (tid-2829)
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34882 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2829-vmware-65u2.zip
Smoke tests completed. 92 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

[blueorangutan]

Trillian test result (tid-2826)
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 36578 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2826-vmware-65u2.zip
Smoke tests completed. 92 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

[blueorangutan]

Trillian test result (tid-2827)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 37773 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2827-xenserver-71.zip
Smoke tests completed. 92 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

[yadvr]

Is this ready for merging, or needs testing @DaanHoogland @weizhouapache @sureshanaparti ?

[DaanHoogland]

Is this ready for merging, or needs testing @DaanHoogland @weizhouapache @sureshanaparti ?

I have tested it but I am (co-)author It has my lgtm ;)
I'll add a brief test description.

[weizhouapache]

Is this ready for merging, or needs testing @DaanHoogland @weizhouapache @sureshanaparti ?

@rohityadavcloud @DaanHoogland
I have tested it, #5651 is not back. it is good.
I was not able to reproduce #5499, so I am not sure if it is fixed.
code lgtm.

[sureshanaparti]

code LGTM