You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by "Pearl1594 (via GitHub)" <gi...@apache.org> on 2024/08/19 16:59:53 UTC

[PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Pearl1594 opened a new pull request, #9546:
URL: https://github.com/apache/cloudstack/pull/9546

   ### Description
   
   This PR addresses: https://github.com/apache/cloudstack/issues/8440 
   <!--- Describe your changes in DETAIL - And how has behaviour functionally changed. -->
   
   <!-- For new features, provide link to FS, dev ML discussion etc. -->
   <!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. -->
   
   <!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged -->
   <!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
   <!-- Fixes: # -->
   
   <!--- ******************************************************************************* -->
   <!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE DOCUMENTATION. -->
   <!--- PLEASE PUT AN 'X' in only **ONE** box -->
   <!--- ******************************************************************************* -->
   
   ### 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)
   - [X] Enhancement (improves an existing feature and functionality)
   - [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
   - [ ] build/CI
   - [ ] test (unit or integration test code)
   
   ### Feature/Enhancement Scale or Bug Severity
   
   #### Feature/Enhancement Scale
   
   - [ ] Major
   - [X] Minor
   
   #### Bug Severity
   
   - [ ] BLOCKER
   - [ ] Critical
   - [ ] Major
   - [ ] Minor
   - [ ] Trivial
   
   
   ### Screenshots (if appropriate):
   
   
   ### How Has This Been Tested?
   
   <!-- Please describe in detail how you tested your changes. -->
   <!-- Include details of your testing environment, and the tests you ran to -->
   
   #### How did you try to break this feature and the system with this change?
   
   <!-- see how your change affects other areas of the code, etc. -->
   
   
   <!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document -->
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2305472276

   @blueorangutan test


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2303102364

   <b>[SF] Trillian test result (tid-11120)</b>
   Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
   Total time taken: 61948 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11120-kvm-ol8.zip
   Smoke tests completed. 124 look OK, 15 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_DeployVmAffinityGroup | `Error` | 1.40 | test_affinity_groups.py
   ContextSuite context=TestDeployVirtioSCSIVM>:teardown | `Error` | 50.80 | test_deploy_virtio_scsi_vm.py
   test_01_deploy_vm_from_direct_download_template_nfs_storage | `Error` | 37.60 | test_direct_download.py
   ContextSuite context=TestDirectDownloadTemplates>:teardown | `Error` | 1.10 | test_direct_download.py
   ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 99.13 | test_kubernetes_clusters.py
   test_01_non_strict_host_anti_affinity | `Error` | 3.58 | test_nonstrict_affinity_group.py
   test_02_non_strict_host_affinity | `Error` | 3.60 | test_nonstrict_affinity_group.py
   ContextSuite context=TestStorageTags>:teardown | `Error` | 225.51 | test_primary_storage.py
   runTest | `Error` | 0.00 | test_reset_vm_on_reboot.py
   runTest | `Error` | 0.00 | test_reset_vm_on_reboot.py
   test_01_so_removal_resource_update | `Error` | 148.78 | test_resource_accounting.py
   ContextSuite context=TestResourceNames>:teardown | `Error` | 31.37 | test_resource_names.py
   ContextSuite context=TestCpuCapServiceOfferings>:teardown | `Error` | 37.76 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:teardown | `Error` | 177.12 | test_service_offerings.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 114.28 | test_templates.py
   ContextSuite context=TestPublicIPUsage>:teardown | `Error` | 1.19 | test_usage.py
   ContextSuite context=TestTemplateUsage>:teardown | `Error` | 27.08 | test_usage.py
   ContextSuite context=TestVolumeUsage>:teardown | `Error` | 215.97 | test_usage.py
   ContextSuite context=TestDeployVM>:teardown | `Error` | 150.23 | test_vm_life_cycle.py
   test_01_secure_vm_migration | `Error` | 374.69 | test_vm_life_cycle.py
   ContextSuite context=TestSecuredVmMigration>:teardown | `Error` | 43.31 | test_vm_life_cycle.py
   ContextSuite context=TestVMSchedule>:teardown | `Error` | 371.73 | test_vm_schedule.py
   test_08_resize_volume | `Error` | 124.22 | test_volumes.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1726971361


##########
test/integration/component/test_acl_listvolume.py:
##########
@@ -340,8 +340,19 @@ def setUpClass(cls):
             cls.vm_a_volume = Volume.list(cls.apiclient, virtualmachineid=cls.vm_a.id)
 
             cls.cleanup = [
+                cls.vm_d1,
+                cls.vm_d1a,
+                cls.vm_d1b,
+                cls.vm_d11,
+                cls.vm_d11a,
+                cls.vm_d11b,
+                cls.vm_d111a,
+                cls.vm_d12a,
+                cls.vm_d12b,
+                cls.vm_d2,
+                cls.vm_a
                 cls.account_a,
-                cls.service_offering,
+                cls.service_offering

Review Comment:
   better have these added directly after the respective creates, otherwise no cleaning will happen on exceptions.



##########
test/integration/component/test_cpu_max_limits.py:
##########
@@ -317,9 +316,11 @@ def test_04_deployVm__account_limit_reached(self):
 
         self.debug("Deploying instance with account: %s" %
                    self.child_do_admin.name)
-        self.createInstance(account=self.child_do_admin,
+        self.vm2 = self.createInstance(account=self.child_do_admin,
             service_off=self.service_offering, api_client=api_client_admin)
-
+# Adding to cleanup list after execution
+        self.cleanup.append(self.vm2)
+        self.cleanup.append(self.service_offering)

Review Comment:
   see above



##########
test/integration/smoke/test_console_endpoint.py:
##########
@@ -69,8 +69,8 @@ def setUpClass(cls):
         )
 
         cls._cleanup = [
-            cls.service_offering,
             cls.vm1,
+            cls.service_offering,

Review Comment:
   here too, better append as you go and call super().tearDown()



##########
test/integration/smoke/test_primary_storage.py:
##########
@@ -479,6 +478,8 @@ def setUpClass(cls):
                 hypervisor=cls.hypervisor,
                 mode=cls.zone.networktype
             )
+            cls._cleanup.append(cls.virtual_machine_1)
+            cls._cleanup.append(cls.service_offering_1)

Review Comment:
   again, should not happen here, look at the tearDownClass implementation



##########
test/integration/smoke/test_affinity_groups.py:
##########
@@ -240,6 +251,14 @@ def test_DeployVmAffinityGroup(self):
         self.assertEqual(host_of_vm1, host_of_vm2,
             msg="Both VMs of affinity group %s are on different hosts" % self.affinity.name)
 
+
+    def tearDown(self):
+        try:
+            # Clean up, terminate the created instance, volumes and snapshots
+            cleanup_resources(self.apiclient, self.cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)

Review Comment:
   ```suggestion
       def tearDown(self):
           super(<cls-name>, self).tearDown()
   ```
   (replace \<cls-name\> !)



##########
test/integration/smoke/test_primary_storage.py:
##########
@@ -336,6 +335,7 @@ def test_01_add_primary_storage_disabled_host(self):
                     serviceofferingid=service_offering.id
                 )
                 self.cleanup.append(self.virtual_machine)
+                self.cleanup.append(service_offering)

Review Comment:
   should not be happening here. You are probably doing this because the teardown implementation is no good 



##########
test/integration/component/test_network_offering.py:
##########
@@ -1449,14 +1449,16 @@ def test_create_network_with_snat(self):
 
         self.debug("Deploying VM in account: %s on the network %s" % (self.account.name, self.network.id))
         # Spawn an instance in that network
-        VirtualMachine.create(
+        self.vm1 = VirtualMachine.create(
             self.apiclient,
             self.services["virtual_machine"],
             accountid=self.account.name,
             domainid=self.account.domainid,
             serviceofferingid=self.service_offering.id,
             networkids=[str(self.network.id)]
         )
+        self.cleanup.append(self.vm1)
+        self.cleanup.append(self.network)

Review Comment:
   this should move up and the tearDownClass method implementation should call super(..)
   better clean the cleanup up ;)
   cls._cleanup and self.cleanup
   



##########
test/integration/smoke/test_resource_accounting.py:
##########
@@ -222,6 +218,8 @@ def test_01_so_removal_resource_update(self):
 
         self.debug("Deployed VM in account: %s, ID: %s" % (self.account.name, vm_2.id))
         self.cleanup.append(vm_2)
+        self.cleanup.append(self.service_offering_it_1)
+        self.cleanup.append(self.service_offering_it_2)

Review Comment:
   nooooo, ;) look at the tearDown methods



##########
test/integration/smoke/test_backup_recovery_dummy.py:
##########
@@ -62,7 +62,7 @@ def setUpClass(cls):
         cls.vm = VirtualMachine.create(cls.api_client, cls.services["small"], accountid=cls.account.name,
                                        domainid=cls.account.domainid, serviceofferingid=cls.offering.id,
                                        mode=cls.services["mode"])
-        cls._cleanup = [cls.offering, cls.account]
+        cls._cleanup = [cls.vm, cls.offering, cls.account]

Review Comment:
   scary, better append as you go



##########
test/integration/smoke/test_reset_vm_on_reboot.py:
##########
@@ -76,6 +76,7 @@ def setUpClass(cls):
             mode=cls.services["mode"]
         )
         cls._cleanup = [
+            cls.virtual_machine

Review Comment:
   scary



##########
test/integration/component/test_cpu_max_limits.py:
##########
@@ -242,8 +241,10 @@ def test_02_deploy_vm_account_limit_reached(self):
         self.debug("Deploying instance with account: %s" %
                    self.child_do_admin.name)
 
-        self.createInstance(account=self.child_do_admin,
+        self.vm1 = self.createInstance(account=self.child_do_admin,
             service_off=self.service_offering, api_client=api_client_admin)
+        self.cleanup.append(self.vm1)
+        self.cleanup.append(self.service_offering)

Review Comment:
   seems like this should happen inside the `self.createInstance(..)` call



##########
tools/marvin/setup.py:
##########
@@ -27,7 +27,7 @@
         raise RuntimeError("python setuptools is required to build Marvin")
 
 
-VERSION = "4.20.0.0-SNAPSHOT"
+VERSION = "4.20.0.0"

Review Comment:
   please remove this from your PR



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2299358280

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2310278297

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "vishesh92 (via GitHub)" <gi...@apache.org>.
vishesh92 commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1722855324


##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -3547,6 +3547,8 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
 
         if (state != null) {
             sc.setParameters("state", state);
+        } else {
+            sc.setParameters("state", Arrays.asList(ServiceOffering.State.Active, ServiceOffering.State.Inactive));

Review Comment:
   Why do we need this condition?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1723485912


##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -3547,6 +3547,8 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
 
         if (state != null) {
             sc.setParameters("state", state);
+        } else {
+            sc.setParameters("state", Arrays.asList(ServiceOffering.State.Active, ServiceOffering.State.Inactive));

Review Comment:
   in case we don't specify what offering is required , this would list offerings in both active and inactive states



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2321447078

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2330553334

   This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2341287628

   Most test failures seems not related to this PR:
   
   |       Test                                                               |         Reason                                                 |
   |----------------------------------------------------------------|-----------------------------------------------------------|
   | test_primary_storage.py                                      |  Failed to add data store: Storage pool nfs2 already in use by another pod |
   | test_vm_deployment_planner.py                        | ol8.localdomain is not in the right state
   | test_vm_life_cycle                                              | ol8.localdomain is not in the right state Or Unable to deploy the VM as the host: ol8.localdomain is not in the right state or TypeError: object of type 'NoneType' has no len() |
   | test_vm_strict_host_tags                                    | Unable to deploy the VM as the host: ol8.localdomain is not in the right stat |                                                                               


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2310407487

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1723745815


##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -3913,8 +3915,7 @@ private Pair<List<Long>, Integer> searchForServiceOfferingIdsAndCount(ListServic
             }
 
             serviceOfferingSearch.join("diskOfferingSearch", diskOfferingSearch, JoinBuilder.JoinType.INNER, JoinBuilder.JoinCondition.AND,
-                    serviceOfferingSearch.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId(),
-                    serviceOfferingSearch.entity().setString("Active"), diskOfferingSearch.entity().getState());
+                    serviceOfferingSearch.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId());

Review Comment:
   Since this PR aims to support disabling service offerings - to make it similar to the way network offerings work, it would make sense to list active and inactive offerings 



##########
engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java:
##########
@@ -325,6 +326,10 @@ protected void init() {
         VmsNotInClusterUsingPool.join("hostSearch2", hostSearch2, hostSearch2.entity().getId(), VmsNotInClusterUsingPool.entity().getHostId(), JoinType.INNER);
         VmsNotInClusterUsingPool.and("vmStates", VmsNotInClusterUsingPool.entity().getState(), Op.IN);
         VmsNotInClusterUsingPool.done();
+
+        ServiceOfferingSearch = createSearchBuilder();
+        ServiceOfferingSearch.and("serviceOfferingId", ServiceOfferingSearch.entity().getServiceOfferingId(), Op.EQ);
+        BackupSearch.done();

Review Comment:
   You're right



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1728676493


##########
test/integration/component/test_cpu_max_limits.py:
##########
@@ -242,8 +242,9 @@ def test_02_deploy_vm_account_limit_reached(self):
         self.debug("Deploying instance with account: %s" %
                    self.child_do_admin.name)
 
-        self.createInstance(account=self.child_do_admin,
+        self.vm1 = self.createInstance(account=self.child_do_admin,
             service_off=self.service_offering, api_client=api_client_admin)
+        self.cleanup.append(self.service_offering)

Review Comment:
   @Pearl1594 , why are you adding the offering to the cleanu[p list here?
   It should be added right after creation and the tearDown method at line 75 should be fixed to use the parent implementation.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2324319936

   @blueorangutan test


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2309750082

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1731250435


##########
test/integration/component/test_network_offering.py:
##########
@@ -1395,12 +1395,10 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        try:
-            #Cleanup resources used
-            cleanup_resources(cls.apiclient, cls.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestNOWithOnlySourceNAT, cls).tearDownClass()

Review Comment:
   it is in the names of the variables `_cleanup` and `cleanup` @Pearl1594 !



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2297400276

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2312032591

   <b>[SF] Trillian test result (tid-11191)</b>
   Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
   Total time taken: 60134 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11191-kvm-ol8.zip
   Smoke tests completed. 125 look OK, 14 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_deploy_vm_from_direct_download_template_nfs_storage | `Error` | 39.57 | test_direct_download.py
   ContextSuite context=TestDirectDownloadTemplates>:teardown | `Error` | 1.10 | test_direct_download.py
   ContextSuite context=TestConsoleEndpoint>:setup | `Error` | 0.00 | test_console_endpoint.py
   ContextSuite context=TestDeployVirtioSCSIVM>:teardown | `Error` | 54.95 | test_deploy_virtio_scsi_vm.py
   test_01_add_primary_storage_disabled_host | `Error` | 0.26 | test_primary_storage.py
   test_03_migration_options_storage_tags | `Error` | 0.02 | test_primary_storage.py
   ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
   ContextSuite context=TestResourceNames>:teardown | `Error` | 41.74 | test_resource_names.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 2.85 | test_service_offerings.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 9.67 | test_snapshots.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 9.67 | test_snapshots.py
   ContextSuite context=TestCopyAndDeleteTemplatesAcrossZones>:teardown | `Error` | 14.59 | test_templates.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 108.74 | test_templates.py
   ContextSuite context=TestLBRuleUsage>:setup | `Error` | 4.88 | test_usage.py
   ContextSuite context=TestNatRuleUsage>:setup | `Error` | 7.37 | test_usage.py
   test_01_deploy_vm_on_specific_host | `Error` | 0.09 | test_vm_deployment_planner.py
   test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.14 | test_vm_deployment_planner.py
   test_01_migrate_VM_and_root_volume | `Error` | 91.52 | test_vm_life_cycle.py
   test_02_migrate_VM_with_two_data_disks | `Error` | 51.08 | test_vm_life_cycle.py
   test_01_secure_vm_migration | `Error` | 291.89 | test_vm_life_cycle.py
   test_08_migrate_vm | `Error` | 0.07 | test_vm_life_cycle.py
   test_01_migrate_vm_strict_tags_success | `Error` | 0.30 | test_vm_strict_host_tags.py
   test_02_migrate_vm_strict_tags_failure | `Error` | 0.25 | test_vm_strict_host_tags.py
   test_01_restore_vm_strict_tags_success | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_02_restore_vm_strict_tags_failure | `Error` | 0.30 | test_vm_strict_host_tags.py
   test_01_scale_vm_strict_tags_success | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_02_scale_vm_strict_tags_failure | `Error` | 0.30 | test_vm_strict_host_tags.py
   test_01_deploy_vm_on_specific_host_without_strict_tags | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_02_deploy_vm_on_any_host_without_strict_tags | `Error` | 2.61 | test_vm_strict_host_tags.py
   test_03_deploy_vm_on_specific_host_with_strict_tags_success | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_04_deploy_vm_on_any_host_with_strict_tags_success | `Error` | 5.70 | test_vm_strict_host_tags.py
   test_05_deploy_vm_on_specific_host_with_strict_tags_failure | `Failure` | 0.29 | test_vm_strict_host_tags.py
   test_08_resize_volume | `Error` | 125.21 | test_volumes.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2312055994

   <b>[SF] Trillian test result (tid-11193)</b>
   Environment: vmware-70u3 (x2), Advanced Networking with Mgmt server ol8
   Total time taken: 60998 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11193-vmware-70u3.zip
   Smoke tests completed. 124 look OK, 15 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestConsoleEndpoint>:setup | `Error` | 0.00 | test_console_endpoint.py
   test_01_deployVMInSharedNetwork | `Error` | 323.24 | test_network.py
   test_01_add_primary_storage_disabled_host | `Error` | 0.25 | test_primary_storage.py
   test_03_migration_options_storage_tags | `Error` | 0.02 | test_primary_storage.py
   ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
   ContextSuite context=TestResourceNames>:teardown | `Error` | 44.87 | test_resource_names.py
   test_02_restore_vm_with_disk_offering | `Error` | 56.27 | test_restore_vm.py
   test_03_restore_vm_with_disk_offering_custom_size | `Error` | 55.21 | test_restore_vm.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 8.13 | test_service_offerings.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 8.60 | test_snapshots.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 8.61 | test_snapshots.py
   ContextSuite context=TestCopyAndDeleteTemplatesAcrossZones>:teardown | `Error` | 27.98 | test_templates.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 130.59 | test_templates.py
   ContextSuite context=TestLBRuleUsage>:setup | `Error` | 5.04 | test_usage.py
   ContextSuite context=TestNatRuleUsage>:setup | `Error` | 7.78 | test_usage.py
   test_01_deploy_vm_on_specific_host | `Error` | 0.10 | test_vm_deployment_planner.py
   test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.13 | test_vm_deployment_planner.py
   test_03_live_migrate_VM_with_two_data_disks | `Error` | 67.43 | test_vm_life_cycle.py
   test_08_migrate_vm | `Error` | 0.07 | test_vm_life_cycle.py
   ContextSuite context=TestChangeServiceOfferingForVmWithSnapshots>:teardown | `Error` | 435.07 | test_vm_snapshots.py
   test_03_delete_vm_snapshots | `Failure` | 272.23 | test_vm_snapshots.py
   test_01_migrate_vm_strict_tags_success | `Error` | 0.30 | test_vm_strict_host_tags.py
   test_02_migrate_vm_strict_tags_failure | `Error` | 0.30 | test_vm_strict_host_tags.py
   test_01_restore_vm_strict_tags_success | `Error` | 0.34 | test_vm_strict_host_tags.py
   test_02_restore_vm_strict_tags_failure | `Error` | 0.35 | test_vm_strict_host_tags.py
   test_01_scale_vm_strict_tags_success | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_02_scale_vm_strict_tags_failure | `Error` | 0.37 | test_vm_strict_host_tags.py
   test_01_deploy_vm_on_specific_host_without_strict_tags | `Error` | 0.27 | test_vm_strict_host_tags.py
   test_02_deploy_vm_on_any_host_without_strict_tags | `Error` | 5.83 | test_vm_strict_host_tags.py
   test_03_deploy_vm_on_specific_host_with_strict_tags_success | `Error` | 0.27 | test_vm_strict_host_tags.py
   test_04_deploy_vm_on_any_host_with_strict_tags_success | `Error` | 5.79 | test_vm_strict_host_tags.py
   test_05_deploy_vm_on_specific_host_with_strict_tags_failure | `Failure` | 0.27 | test_vm_strict_host_tags.py
   test_08_resize_volume | `Error` | 9.66 | test_volumes.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2309589357

   @DaanHoogland a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2310571615

   @DaanHoogland a [SL] Trillian-Jenkins matrix job (EL8 mgmt + EL8 KVM, Ubuntu22 mgmt + Ubuntu22 KVM, EL8 mgmt + VMware 7.0u3, EL9 mgmt + XCP-ng 8.2 ) has been kicked to run smoke tests


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2342569779

   @blueorangutan test


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2321865394

   @blueorangutan test matrix


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2324324336

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "kiranchavala (via GitHub)" <gi...@apache.org>.
kiranchavala commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2304544672

   @Pearl1594  except the smoke test failures, the pr looks good


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "JoaoJandre (via GitHub)" <gi...@apache.org>.
JoaoJandre commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1723774550


##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -3913,8 +3915,7 @@ private Pair<List<Long>, Integer> searchForServiceOfferingIdsAndCount(ListServic
             }
 
             serviceOfferingSearch.join("diskOfferingSearch", diskOfferingSearch, JoinBuilder.JoinType.INNER, JoinBuilder.JoinCondition.AND,
-                    serviceOfferingSearch.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId(),
-                    serviceOfferingSearch.entity().setString("Active"), diskOfferingSearch.entity().getState());
+                    serviceOfferingSearch.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId());

Review Comment:
   This method is too long (500+ lines...) for me to judge what it is exactly doing and where it is being done. 
   I just want to make sure that when creating VMs we don't list inactive offerings. If this change does not cause that, then I'm ok.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1731068544


##########
test/integration/component/test_network_offering.py:
##########
@@ -1395,12 +1395,10 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        try:
-            #Cleanup resources used
-            cleanup_resources(cls.apiclient, cls.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestNOWithOnlySourceNAT, cls).tearDownClass()

Review Comment:
   @Pearl1594 , the class level cleanup array should be called `_cleanup`, it is now called `cleanup` and will be cleaned up at the instance level `tearDown()` method I think. Better rename it.
   
   class scope methods should use `_cleanup` and instance scope methods (i.e. the test methods) should use `cleanup`



##########
test/integration/smoke/test_affinity_groups.py:
##########
@@ -107,6 +111,8 @@ def test_DeployVmAntiAffinityGroup(self):
             affinitygroupnames=[self.ag.name]
         )
 
+        self.cleanup.append(vm1)
+

Review Comment:
   ```suggestion
           self.cleanup.append(vm1)
   
   ```



##########
test/integration/smoke/test_affinity_groups.py:
##########
@@ -183,6 +191,7 @@ def test_DeployVmAffinityGroup(self):
             affinitygroupnames=[self.affinity.name]
         )
 
+        self.cleanup.append(vm1)

Review Comment:
   ```suggestion
           self.cleanup.append(vm1)
   
   ```



##########
test/integration/component/test_cpu_max_limits.py:
##########
@@ -229,8 +230,8 @@ def test_02_deploy_vm_account_limit_reached(self):
             self.apiclient,
             self.testdata["service_offering_multiple_cores"]
         )
