harikrishna-patnala commented on a change in pull request #5008:
URL: https://github.com/apache/cloudstack/pull/5008#discussion_r684895525



##########
File path: server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
##########
@@ -926,16 +926,21 @@ private DiskOfferingVO createDefaultDiskOffering(String 
name, String description
         newDiskOffering.setUniqueName("Cloud.Com-" + name);
         // leaving the above reference to cloud.com in as it is an identifyer 
and has no real world relevance
         newDiskOffering.setSystemUse(isSystemUse);
-        newDiskOffering = 
_diskOfferingDao.persistDeafultDiskOffering(newDiskOffering);
+        newDiskOffering = 
_diskOfferingDao.persistDefaultDiskOffering(newDiskOffering);
         return newDiskOffering;
     }
 
     private ServiceOfferingVO createServiceOffering(long userId, String name, 
int cpu, int ramSize, int speed, String displayText,
             ProvisioningType provisioningType, boolean localStorageRequired, 
boolean offerHA, String tags) {
         tags = cleanupTags(tags);
+        DiskOfferingVO diskOfferingVO = new DiskOfferingVO(name, displayText, 
provisioningType, false, tags, false, false, false, true);
+        diskOfferingVO.setUniqueName("Cloud.Com-" + name);

Review comment:
       Here we are splitting the service offering and disk offering, so using 
the same name for both offerings.

##########
File path: 
engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -3851,8 +3851,9 @@ public void checkIfCanUpgrade(final VirtualMachine 
vmInstance, final ServiceOffe
 
         final ServiceOfferingVO currentServiceOffering = 
_offeringDao.findByIdIncludingRemoved(vmInstance.getId(), 
vmInstance.getServiceOfferingId());
         final DiskOfferingVO currentDiskOffering = 
_diskOfferingDao.findByIdIncludingRemoved(currentServiceOffering.getDiskOfferingId());
+        final DiskOfferingVO newDiskOffering = 
_diskOfferingDao.findByIdIncludingRemoved(newServiceOffering.getDiskOfferingId());
 
-        checkIfNewOfferingStorageScopeMatchesStoragePool(vmInstance, 
newServiceOffering);
+        checkIfNewOfferingStorageScopeMatchesStoragePool(vmInstance, 
newDiskOffering);

Review comment:
       No, this is a copy/paste mistake of the previous line. Fixed it, it 
should not be a deleted one. Thanks Daan




-- 
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: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


Reply via email to