Fixing ConfigurationManagerImpl to implement offering categories

Author: Landry JUGE

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -3943,7 +3943,7 @@ public ServiceOffering cloneServiceOffering(final CloneServiceOfferingCmd cmd) {
                 diskParams.iopsWriteRate, diskParams.iopsWriteRateMax, diskParams.iopsWriteRateMaxLength,
                 diskParams.hypervisorSnapshotReserve, diskParams.cacheMode, customParams.storagePolicy, dynamicScalingEnabled,
                 diskOfferingId, diskOfferingStrictness, isCustomized, encryptRoot,
-                vgpuProfileId, finalGpuCount, gpuDisplay, purgeResources, leaseParams.leaseDuration, leaseParams.leaseExpiryAction);
+                vgpuProfileId, finalGpuCount, gpuDisplay, purgeResources, leaseParams.leaseDuration, leaseParams.leaseExpiryAction, sourceOffering.getCategoryId());
     }
 
     private ServiceOfferingVO getAndValidateSourceOffering(Long sourceOfferingId) {

server/src/test/java/com/cloud/configuration/ConfigurationManagerCloneIntegrationTest.java

@@ -251,7 +251,7 @@ public void testCloneServiceOfferingInheritsAllPropertiesFromSource() {
             anyString(), anyMap(), anyLong(), any(Boolean.class),
             anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(),
             any(Integer.class), anyString(), anyLong(), anyBoolean(), anyLong(), anyBoolean(), anyBoolean(), anyBoolean(),
-            anyLong(), any(Integer.class), any(Boolean.class), anyBoolean(), any(Integer.class), any(VMLeaseManager.ExpiryAction.class)
+            anyLong(), any(Integer.class), any(Boolean.class), anyBoolean(), any(Integer.class), any(VMLeaseManager.ExpiryAction.class), anyLong()
         );
 
         ServiceOffering result = configurationManager.cloneServiceOffering(cmd);
@@ -328,7 +328,7 @@ public void testCloneServiceOfferingOverridesProvidedParameters() {
             anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(),
             anyLong(), anyLong(), anyInt(), anyString(), anyLong(), anyBoolean(), anyLong(),
             anyBoolean(), anyBoolean(), anyBoolean(), anyLong(), anyInt(), anyBoolean(),
-            anyBoolean(), anyInt(), any());
+            anyBoolean(), anyInt(), any(), anyLong());
 
         ServiceOffering result = configurationManager.cloneServiceOffering(cmd);
 
@@ -553,7 +553,7 @@ public void testCloneServiceOfferingCanInheritDetailsFromSource() {
             anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyLong(),
             anyLong(), anyLong(), anyInt(), anyString(), anyLong(), anyBoolean(), anyLong(),
             anyBoolean(), anyBoolean(), anyBoolean(), anyLong(), anyInt(), anyBoolean(),
-            anyBoolean(), anyInt(), any());
+            anyBoolean(), anyInt(), any(), anyLong());
 
         ServiceOffering result = configurationManager.cloneServiceOffering(cmd);