-        # Adding to cleanup list after execution
         self.cleanup.append(self.service_offering)
+        # Adding to cleanup list after execution

Review Comment:
   ```suggestion
   ```



##########
test/integration/smoke/test_primary_storage.py:
##########
@@ -479,6 +478,8 @@ def setUpClass(cls):
                 hypervisor=cls.hypervisor,
                 mode=cls.zone.networktype
             )
+            cls._cleanup.append(cls.virtual_machine_1)
+            cls._cleanup.append(cls.service_offering_1)

Review Comment:
   maybe
   ```suggestion
               cls._cleanup.append(cls.virtual_machine_1)
   ```
    was meant?



##########
test/integration/smoke/test_backup_recovery_dummy.py:
##########
@@ -74,10 +76,8 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
+        super(TestDummyBackupAndRecovery, cls).tearDownClass()
         try:

Review Comment:
   ```suggestion
           try:
               super(TestDummyBackupAndRecovery, cls).tearDownClass()
   ```
   
   If we fail at cleaning entities we still want to cleanup the settings as much as we can..



##########
test/integration/smoke/test_templates.py:
##########
@@ -560,6 +561,7 @@ def setUpClass(cls):
                                          domainid=cls.account.domainid
                                          )
         cls._cleanup = [
+                        cls.virtual_machine,

Review Comment:
   again, it'll work but better adhere to the generic cleanup structure



##########
test/integration/smoke/test_scale_vm.py:
##########
@@ -211,7 +211,6 @@ def test_01_scale_vm(self):
             serviceofferingid=self.small_offering.id,
             mode=self.services["mode"]
         )

Review Comment:
   ```suggestion
           )
           self.cleanup.append(self.virtual_machine)
   ```
   the line below should not be deleted



##########
test/integration/smoke/test_affinity_groups.py:
##########
@@ -215,6 +224,8 @@ def test_DeployVmAffinityGroup(self):
             serviceofferingid=self.service_offering.id,
             affinitygroupnames=[self.affinity.name]
         )
+
+        self.cleanup.append(vm2)

Review Comment:
   ```suggestion
           self.cleanup.append(vm2)
   
   ```



##########
test/integration/smoke/test_affinity_groups.py:
##########
@@ -139,6 +145,8 @@ def test_DeployVmAntiAffinityGroup(self):
             serviceofferingid=self.service_offering.id,
             affinitygroupnames=[self.ag.name]
         )
+
+        self.cleanup.append(vm2)

Review Comment:
   ```suggestion
           self.cleanup.append(vm2)
   
   ```



##########
test/integration/smoke/test_vm_life_cycle.py:
##########
@@ -120,6 +120,12 @@ def setUpClass(cls):
             mode=cls.services['mode']
         )
 
+        cls.cleanup = [
+            cls.virtual_machine,
+            cls.service_offering,
+            cls.account
+        ]

Review Comment:
   a `cleanup` at cls level does not seem right. There is already a `cls._cleanup` and that should be used in this case.



##########
test/integration/smoke/test_direct_download.py:
##########
@@ -305,6 +305,7 @@ def test_01_deploy_vm_from_direct_download_template_nfs_storage(self):
         nfs_storage_offering = self.createServiceOffering("TestNFSStorageDirectDownload", "shared", test_tag)
 
         vm = self.deployVM(nfs_storage_offering)
+        self.cleanup.append(vm)

Review Comment:
   this should have already happened in `deployVM()`
   ```suggestion
   ```



##########
test/integration/smoke/test_service_offerings.py:
##########
@@ -1014,6 +999,7 @@ def getHost(self, hostId=None):
 
         )
         cls._cleanup = [
+            cls.vm,

Review Comment:
   this will work, but adhering to the structure of letting the parent class do the cleanup won't work this way. Better refactor.



##########
test/integration/smoke/test_scale_vm.py:
##########
@@ -259,6 +258,7 @@ def test_01_scale_vm(self):
                 offering_data
             )
             self.cleanup.append(self.bigger_offering)
+            self.cleanup.append(self.virtual_machine)

Review Comment:
   ```suggestion
   ```



##########
test/integration/smoke/test_scale_vm.py:
##########
@@ -599,7 +599,7 @@ def test_04_scale_vm_with_user_account(self):
             self.cleanup.append(self.bigger_offering)
         else:
             self.bigger_offering = self.big_offering
-
+        self.cleanup.append(self.virtual_machine_in_user_account)

Review Comment:
   this seems out of place and the assignment and appending of `self.big_offering` also looks iffy. Note that `self.big_offering` is obfuscating `cls.big_offering` but `self.cleanup.big_offering` is not obfuscating `cls._cleanup.big_offering` (and it shouldn't)
   ```suggestion
   ```
   this line should move up to just below line 551



##########
test/integration/smoke/test_primary_storage.py:
##########
@@ -438,7 +432,6 @@ def setUpClass(cls):
                 cls.services["service_offerings"]["tiny"],
                 tags=cls.services["storage_tags"]["a"]
             )
-            cls._cleanup.append(cls.service_offering_1)

Review Comment:
   shouldn't be removed



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2321450784

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2322911185

   Seems like quite a few of the test failures weren't related to the changes of the PR


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2305190763

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2299157849

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "vishesh92 (via GitHub)" <gi...@apache.org>.
vishesh92 commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1722861427


