Don't allow service offering change if encryption value would change#6776
Conversation
Signed-off-by: Marcus Sorensen <mls@apple.com>
mlsorensen
changed the title
Codecov Report
@@ Coverage Diff @@
## main #6776 +/- ##
============================================
- Coverage 10.60% 10.60% -0.01%
- Complexity 6849 6852 +3
============================================
Files 2466 2466
Lines 244549 244553 +4
Branches 38262 38263 +1
============================================
Hits 25936 25936
- Misses 215331 215335 +4
Partials 3282 3282
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
|
@mlsorensen can you add a unit or marvin test for the same if feasible? |
|
@rohityadavcloud 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. |
|
Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 4301 |
|
@rohityadavcloud I'm really not sure how to do that. I'm aware of the smoke tests but as far as understanding what is actually going to be run on PR, and how to actually get a local environment to develop against (Marvin seems to be pretty heavy handed about setting up zones and networking in a specific way during setup for a test, for example I can't just pick a VM test and run it against any existing zone using existing networks and offerings... or can I?). Honestly we would add dozens of tests if we understood how the target environment works and it were easy to iterate on. |
|
I can probably add a unit test for this since the method is isolated... working. |
Signed-off-by: Marcus Sorensen <mls@apple.com>
|
Kudos, SonarCloud Quality Gate passed! |
|
@mlsorensen you can for example write a simple marvin test to (1) create an offering with encryption enabled, (2) deploy VM using that, (3) stop the VM if necessary and try changing its offering to one of the available default offerings that don't have an encryption enabled. Since this test is checking only the business logic, it may even run as a simulator test (and therefore also on Travis), and very easy to run smoketests against simulator (https://github.com/shapeblue/hackerbook/blob/main/2-dev.md#simulator-based-development). To run a local (kvm/vmware/xen) env, you can deploy them as VMs on your workstations (or remote server with your workstation joined over VPN), or use something like https://github.com/shapeblue/mbx to tests using built pkgs. |
|
@blueorangutan package |
|
@rohityadavcloud 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. |
|
Packaging result: ✖️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 4310 |
|
Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 4316 |
|
@blueorangutan test |
|
@rohityadavcloud a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests |
|
Trillian Build Failed (tid-5050) |
|
@blueorangutan test |
|
@rohityadavcloud a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests |
Cool, thanks @rohityadavcloud. I'm aware of these (we use simulator quite a bit w/containers) but the gaps are elsewhere, maybe we can meet and discuss. One is really around environment overload. I already have several environments I maintain for development that represent real configurations. It's a bit cumbersome to then set up yet another VM instance as a blank slate for each dev cycle of smoke testing (or automate it), I'm not aware of how to run Marvin tests against an existing dev environment since many of the tests make assumptions about the environment. Likewise I don't really understand the environment that is under test by Trillian and how to reproduce it in a way that I can develop tests which will work there. The other is understanding of which tests actually will be run in the community on every PR vs tests that aren't and which tests are run when. It looked like maybe there are some decorators that manage this. I'd love to just be able to run |
|
Trillian test result (tid-5054)
|
|
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch. |
4 participants
Signed-off-by: Marcus Sorensen mls@apple.com
Description
This PR blocks change of service offering if the offering root volume encryption values don't match. We don't support dynamically removing or adding encryption to a VM.
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
Tested prior to this change - could move from non-encrypted to encrypted offerings.
Tested after this change - clean error indicating the encryption type must not change if selected offering does not match current offering encryption setting. Tested both compute-only disk offering and service offering referencing existing disk offerings.
Tested: