Skip to content

Allow creating atmost 1 physical network with null tag#6781

Merged
DaanHoogland merged 6 commits intoapache:mainfrom
leaseweb:physical_network_with_null_tag
Jan 5, 2023
Merged

Allow creating atmost 1 physical network with null tag#6781
DaanHoogland merged 6 commits intoapache:mainfrom
leaseweb:physical_network_with_null_tag

Conversation

@soreana
Copy link
Copy Markdown
Member

@soreana soreana commented Sep 28, 2022

Description

This pr is a follow up to the #3780 quoted the following from the pr:

Currently, we can create multiple physical networks in the same traffic types with null tags. This feature will ensure that we can create at most 1 physical network in the same traffic type with a null tag.
Every physical network should be associated with a tag so that when we create a new shared network, using the tags we can match the shared network with the physical network

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

  • Major
  • Minor

How Has This Been Tested?

Please refer to the old pr at: #3780

@DaanHoogland
Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@codecov
Copy link
Copy Markdown

codecov bot commented Sep 28, 2022

Codecov Report

Merging #6781 (d6edec9) into main (69e158d) will increase coverage by 1.31%.
The diff coverage is 4.93%.

@@             Coverage Diff              @@
##               main    #6781      +/-   ##
============================================
+ Coverage     10.60%   11.92%   +1.31%     
- Complexity     6854     8228    +1374     
============================================
  Files          2466     2496      +30     
  Lines        244615   275545   +30930     
  Branches      38274    50240   +11966     
============================================
+ Hits          25938    32847    +6909     
- Misses       215395   238462   +23067     
- Partials       3282     4236     +954     
Impacted Files Coverage Δ
...ain/java/com/cloud/network/dao/NetworkDaoImpl.java 3.21% <0.00%> (ø)
.../main/java/com/cloud/network/NetworkModelImpl.java 13.35% <0.00%> (+2.36%) ⬆️
...ain/java/com/cloud/network/NetworkServiceImpl.java 13.16% <0.00%> (+3.34%) ⬆️
.../cloud/configuration/ConfigurationManagerImpl.java 14.74% <16.66%> (+3.51%) ⬆️
...org/apache/cloudstack/quota/vo/QuotaBalanceVO.java 28.20% <0.00%> (-17.95%) ⬇️
...che/cloudstack/api/command/QuotaTariffListCmd.java 58.97% <0.00%> (-12.46%) ⬇️
...e/cloudstack/api/command/QuotaTariffUpdateCmd.java 40.00% <0.00%> (-12.39%) ⬇️
...java/com/cloud/upgrade/DatabaseUpgradeChecker.java 36.98% <0.00%> (-9.69%) ⬇️
...in/java/com/cloud/offerings/NetworkOfferingVO.java 34.91% <0.00%> (-7.84%) ⬇️
.../com/cloud/api/query/vo/NetworkOfferingJoinVO.java 17.64% <0.00%> (-6.41%) ⬇️
... and 286 more

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

@blueorangutan
Copy link
Copy Markdown

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

@DaanHoogland
Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@DaanHoogland
Copy link
Copy Markdown
Contributor

@soreana did you apply any of the comments from #3780?

@soreana
Copy link
Copy Markdown
Member Author

soreana commented Sep 29, 2022

@soreana did you apply any of the comments from #3780?

@DaanHoogland Sure, I'm on it.

@acs-robot
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

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

@soreana
Copy link
Copy Markdown
Member Author

soreana commented Sep 29, 2022

@DaanHoogland I've changed the integration test regarding your comments. Let me know if you have any concerns.

@blueorangutan
Copy link
Copy Markdown

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6781 (SL-JID-2437)

Comment thread test/integration/component/test_multiple_physical_network_creation.py Outdated
@DaanHoogland
Copy link
Copy Markdown
Contributor

@soreana in the original PR it was asked to put this behind a setting by @andrijapanicsb . I do not see that implemented here yet. Are you planning to do that?

@blueorangutan
Copy link
Copy Markdown

Trillian test result (tid-5040)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44926 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6781-t5040-kvm-centos7.zip
Smoke tests completed. 101 look OK, 2 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 Failure 611.00 test_kubernetes_clusters.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Failure 466.08 test_vpc_redundant.py

@soreana
Copy link
Copy Markdown
Member Author

soreana commented Oct 10, 2022

@DaanHoogland Can I have this on 4.18, please ? :)

@soreana soreana force-pushed the physical_network_with_null_tag branch from f34229c to d094d84 Compare October 10, 2022 15:10
@soreana
Copy link
Copy Markdown
Member Author

soreana commented Oct 10, 2022

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@soreana 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
Copy link
Copy Markdown

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

@DaanHoogland
Copy link
Copy Markdown
Contributor

@blueorangutan test

@soreana
Copy link
Copy Markdown
Member Author

soreana commented Oct 17, 2022

@soreana , some simple changes sugested by sonar. I am running another suite of tests. There is also a suggestion to externalise a string, but I'd leave that one for a separate cleanup-PR.

@DaanHoogland Thanks for the reviews and the tests. Personally, I don't prefer to touch that Throwable line. It may break something unwanted :-)

@blueorangutan
Copy link
Copy Markdown

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

Test Result Time (s) Test File

@soreana
Copy link
Copy Markdown
Member Author

soreana commented Oct 18, 2022

@DaanHoogland Can I also have this one in 4.18? 🙈

@DaanHoogland
Copy link
Copy Markdown
Contributor

@andrijapanicsb @JoaoJandre @sureshanaparti , are all your comments and requests met?

@soreana soreana requested review from JoaoJandre and sureshanaparti and removed request for JoaoJandre, andrijapanicsb and sureshanaparti November 3, 2022 13:51
@soreana soreana requested review from JoaoJandre and sureshanaparti and removed request for JoaoJandre and sureshanaparti December 5, 2022 10:40
@weizhouapache
Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@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
Copy link
Copy Markdown

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

@soreana
Copy link
Copy Markdown
Member Author

soreana commented Jan 3, 2023

@DaanHoogland Can I have this on 4.18? 🙈
There isn't any astounding comment. :)

@DaanHoogland
Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

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

Test Result Time (s) Test File
test_07_deploy_kubernetes_ha_cluster Failure 3618.19 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 67.72 test_kubernetes_clusters.py

@DaanHoogland DaanHoogland reopened this Jan 5, 2023
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Jan 5, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 3 Code Smells

4.7% 4.7% Coverage
0.0% 0.0% Duplication

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.

7 participants