##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -3547,6 +3547,8 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
 
         if (state != null) {
             sc.setParameters("state", state);
+        } else {
+            sc.setParameters("state", Arrays.asList(ServiceOffering.State.Active, ServiceOffering.State.Inactive));

Review Comment:
   Why is this required?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2344662815

   <b>[SF] Trillian test result (tid-11442)</b>
   Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
   Total time taken: 57914 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11442-kvm-ol8.zip
   Smoke tests completed. 131 look OK, 10 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestClusterDRS>:setup | `Error` | 0.00 | test_cluster_drs.py
   ContextSuite context=TestDeployVirtioSCSIVM>:teardown | `Error` | 50.78 | test_deploy_virtio_scsi_vm.py
   test_01_add_primary_storage_disabled_host | `Error` | 0.22 | test_primary_storage.py
   test_03_migration_options_storage_tags | `Error` | 0.02 | test_primary_storage.py
   ContextSuite context=TestResourceNames>:teardown | `Error` | 41.62 | test_resource_names.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:teardown | `Error` | 152.94 | test_service_offerings.py
   ContextSuite context=TestSharedFSLifecycle>:teardown | `Error` | 69.99 | test_sharedfs_lifecycle.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 0.00 | test_snapshots.py
   test_01_deploy_vm_on_specific_host | `Error` | 0.09 | test_vm_deployment_planner.py
   test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.12 | test_vm_deployment_planner.py
   test_01_migrate_VM_and_root_volume | `Error` | 95.41 | test_vm_life_cycle.py
   test_02_migrate_VM_with_two_data_disks | `Error` | 52.71 | test_vm_life_cycle.py
   test_01_secure_vm_migration | `Error` | 316.39 | test_vm_life_cycle.py
   test_02_unsecure_vm_migration | `Error` | 340.06 | test_vm_life_cycle.py
   test_04_nonsecured_to_secured_vm_migration | `Error` | 268.43 | test_vm_life_cycle.py
   test_08_migrate_vm | `Error` | 0.07 | test_vm_life_cycle.py
   test_01_migrate_vm_strict_tags_success | `Error` | 0.27 | test_vm_strict_host_tags.py
   test_02_migrate_vm_strict_tags_failure | `Error` | 0.24 | test_vm_strict_host_tags.py
   test_01_restore_vm_strict_tags_success | `Error` | 0.23 | test_vm_strict_host_tags.py
   test_02_restore_vm_strict_tags_failure | `Error` | 0.24 | test_vm_strict_host_tags.py
   test_01_scale_vm_strict_tags_success | `Error` | 0.25 | test_vm_strict_host_tags.py
   test_02_scale_vm_strict_tags_failure | `Error` | 0.27 | test_vm_strict_host_tags.py
   test_01_deploy_vm_on_specific_host_without_strict_tags | `Error` | 0.18 | test_vm_strict_host_tags.py
   test_02_deploy_vm_on_any_host_without_strict_tags | `Error` | 2.57 | test_vm_strict_host_tags.py
   test_03_deploy_vm_on_specific_host_with_strict_tags_success | `Error` | 0.23 | test_vm_strict_host_tags.py
   test_04_deploy_vm_on_any_host_with_strict_tags_success | `Error` | 5.62 | test_vm_strict_host_tags.py
   test_05_deploy_vm_on_specific_host_with_strict_tags_failure | `Failure` | 0.21 | test_vm_strict_host_tags.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2305364424

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2305363687

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2306869474

   <b>[SF] Trillian test result (tid-11147)</b>
   Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
   Total time taken: 54538 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11147-kvm-ol8.zip
   Smoke tests completed. 130 look OK, 9 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_deploy_vm_from_direct_download_template_nfs_storage | `Error` | 39.70 | test_direct_download.py
   ContextSuite context=TestDirectDownloadTemplates>:teardown | `Error` | 1.09 | test_direct_download.py
   runTest | `Error` | 0.00 | test_deploy_virtio_scsi_vm.py
   runTest | `Error` | 0.00 | test_deploy_virtio_scsi_vm.py
   ContextSuite context=TestResourceNames>:teardown | `Error` | 31.34 | test_resource_names.py
   ContextSuite context=TestServiceOfferings>:teardown | `Error` | 177.00 | test_service_offerings.py
   ContextSuite context=TestCopyAndDeleteTemplatesAcrossZones>:teardown | `Error` | 12.49 | test_templates.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 108.83 | test_templates.py
   ContextSuite context=TestTemplateUsage>:teardown | `Error` | 25.12 | test_usage.py
   ContextSuite context=TestVolumeUsage>:teardown | `Error` | 210.80 | test_usage.py
   ContextSuite context=TestVpnUsage>:teardown | `Error` | 27.27 | test_usage.py
   ContextSuite context=TestDeployVM>:teardown | `Error` | 149.87 | test_vm_life_cycle.py
   ContextSuite context=TestVMSchedule>:teardown | `Error` | 251.09 | test_vm_schedule.py
   ContextSuite context=TestVolumes>:setup | `Error` | 426.93 | test_volumes.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2309983704

   @Pearl1594 , sorry to keep bugging you, you draw the short straw. these tests really need to be cleanup up to make them work properly.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2299723269

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2299805109

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "nvazquez (via GitHub)" <gi...@apache.org>.
nvazquez commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1722349605


##########
api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java:
##########
@@ -111,14 +109,7 @@ public String getStorageType() {
     }
 
     public State getState() {
-        if (StringUtils.isBlank(diskOfferingState)) {
-            return Active;
-        }
-        State state = EnumUtils.getEnumIgnoreCase(State.class, diskOfferingState);
-        if (!diskOfferingState.equalsIgnoreCase("all") && state == null) {

Review Comment:
   Are these checks not relevant anymore?



##########
api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java:
##########
@@ -157,14 +154,7 @@ public String getStorageType() {
     }
 
     public State getState() {
-        if (StringUtils.isBlank(serviceOfferingState)) {
-            return Active;
-        }
-        State state = EnumUtils.getEnumIgnoreCase(State.class, serviceOfferingState);
-        if (!serviceOfferingState.equalsIgnoreCase("all") && state == null) {

Review Comment:
   Same here



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2341746943

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2341895598

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1731252368


##########
test/integration/smoke/test_affinity_groups.py:
##########
@@ -139,6 +145,8 @@ def test_DeployVmAntiAffinityGroup(self):
             serviceofferingid=self.service_offering.id,
             affinitygroupnames=[self.ag.name]
         )
+
+        self.cleanup.append(vm2)

Review Comment:
   just estetical move the blank line down one



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "JoaoJandre (via GitHub)" <gi...@apache.org>.
JoaoJandre commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1723774550


##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -3913,8 +3915,7 @@ private Pair<List<Long>, Integer> searchForServiceOfferingIdsAndCount(ListServic
             }
 
             serviceOfferingSearch.join("diskOfferingSearch", diskOfferingSearch, JoinBuilder.JoinType.INNER, JoinBuilder.JoinCondition.AND,
-                    serviceOfferingSearch.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId(),
-                    serviceOfferingSearch.entity().setString("Active"), diskOfferingSearch.entity().getState());
+                    serviceOfferingSearch.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId());

Review Comment:
   This method is too long (500+ lines...) for me to judge what it is exactly doing when. 
   I just want to make sure that when creating VMs we don't list inactive offerings. If this change does not cause that, then I'm ok.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2306070279

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2306069982

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1722369998


##########
api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java:
##########
@@ -157,14 +154,7 @@ public String getStorageType() {
     }
 
     public State getState() {
-        if (StringUtils.isBlank(serviceOfferingState)) {
-            return Active;
-        }
-        State state = EnumUtils.getEnumIgnoreCase(State.class, serviceOfferingState);
-        if (!serviceOfferingState.equalsIgnoreCase("all") && state == null) {

Review Comment:
   I just made this uniform to how it works with listing network and vpc offerings ; wherein when the state isn't passed, we list all offerings - so we do not explicitly need "all"



##########
api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java:
##########
@@ -111,14 +109,7 @@ public String getStorageType() {
     }
 
     public State getState() {
-        if (StringUtils.isBlank(diskOfferingState)) {
-            return Active;
-        }
-        State state = EnumUtils.getEnumIgnoreCase(State.class, diskOfferingState);
-        if (!diskOfferingState.equalsIgnoreCase("all") && state == null) {

Review Comment:
   
   
   I just made this uniform to how it works with listing network and vpc offerings ; wherein when the state isn't passed, we list all offerings - so we do not explicitly need "all"
   



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "vishesh92 (via GitHub)" <gi...@apache.org>.
vishesh92 commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1722855324


##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -3547,6 +3547,8 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
 
         if (state != null) {
             sc.setParameters("state", state);
+        } else {
+            sc.setParameters("state", Arrays.asList(ServiceOffering.State.Active, ServiceOffering.State.Inactive));

Review Comment:
   Why do we need this condition?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2322813998

   <b>[SF] Trillian test result (tid-11261)</b>
   Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
   Total time taken: 51816 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11261-kvm-ol8.zip
   Smoke tests completed. 130 look OK, 9 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestDeployVirtioSCSIVM>:teardown | `Error` | 52.94 | test_deploy_virtio_scsi_vm.py
   test_01_deploy_vm_from_direct_download_template_nfs_storage | `Error` | 37.58 | test_direct_download.py
   ContextSuite context=TestDirectDownloadTemplates>:teardown | `Error` | 1.10 | test_direct_download.py
   test_01_add_primary_storage_disabled_host | `Error` | 0.27 | test_primary_storage.py
   test_03_migration_options_storage_tags | `Error` | 0.02 | test_primary_storage.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 3.12 | test_service_offerings.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 9.67 | test_snapshots.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 9.68 | test_snapshots.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 117.34 | test_templates.py
   test_01_deploy_vm_on_specific_host | `Error` | 0.10 | test_vm_deployment_planner.py
   test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.13 | test_vm_deployment_planner.py
   test_01_migrate_VM_and_root_volume | `Error` | 93.59 | test_vm_life_cycle.py
   test_02_migrate_VM_with_two_data_disks | `Error` | 51.99 | test_vm_life_cycle.py
   test_01_secure_vm_migration | `Error` | 144.61 | test_vm_life_cycle.py
   test_01_secure_vm_migration | `Error` | 144.62 | test_vm_life_cycle.py
   test_02_unsecure_vm_migration | `Error` | 0.02 | test_vm_life_cycle.py
   test_03_secured_to_nonsecured_vm_migration | `Error` | 0.02 | test_vm_life_cycle.py
   test_04_nonsecured_to_secured_vm_migration | `Error` | 0.02 | test_vm_life_cycle.py
   test_08_migrate_vm | `Error` | 0.07 | test_vm_life_cycle.py
   test_01_migrate_vm_strict_tags_success | `Error` | 0.27 | test_vm_strict_host_tags.py
   test_02_migrate_vm_strict_tags_failure | `Error` | 0.29 | test_vm_strict_host_tags.py
   test_01_restore_vm_strict_tags_success | `Error` | 0.33 | test_vm_strict_host_tags.py
   test_02_restore_vm_strict_tags_failure | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_01_scale_vm_strict_tags_success | `Error` | 0.29 | test_vm_strict_host_tags.py
   test_02_scale_vm_strict_tags_failure | `Error` | 0.30 | test_vm_strict_host_tags.py
   test_01_deploy_vm_on_specific_host_without_strict_tags | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_02_deploy_vm_on_any_host_without_strict_tags | `Error` | 3.68 | test_vm_strict_host_tags.py
   test_03_deploy_vm_on_specific_host_with_strict_tags_success | `Error` | 0.29 | test_vm_strict_host_tags.py
   test_04_deploy_vm_on_any_host_with_strict_tags_success | `Error` | 3.68 | test_vm_strict_host_tags.py
   test_05_deploy_vm_on_specific_host_with_strict_tags_failure | `Failure` | 0.27 | test_vm_strict_host_tags.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2322853122

   <b>[SF] Trillian test result (tid-11262)</b>
   Environment: kvm-ubuntu22 (x2), Advanced Networking with Mgmt server u22
   Total time taken: 62280 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11262-kvm-ubuntu22.zip
   Smoke tests completed. 128 look OK, 11 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestDeployVirtioSCSIVM>:teardown | `Error` | 44.88 | test_deploy_virtio_scsi_vm.py
   test_01_deploy_vm_from_direct_download_template_nfs_storage | `Error` | 35.53 | test_direct_download.py
   ContextSuite context=TestDirectDownloadTemplates>:teardown | `Error` | 1.11 | test_direct_download.py
   test_01_add_primary_storage_disabled_host | `Error` | 0.27 | test_primary_storage.py
   test_03_migration_options_storage_tags | `Error` | 0.02 | test_primary_storage.py
   test_02_create_volume | `Error` | 20.92 | test_resource_names.py
   test_02_create_volume | `Error` | 20.93 | test_resource_names.py
   ContextSuite context=TestResourceNames>:teardown | `Error` | 41.72 | test_resource_names.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 3.15 | test_service_offerings.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 10.69 | test_snapshots.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 10.69 | test_snapshots.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 141.14 | test_templates.py
   test_01_deploy_vm_on_specific_host | `Error` | 0.09 | test_vm_deployment_planner.py
   test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.14 | test_vm_deployment_planner.py
   test_01_migrate_VM_and_root_volume | `Error` | 103.01 | test_vm_life_cycle.py
   test_02_migrate_VM_with_two_data_disks | `Error` | 55.17 | test_vm_life_cycle.py
   test_01_secure_vm_migration | `Error` | 65.25 | test_vm_life_cycle.py
   test_02_unsecure_vm_migration | `Error` | 225.52 | test_vm_life_cycle.py
   test_04_nonsecured_to_secured_vm_migration | `Error` | 143.81 | test_vm_life_cycle.py
   test_08_migrate_vm | `Error` | 0.08 | test_vm_life_cycle.py
   test_01_migrate_vm_strict_tags_success | `Error` | 0.34 | test_vm_strict_host_tags.py
   test_02_migrate_vm_strict_tags_failure | `Error` | 0.32 | test_vm_strict_host_tags.py
   test_01_restore_vm_strict_tags_success | `Error` | 0.35 | test_vm_strict_host_tags.py
   test_02_restore_vm_strict_tags_failure | `Error` | 0.36 | test_vm_strict_host_tags.py
   test_01_scale_vm_strict_tags_success | `Error` | 0.29 | test_vm_strict_host_tags.py
   test_02_scale_vm_strict_tags_failure | `Error` | 0.35 | test_vm_strict_host_tags.py
   test_01_deploy_vm_on_specific_host_without_strict_tags | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_02_deploy_vm_on_any_host_without_strict_tags | `Error` | 5.80 | test_vm_strict_host_tags.py
   test_03_deploy_vm_on_specific_host_with_strict_tags_success | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_04_deploy_vm_on_any_host_with_strict_tags_success | `Error` | 5.79 | test_vm_strict_host_tags.py
   test_05_deploy_vm_on_specific_host_with_strict_tags_failure | `Failure` | 0.32 | test_vm_strict_host_tags.py
   test_hostha_kvm_host_degraded | `Error` | 717.92 | test_hostha_kvm.py
   test_hostha_kvm_host_degraded | `Error` | 717.92 | test_hostha_kvm.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2342570195

   @Pearl1594 a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2310281496

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2305253343

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2305460562

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2305188670

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2305473909

   @Pearl1594 a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2324103415

   @DaanHoogland a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2321871649

   @Pearl1594 a [SL] Trillian-Jenkins matrix job (EL8 mgmt + EL8 KVM, Ubuntu22 mgmt + Ubuntu22 KVM, EL8 mgmt + VMware 7.0u3, EL9 mgmt + XCP-ng 8.2 ) has been kicked to run smoke tests


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2322893978

   <b>[SF] Trillian test result (tid-11264)</b>
   Environment: xcpng82 (x2), Advanced Networking with Mgmt server a9
   Total time taken: 72998 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11264-xcpng82.zip
   Smoke tests completed. 126 look OK, 13 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_condensed_drs_algorithm | `Failure` | 172.42 | test_cluster_drs.py
   test_02_balanced_drs_algorithm | `Failure` | 177.75 | test_cluster_drs.py
   ContextSuite context=TestSharedNetworkWithConfigDrive>:setup | `Error` | 10.57 | test_network.py
   test_01_non_strict_host_anti_affinity | `Error` | 213.31 | test_nonstrict_affinity_group.py
   test_02_non_strict_host_affinity | `Error` | 110.35 | test_nonstrict_affinity_group.py
   test_01_add_primary_storage_disabled_host | `Error` | 15.47 | test_primary_storage.py
   test_03_migration_options_storage_tags | `Error` | 0.02 | test_primary_storage.py
   test_02_create_volume | `Error` | 4.34 | test_resource_names.py
   test_01_scale_vm | `Error` | 181.82 | test_scale_vm.py
   test_04_scale_vm_with_user_account | `Error` | 175.06 | test_scale_vm.py
   ContextSuite context=TestScaleVm>:teardown | `Error` | 69.84 | test_scale_vm.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 18.14 | test_service_offerings.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 13.80 | test_snapshots.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 13.80 | test_snapshots.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 201.39 | test_templates.py
   test_01_volume_usage | `Error` | 99.28 | test_usage.py
   test_01_deploy_vm_on_specific_host | `Error` | 0.10 | test_vm_deployment_planner.py
   test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.17 | test_vm_deployment_planner.py
   test_08_migrate_vm | `Error` | 0.07 | test_vm_life_cycle.py
   test_01_migrate_vm_strict_tags_success | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_02_migrate_vm_strict_tags_failure | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_01_restore_vm_strict_tags_success | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_02_restore_vm_strict_tags_failure | `Error` | 0.29 | test_vm_strict_host_tags.py
   test_01_scale_vm_strict_tags_success | `Error` | 0.29 | test_vm_strict_host_tags.py
   test_02_scale_vm_strict_tags_failure | `Error` | 0.33 | test_vm_strict_host_tags.py
   test_01_deploy_vm_on_specific_host_without_strict_tags | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_02_deploy_vm_on_any_host_without_strict_tags | `Error` | 5.72 | test_vm_strict_host_tags.py
   test_03_deploy_vm_on_specific_host_with_strict_tags_success | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_04_deploy_vm_on_any_host_with_strict_tags_success | `Error` | 5.72 | test_vm_strict_host_tags.py
   test_05_deploy_vm_on_specific_host_with_strict_tags_failure | `Failure` | 0.30 | test_vm_strict_host_tags.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2297273219

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "vishesh92 (via GitHub)" <gi...@apache.org>.
vishesh92 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2298225611

   I am not sure if should allow deletion of offerings. This could potentially cause some issues when the offering being deleted is still in use by some other resource (e.g. CKS, autoscaling group, etc.) which could then result in NPE or some other errors.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1723785197


##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -3913,8 +3915,7 @@ private Pair<List<Long>, Integer> searchForServiceOfferingIdsAndCount(ListServic
             }
 
             serviceOfferingSearch.join("diskOfferingSearch", diskOfferingSearch, JoinBuilder.JoinType.INNER, JoinBuilder.JoinCondition.AND,
-                    serviceOfferingSearch.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId(),
-                    serviceOfferingSearch.entity().setString("Active"), diskOfferingSearch.entity().getState());
+                    serviceOfferingSearch.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId());

Review Comment:
   Al, that's a fair point.. Probably reverting to it listing Active by default would be a better option. Thanks. 
   



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2299725654

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2299094987

   > I am not sure if should allow deletion of offerings. This could potentially cause some issues when the offering being deleted is still in use by some other resource (e.g. CKS, autoscaling group, etc.) which could then result in NPE or some other errors.
   
   @vishesh92 Checks have been added to prevent deletion of offerings if there are any VMs or volumes using them


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2325535438

   <b>[SF] Trillian test result (tid-11285)</b>
   Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
   Total time taken: 60066 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11285-kvm-ol8.zip
   Smoke tests completed. 130 look OK, 9 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestDeployVirtioSCSIVM>:teardown | `Error` | 49.76 | test_deploy_virtio_scsi_vm.py
   test_01_add_primary_storage_disabled_host | `Error` | 0.27 | test_primary_storage.py
   test_03_migration_options_storage_tags | `Error` | 0.02 | test_primary_storage.py
   ContextSuite context=TestResourceNames>:teardown | `Error` | 40.90 | test_resource_names.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:teardown | `Error` | 142.92 | test_service_offerings.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 13.78 | test_snapshots.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 13.78 | test_snapshots.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 116.36 | test_templates.py
   test_01_deploy_vm_on_specific_host | `Error` | 0.11 | test_vm_deployment_planner.py
   test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.13 | test_vm_deployment_planner.py
   test_01_migrate_VM_and_root_volume | `Error` | 93.66 | test_vm_life_cycle.py
   test_02_migrate_VM_with_two_data_disks | `Error` | 53.08 | test_vm_life_cycle.py
   test_01_secure_vm_migration | `Error` | 144.62 | test_vm_life_cycle.py
   test_01_secure_vm_migration | `Error` | 144.63 | test_vm_life_cycle.py
   test_02_unsecure_vm_migration | `Error` | 0.02 | test_vm_life_cycle.py
   test_03_secured_to_nonsecured_vm_migration | `Error` | 0.02 | test_vm_life_cycle.py
   test_04_nonsecured_to_secured_vm_migration | `Error` | 0.02 | test_vm_life_cycle.py
   test_08_migrate_vm | `Error` | 0.06 | test_vm_life_cycle.py
   test_01_migrate_vm_strict_tags_success | `Error` | 0.33 | test_vm_strict_host_tags.py
   test_02_migrate_vm_strict_tags_failure | `Error` | 0.30 | test_vm_strict_host_tags.py
   test_01_restore_vm_strict_tags_success | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_02_restore_vm_strict_tags_failure | `Error` | 0.29 | test_vm_strict_host_tags.py
   test_01_scale_vm_strict_tags_success | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_02_scale_vm_strict_tags_failure | `Error` | 0.32 | test_vm_strict_host_tags.py
   test_01_deploy_vm_on_specific_host_without_strict_tags | `Error` | 0.26 | test_vm_strict_host_tags.py
   test_02_deploy_vm_on_any_host_without_strict_tags | `Error` | 2.69 | test_vm_strict_host_tags.py
   test_03_deploy_vm_on_specific_host_with_strict_tags_success | `Error` | 0.29 | test_vm_strict_host_tags.py
   test_04_deploy_vm_on_any_host_with_strict_tags_success | `Error` | 5.78 | test_vm_strict_host_tags.py
   test_05_deploy_vm_on_specific_host_with_strict_tags_failure | `Failure` | 0.28 | test_vm_strict_host_tags.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2307008876

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2306113468

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2299252775

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2306927323

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2306924515

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2299159795

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2299162833

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2300825830

   @Pearl1594 a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2300810824

   @blueorangutan test


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2299249914

   @blueorangutan package
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2309587655

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1731236880


##########
test/integration/component/test_network_offering.py:
##########
@@ -1395,12 +1395,10 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        try:
-            #Cleanup resources used
-            cleanup_resources(cls.apiclient, cls.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestNOWithOnlySourceNAT, cls).tearDownClass()

Review Comment:
   Sorry @DaanHoogland , not sure I understand what's the problem here? As suggested, I've updated the tearDownClass methods to invoke super()



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1731238853


##########
test/integration/smoke/test_affinity_groups.py:
##########
@@ -139,6 +145,8 @@ def test_DeployVmAntiAffinityGroup(self):
             serviceofferingid=self.service_offering.id,
             affinitygroupnames=[self.ag.name]
         )
+
+        self.cleanup.append(vm2)

Review Comment:
   Not sure what the change is here? Is it the removal of extra line?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "JoaoJandre (via GitHub)" <gi...@apache.org>.
JoaoJandre commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1881921059


##########
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java:
##########
@@ -4367,8 +4368,11 @@ public boolean deleteDiskOffering(final DeleteDiskOfferingCmd cmd) {
         }
 
         annotationDao.removeByEntityType(AnnotationService.EntityType.DISK_OFFERING.name(), offering.getUuid());
-        offering.setState(DiskOffering.State.Inactive);
-        if (_diskOfferingDao.update(offering.getId(), offering)) {
+        List<VolumeVO> volumesUsingOffering = _volumeDao.findByDiskOfferingId(diskOfferingId);
+        if (!volumesUsingOffering.isEmpty()) {
+            throw new InvalidParameterValueException(String.format("Unable to delete disk offering: %s [%s] because there are volumes using it", offering.getUuid(), offering.getName()));
+        }

Review Comment:
   How is this related to the main change? Why should we start blocking this now?



##########
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java:
##########
@@ -4440,15 +4444,17 @@ public boolean deleteServiceOffering(final DeleteServiceOfferingCmd cmd) {
             throw new InvalidParameterValueException(String.format("Unable to delete service offering: %s by user: %s because it is not root-admin or domain-admin", offering.getUuid(), user.getUuid()));
         }
 
+        List<VMInstanceVO> vmsUsingOffering = _vmInstanceDao.listByOfferingId(offeringId);
+        if (!vmsUsingOffering.isEmpty()) {
+            throw new CloudRuntimeException(String.format("Unable to delete service offering %s as it is in use", offering.getUuid()));
+        }

Review Comment:
   How is this related to the main change? Why should we start blocking this now?
   



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling service / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 closed pull request #9546: Add support for disabling service / system and disk offerings
URL: https://github.com/apache/cloudstack/pull/9546


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1728813949


##########
test/integration/component/test_cpu_max_limits.py:
##########
@@ -242,8 +242,9 @@ def test_02_deploy_vm_account_limit_reached(self):
         self.debug("Deploying instance with account: %s" %
                    self.child_do_admin.name)
 
-        self.createInstance(account=self.child_do_admin,
+        self.vm1 = self.createInstance(account=self.child_do_admin,
             service_off=self.service_offering, api_client=api_client_admin)
+        self.cleanup.append(self.service_offering)

Review Comment:
   Oh this was a mistake, my bad
   



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "codecov[bot] (via GitHub)" <gi...@apache.org>.
codecov[bot] commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2297046353

   ## [Codecov](https://app.codecov.io/gh/apache/cloudstack/pull/9546?dropdown=coverage&src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) Report
   All modified and coverable lines are covered by tests :white_check_mark:
   > Project coverage is 4.17%. Comparing base [(`2ba64f2`)](https://app.codecov.io/gh/apache/cloudstack/commit/2ba64f2521ad3a62078f3ab1c5f26c49f8f2fb3e?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) to head [(`6932fb0`)](https://app.codecov.io/gh/apache/cloudstack/commit/6932fb08666cfed8a96c34cd2268407707d27bcb?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
   
   > :exclamation:  There is a different number of reports uploaded between BASE (2ba64f2) and HEAD (6932fb0). Click for more details.
   > 
   > <details><summary>HEAD has 1 upload less than BASE</summary>
   >
   >| Flag | BASE (2ba64f2) | HEAD (6932fb0) |
   >|------|------|------|
   >|unittests|1|0|
   ></details>
   
   <details><summary>Additional details and impacted files</summary>
   
   
   ```diff
   @@             Coverage Diff              @@
   ##               main   #9546       +/-   ##
   ============================================
   - Coverage     15.54%   4.17%   -11.38%     
   ============================================
     Files          5499     377     -5122     
     Lines        481706   30872   -450834     
     Branches      58660    5463    -53197     
   ============================================
   - Hits          74879    1288    -73591     
   + Misses       398541   29438   -369103     
   + Partials       8286     146     -8140     
   ```
   
   | [Flag](https://app.codecov.io/gh/apache/cloudstack/pull/9546/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | Coverage Δ | |
   |---|---|---|
   | [uitests](https://app.codecov.io/gh/apache/cloudstack/pull/9546/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `4.17% <ø> (-0.01%)` | :arrow_down: |
   | [unittests](https://app.codecov.io/gh/apache/cloudstack/pull/9546/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `?` | |
   
   Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#carryforward-flags-in-the-pull-request-comment) to find out more.
   
   </details>
   
   [:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/apache/cloudstack/pull/9546?dropdown=coverage&src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).   
   :loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2297274549

   @Pearl1594 a [SL] 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.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2312043611

   <b>[SF] Trillian test result (tid-11192)</b>
   Environment: kvm-ubuntu22 (x2), Advanced Networking with Mgmt server u22
   Total time taken: 60815 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11192-kvm-ubuntu22.zip
   Smoke tests completed. 124 look OK, 15 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_deploy_vm_from_direct_download_template_nfs_storage | `Error` | 35.56 | test_direct_download.py
   ContextSuite context=TestDirectDownloadTemplates>:teardown | `Error` | 1.13 | test_direct_download.py
   ContextSuite context=TestConsoleEndpoint>:setup | `Error` | 0.00 | test_console_endpoint.py
   ContextSuite context=TestDeployVirtioSCSIVM>:teardown | `Error` | 47.03 | test_deploy_virtio_scsi_vm.py
   test_01_add_primary_storage_disabled_host | `Error` | 0.26 | test_primary_storage.py
   test_03_migration_options_storage_tags | `Error` | 0.02 | test_primary_storage.py
   ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
   ContextSuite context=TestResourceNames>:teardown | `Error` | 41.79 | test_resource_names.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 3.00 | test_service_offerings.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 9.70 | test_snapshots.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 9.70 | test_snapshots.py
   ContextSuite context=TestCopyAndDeleteTemplatesAcrossZones>:teardown | `Error` | 19.71 | test_templates.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 126.37 | test_templates.py
   ContextSuite context=TestLBRuleUsage>:setup | `Error` | 4.93 | test_usage.py
   ContextSuite context=TestNatRuleUsage>:setup | `Error` | 7.80 | test_usage.py
   test_01_deploy_vm_on_specific_host | `Error` | 0.11 | test_vm_deployment_planner.py
   test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.15 | test_vm_deployment_planner.py
   test_01_migrate_VM_and_root_volume | `Error` | 105.84 | test_vm_life_cycle.py
   test_02_migrate_VM_with_two_data_disks | `Error` | 55.15 | test_vm_life_cycle.py
   test_01_secure_vm_migration | `Error` | 65.25 | test_vm_life_cycle.py
   test_02_unsecure_vm_migration | `Error` | 226.69 | test_vm_life_cycle.py
   test_04_nonsecured_to_secured_vm_migration | `Error` | 144.04 | test_vm_life_cycle.py
   test_08_migrate_vm | `Error` | 0.06 | test_vm_life_cycle.py
   test_01_migrate_vm_strict_tags_success | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_02_migrate_vm_strict_tags_failure | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_01_restore_vm_strict_tags_success | `Error` | 0.34 | test_vm_strict_host_tags.py
   test_02_restore_vm_strict_tags_failure | `Error` | 0.32 | test_vm_strict_host_tags.py
   test_01_scale_vm_strict_tags_success | `Error` | 0.33 | test_vm_strict_host_tags.py
   test_02_scale_vm_strict_tags_failure | `Error` | 0.36 | test_vm_strict_host_tags.py
   test_01_deploy_vm_on_specific_host_without_strict_tags | `Error` | 0.34 | test_vm_strict_host_tags.py
   test_02_deploy_vm_on_any_host_without_strict_tags | `Error` | 2.83 | test_vm_strict_host_tags.py
   test_03_deploy_vm_on_specific_host_with_strict_tags_success | `Error` | 0.33 | test_vm_strict_host_tags.py
   test_04_deploy_vm_on_any_host_with_strict_tags_success | `Error` | 5.87 | test_vm_strict_host_tags.py
   test_05_deploy_vm_on_specific_host_with_strict_tags_failure | `Failure` | 0.33 | test_vm_strict_host_tags.py
   test_08_resize_volume | `Error` | 124.44 | test_volumes.py
   test_hostha_kvm_host_degraded | `Error` | 209.67 | test_hostha_kvm.py
   test_hostha_kvm_host_fencing | `Error` | 234.17 | test_hostha_kvm.py
   test_hostha_kvm_host_recovering | `Error` | 194.44 | test_hostha_kvm.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2312415624

   <b>[SF] Trillian test result (tid-11194)</b>
   Environment: xcpng82 (x2), Advanced Networking with Mgmt server a9
   Total time taken: 70851 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11194-xcpng82.zip
   Smoke tests completed. 122 look OK, 17 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_condensed_drs_algorithm | `Failure` | 163.89 | test_cluster_drs.py
   test_02_balanced_drs_algorithm | `Failure` | 186.69 | test_cluster_drs.py
   ContextSuite context=TestConsoleEndpoint>:setup | `Error` | 0.00 | test_console_endpoint.py
   ContextSuite context=TestSharedNetworkWithConfigDrive>:setup | `Error` | 10.58 | test_network.py
   test_01_non_strict_host_anti_affinity | `Error` | 220.34 | test_nonstrict_affinity_group.py
   test_02_non_strict_host_affinity | `Error` | 116.42 | test_nonstrict_affinity_group.py
   test_01_add_primary_storage_disabled_host | `Error` | 15.52 | test_primary_storage.py
   test_03_migration_options_storage_tags | `Error` | 0.02 | test_primary_storage.py
   ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
   test_02_create_volume | `Error` | 2.24 | test_resource_names.py
   ContextSuite context=TestResourceNames>:teardown | `Error` | 49.95 | test_resource_names.py
   test_01_scale_vm | `Error` | 174.57 | test_scale_vm.py
   test_04_scale_vm_with_user_account | `Error` | 164.46 | test_scale_vm.py
   ContextSuite context=TestScaleVm>:teardown | `Error` | 84.42 | test_scale_vm.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 18.08 | test_service_offerings.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 11.69 | test_snapshots.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 11.69 | test_snapshots.py
   ContextSuite context=TestCopyAndDeleteTemplatesAcrossZones>:teardown | `Error` | 33.02 | test_templates.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 194.84 | test_templates.py
   ContextSuite context=TestLBRuleUsage>:setup | `Error` | 20.52 | test_usage.py
   ContextSuite context=TestNatRuleUsage>:setup | `Error` | 23.54 | test_usage.py
   test_01_volume_usage | `Error` | 93.02 | test_usage.py
   test_01_deploy_vm_on_specific_host | `Error` | 0.09 | test_vm_deployment_planner.py
   test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.15 | test_vm_deployment_planner.py
   test_08_migrate_vm | `Error` | 0.07 | test_vm_life_cycle.py
   ContextSuite context=TestChangeServiceOfferingForVmWithSnapshots>:teardown | `Error` | 425.74 | test_vm_snapshots.py
   test_03_delete_vm_snapshots | `Failure` | 276.34 | test_vm_snapshots.py
   test_01_migrate_vm_strict_tags_success | `Error` | 0.27 | test_vm_strict_host_tags.py
   test_02_migrate_vm_strict_tags_failure | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_01_restore_vm_strict_tags_success | `Error` | 0.26 | test_vm_strict_host_tags.py
   test_02_restore_vm_strict_tags_failure | `Error` | 0.29 | test_vm_strict_host_tags.py
   test_01_scale_vm_strict_tags_success | `Error` | 0.32 | test_vm_strict_host_tags.py
   test_02_scale_vm_strict_tags_failure | `Error` | 0.37 | test_vm_strict_host_tags.py
   test_01_deploy_vm_on_specific_host_without_strict_tags | `Error` | 0.31 | test_vm_strict_host_tags.py
   test_02_deploy_vm_on_any_host_without_strict_tags | `Error` | 2.68 | test_vm_strict_host_tags.py
   test_03_deploy_vm_on_specific_host_with_strict_tags_success | `Error` | 0.26 | test_vm_strict_host_tags.py
   test_04_deploy_vm_on_any_host_with_strict_tags_success | `Error` | 5.69 | test_vm_strict_host_tags.py
   test_05_deploy_vm_on_specific_host_with_strict_tags_failure | `Failure` | 0.29 | test_vm_strict_host_tags.py
   test_08_resize_volume | `Error` | 61.35 | test_volumes.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2310566783

   @blueorangutan test matrix


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "JoaoJandre (via GitHub)" <gi...@apache.org>.
JoaoJandre commented on code in PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#discussion_r1723709888


##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -3913,8 +3915,7 @@ private Pair<List<Long>, Integer> searchForServiceOfferingIdsAndCount(ListServic
             }
 
             serviceOfferingSearch.join("diskOfferingSearch", diskOfferingSearch, JoinBuilder.JoinType.INNER, JoinBuilder.JoinCondition.AND,
-                    serviceOfferingSearch.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId(),
-                    serviceOfferingSearch.entity().setString("Active"), diskOfferingSearch.entity().getState());
+                    serviceOfferingSearch.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId());

Review Comment:
   Isn't this a query that is executed if vmid != null? if so, should we list inactive offerings?



##########
engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java:
##########
@@ -325,6 +326,10 @@ protected void init() {
         VmsNotInClusterUsingPool.join("hostSearch2", hostSearch2, hostSearch2.entity().getId(), VmsNotInClusterUsingPool.entity().getHostId(), JoinType.INNER);
         VmsNotInClusterUsingPool.and("vmStates", VmsNotInClusterUsingPool.entity().getState(), Op.IN);
         VmsNotInClusterUsingPool.done();
+
+        ServiceOfferingSearch = createSearchBuilder();
+        ServiceOfferingSearch.and("serviceOfferingId", ServiceOfferingSearch.entity().getServiceOfferingId(), Op.EQ);
+        BackupSearch.done();

Review Comment:
   Shouldn't it be ServiceOfferingSearch.done here?



##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -4043,6 +4044,8 @@ private Pair<List<Long>, Integer> searchForServiceOfferingIdsAndCount(ListServic
         SearchCriteria<ServiceOfferingVO> sc = serviceOfferingSearch.create();
         if (state != null) {
             sc.setParameters("state", state);
+        } else {
+            sc.setParameters("state", Arrays.asList(ServiceOffering.State.Active, ServiceOffering.State.Inactive));

Review Comment:
   Same here, if you do not set this parameter, both active and inactive offerings will be queried.



##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -3547,6 +3547,8 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
 
         if (state != null) {
             sc.setParameters("state", state);
+        } else {
+            sc.setParameters("state", Arrays.asList(ServiceOffering.State.Active, ServiceOffering.State.Inactive));

Review Comment:
   If you do not set the state condition (AKA `where state in x`), both active and inactive will be listed.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "Pearl1594 (via GitHub)" <gi...@apache.org>.
Pearl1594 commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2341742925

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2324100570

   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2324272678

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2322832255

   <b>[SF] Trillian test result (tid-11263)</b>
   Environment: vmware-70u3 (x2), Advanced Networking with Mgmt server ol8
   Total time taken: 56713 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9546-t11263-vmware-70u3.zip
   Smoke tests completed. 127 look OK, 12 have errors, 0 did not run
   Only failed and skipped tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_04_list_domains_level_filter | `Failure` | 0.06 | test_list_domains.py
   test_05_list_domains_no_filter | `Failure` | 0.03 | test_list_domains.py
   test_02_list_disk_offerings_name_filter | `Failure` | 0.03 | test_list_disk_offerings.py
   test_06_list_disk_offerings_keyword_filter | `Failure` | 0.03 | test_list_disk_offerings.py
   test_05_list_volumes_isrecursive | `Failure` | 0.05 | test_list_volumes.py
   test_07_list_volumes_listall | `Failure` | 0.04 | test_list_volumes.py
   test_01_deployVMInSharedNetwork | `Error` | 329.53 | test_network.py
   test_01_add_primary_storage_disabled_host | `Error` | 0.24 | test_primary_storage.py
   test_03_migration_options_storage_tags | `Error` | 0.02 | test_primary_storage.py
   test_02_restore_vm_with_disk_offering | `Error` | 57.32 | test_restore_vm.py
   test_03_restore_vm_with_disk_offering_custom_size | `Error` | 59.20 | test_restore_vm.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 8.33 | test_service_offerings.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 10.69 | test_snapshots.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 10.69 | test_snapshots.py
   ContextSuite context=TestCreateTemplate>:setup | `Error` | 136.64 | test_templates.py
   test_01_deploy_vm_on_specific_host | `Error` | 0.11 | test_vm_deployment_planner.py
   test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.15 | test_vm_deployment_planner.py
   test_03_live_migrate_VM_with_two_data_disks | `Error` | 62.19 | test_vm_life_cycle.py
   test_08_migrate_vm | `Error` | 0.07 | test_vm_life_cycle.py
   test_01_migrate_vm_strict_tags_success | `Error` | 0.27 | test_vm_strict_host_tags.py
   test_02_migrate_vm_strict_tags_failure | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_01_restore_vm_strict_tags_success | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_02_restore_vm_strict_tags_failure | `Error` | 0.27 | test_vm_strict_host_tags.py
   test_01_scale_vm_strict_tags_success | `Error` | 0.30 | test_vm_strict_host_tags.py
   test_02_scale_vm_strict_tags_failure | `Error` | 0.32 | test_vm_strict_host_tags.py
   test_01_deploy_vm_on_specific_host_without_strict_tags | `Error` | 0.27 | test_vm_strict_host_tags.py
   test_02_deploy_vm_on_any_host_without_strict_tags | `Error` | 2.77 | test_vm_strict_host_tags.py
   test_03_deploy_vm_on_specific_host_with_strict_tags_success | `Error` | 0.28 | test_vm_strict_host_tags.py
   test_04_deploy_vm_on_any_host_with_strict_tags_success | `Error` | 5.95 | test_vm_strict_host_tags.py
   test_05_deploy_vm_on_specific_host_with_strict_tags_failure | `Failure` | 0.28 | test_vm_strict_host_tags.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2321643749

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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling serivce / system and disk offerings [cloudstack]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-2577663620

   This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Add support for disabling service / system and disk offerings [cloudstack]

Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #9546:
URL: https://github.com/apache/cloudstack/pull/9546#issuecomment-3388968606

   @Pearl1594 , please update, or should we close/convert to draft?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org