cleanup of unused code and cleanup of cleanup procedure

[DaanHoogland]

Description

This PR cleans up an integration smoke test

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?

[sureshanaparti]

@DaanHoogland test_router_dhcphosts still fails, Please check. May be, other test failures are not related to this PR.

[DaanHoogland]

@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 1589

[DaanHoogland]

@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

[blueorangutan]

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

Test	Result	Time (s)	Test File

[blueorangutan]

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

Test	Result	Time (s)	Test File

[blueorangutan]

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

Test	Result	Time (s)	Test File
test_02_cancel_host_maintenace_with_migration_jobs	Error	770.38	test_host_maintenance.py
test_02_cancel_host_maintenace_with_migration_jobs	Error	770.39	test_host_maintenance.py
test_03_cancel_host_maintenace_with_migration_jobs_failure	Error	2.98	test_host_maintenance.py
ContextSuite context=TestHostMaintenanceAgents>:setup	Error	5.99	test_host_maintenance.py

[DaanHoogland]

@blueorangutan test centos7 vmware-70u1

[blueorangutan]

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

[blueorangutan]

Trillian test result (tid-2452)
Environment: vmware-70u1 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34183 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5562-t2452-vmware-70u1.zip
Smoke tests completed. 91 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

[DaanHoogland]

ping @nvazquez, this reasonably riskfree (test cleanup only) PR can go in 4.16.0 ??

[yadvr]

@blueorangutan package

[blueorangutan]

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

[GabrielBrascher]

Looks Good. Not many risks with these tests cleanups and the previous Trillian test result looks good.

[blueorangutan]

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

[sureshanaparti]

@blueorangutan package

[blueorangutan]

@sureshanaparti 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 1963

[sureshanaparti]

@blueorangutan test

[blueorangutan]

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

[sureshanaparti]

cleanup code lgtm

[blueorangutan]

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

Test	Result	Time (s)	Test File
test_04_create_template_with_checksum_md5	Error	65.41	test_templates.py
test_05_create_template_with_no_checksum	Error	65.45	test_templates.py
test_03_delete_template	Error	291.59	test_templates.py
test_04_extract_template	Error	1.07	test_templates.py

[sureshanaparti]

@blueorangutan test keepEnv

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File

[sureshanaparti]

Verified the modified test results, looks good.