Skip to content

cleanup: remove unused class org.apache.cloudstack.network.NetworkOrchestrator#7983

Merged
DaanHoogland merged 3 commits intoapache:4.18from
weizhouapache:4.18-remove-unused-NetworkOrchestrator
Oct 2, 2023
Merged

cleanup: remove unused class org.apache.cloudstack.network.NetworkOrchestrator#7983
DaanHoogland merged 3 commits intoapache:4.18from
weizhouapache:4.18-remove-unused-NetworkOrchestrator

Conversation

@weizhouapache
Copy link
Copy Markdown
Member

@weizhouapache weizhouapache commented Sep 20, 2023

Description

This PR removes org.apache.cloudstack.network.NetworkOrchestrator which is useless

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?

@weizhouapache
Copy link
Copy Markdown
Member Author

@blueorangutan package

@weizhouapache weizhouapache added this to the 4.18.2.0 milestone Sep 20, 2023
@codecov
Copy link
Copy Markdown

codecov bot commented Sep 20, 2023

Codecov Report

Merging #7983 (04d6ac6) into 4.18 (09ae049) will increase coverage by 0.00%.
Report is 6 commits behind head on 4.18.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               4.18    #7983   +/-   ##
=========================================
  Coverage     13.06%   13.06%           
- Complexity     9105     9106    +1     
=========================================
  Files          2720     2720           
  Lines        257494   257506   +12     
  Branches      40148    40149    +1     
=========================================
+ Hits          33642    33649    +7     
- Misses       219623   219627    +4     
- Partials       4229     4230    +1     

see 5 files with indirect coverage changes

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

@weizhouapache
Copy link
Copy Markdown
Member Author

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

Copy link
Copy Markdown
Member

@harikrishna-patnala harikrishna-patnala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weizhouapache I see the whole module "network" has only one interface. Can we remove the module itself, something like this

deleted:    engine/network/pom.xml
deleted:    engine/network/src/main/java/org/apache/cloudstack/network/NetworkOrchestrator.java
modified:   engine/pom.xml

@weizhouapache
Copy link
Copy Markdown
Member Author

@weizhouapache I see the whole module "network" has only one interface. Can we remove the module itself, something like this

deleted:    engine/network/pom.xml
deleted:    engine/network/src/main/java/org/apache/cloudstack/network/NetworkOrchestrator.java
modified:   engine/pom.xml

@harikrishna-patnala
good point, I will update this PR

@weizhouapache
Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@weizhouapache a [SF] 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
Copy link
Copy Markdown

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

@weizhouapache
Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@weizhouapache a [SF] 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
Copy link
Copy Markdown

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

@DaanHoogland
Copy link
Copy Markdown
Contributor

@blueorangutan test matrix

@blueorangutan
Copy link
Copy Markdown

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

Copy link
Copy Markdown
Member

@harikrishna-patnala harikrishna-patnala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for addressing the comments @weizhouapache

LGTM

@blueorangutan
Copy link
Copy Markdown

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

Test Result Time (s) Test File
test_10_vpc_tier_kubernetes_cluster Failure 3718.04 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Error 3718.16 test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown Error 3749.45 test_kubernetes_clusters.py
test_13_migrate_volume_and_change_offering Error 16.75 test_volumes.py
ContextSuite context=TestVolumes>:teardown Error 22.81 test_volumes.py

@blueorangutan
Copy link
Copy Markdown

[SF] Trillian test result (tid-7766)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 52275 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7983-t7766-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_01_invalid_upgrade_kubernetes_cluster Failure 3616.31 test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster Failure 3616.75 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 0.04 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 0.03 test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster Failure 0.04 test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster Failure 0.04 test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster Failure 0.03 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 0.04 test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster Failure 0.03 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 49.63 test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown Error 116.13 test_kubernetes_clusters.py

@DaanHoogland
Copy link
Copy Markdown
Contributor

@blueorangutan test centos7 vmware-67u3

@blueorangutan
Copy link
Copy Markdown

@DaanHoogland a [SF] Trillian-Jenkins test job (centos7 mgmt + vmware-67u3) has been kicked to run smoke tests

@blueorangutan
Copy link
Copy Markdown

[SF] Trillian test result (tid-7780)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 52720 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7983-t7780-vmware-67u3.zip
Smoke tests completed. 106 look OK, 2 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 396.67 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 3726.76 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Error 3726.88 test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown Error 3763.99 test_kubernetes_clusters.py
test_02_deploy_vm_on_specific_cluster Error 79.00 test_vm_deployment_planner.py

@DaanHoogland DaanHoogland merged commit 9a8cd13 into apache:4.18 Oct 2, 2023
@DaanHoogland DaanHoogland deleted the 4.18-remove-unused-NetworkOrchestrator branch October 2, 2023 06:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants