Skip to content

Conversation

@JoaoJandre
Copy link
Contributor

Description

Two new settings at domain level were added to allow definition of header and footer of Quota emails:

  • quota.email.header: defines the header of all Quota emails.
  • quota.email.footer: defines the footer of all Quota emails.

The settings are added directly to the body of the text, so if you want a line break between the header/footer and the body of the text, you need to make it explicit (e.g. <br/>). By default the header/footer are not defined.

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?

Defined the header and footer as <h1>header</h1> and f<b>oot</b><u>er</u><script>alert(1)</script>.
Result:
image

@codecov
Copy link

codecov bot commented Aug 10, 2023

Codecov Report

Merging #7852 (79cad0b) into main (927818b) will increase coverage by 0.10%.
Report is 8 commits behind head on main.
The diff coverage is 90.00%.

@@             Coverage Diff              @@
##               main    #7852      +/-   ##
============================================
+ Coverage     14.28%   14.38%   +0.10%     
- Complexity     9994    10075      +81     
============================================
  Files          2747     2747              
  Lines        258911   258931      +20     
  Branches      40318    40319       +1     
============================================
+ Hits          36987    37250     +263     
+ Misses       217132   216867     -265     
- Partials       4792     4814      +22     
Files Changed Coverage Δ
.../org/apache/cloudstack/quota/QuotaServiceImpl.java 35.86% <ø> (ø)
...apache/cloudstack/quota/QuotaAlertManagerImpl.java 63.93% <87.50%> (+0.86%) ⬆️
.../apache/cloudstack/quota/constant/QuotaConfig.java 100.00% <100.00%> (ø)

... and 16 files with indirect coverage changes

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

@jbampton
Copy link
Member

@blueorangutan package

@blueorangutan
Copy link

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

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

Copy link
Member

@yadvr yadvr left a comment

Choose a reason for hiding this comment

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

LGTM but I haven't tested it

Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

lgtm

@JoaoJandre
Copy link
Contributor Author

@rohityadavcloud @DaanHoogland could we run the tests for this one?

@DaanHoogland
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

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

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

@DaanHoogland
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

Test Result Time (s) Test File
test_05_vmschedule_test_e2e Failure 266.01 test_vm_schedule.py

@JoaoJandre
Copy link
Contributor Author

The test failure does not seem related to this PR:

2023-08-21 19:32:22,645 - CRITICAL - FAILED: test_05_vmschedule_test_e2e: ['Traceback (most recent call last):\n', '  File "/usr/lib64/python3.6/unittest/case.py", line 60, in testPartExecutor\n    yield\n', '  File "/usr/lib64/python3.6/unittest/case.py", line 622, in run\n    testMethod()\n', '  File "/marvin/tests/smoke/test_vm_schedule.py", line 607, in test_05_vmschedule_test_e2e\n    "VM did not switch states after schedule time",\n', '  File "/usr/lib64/python3.6/unittest/case.py", line 693, in assertFalse\n    raise self.failureException(msg)\n', 'AssertionError: True is not false : VM did not switch states after schedule time\n']

Could we merge this one? @DaanHoogland @rohityadavcloud

@weizhouapache weizhouapache merged commit 2f701e1 into apache:main Aug 29, 2023
@DaanHoogland DaanHoogland added this to the 4.19.0.0 milestone Sep 29, 2023
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.

6 participants