etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

For volumes created from template, do not log offering ID in VOLUME.CREATE in usage_event. Moved offering type to DiskOffering interface

This commit is contained in:
Kishan Kavala 2014-11-21 14:33:39 +05:30
parent 42cecbb000
commit 9eb8d538dd
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/com/cloud/offering/DiskOffering.java
View File

@ -34,6 +34,10 @@ public interface DiskOffering extends InfrastructureEntity, Identity, InternalId
Inactive, Active,
}
public enum Type {
Disk, Service
};
State getState();
public enum DiskCacheMode {
@ -114,4 +118,6 @@ public interface DiskOffering extends InfrastructureEntity, Identity, InternalId
DiskCacheMode getCacheMode();
void setCacheMode(DiskCacheMode cacheMode);
Type getType();
}

4
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
View File

@ -712,7 +712,9 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
Long offeringId = null;
offeringId = offering.getId();
if (offering.getType() == DiskOffering.Type.Disk) {
offeringId = offering.getId();
}
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offeringId, vol.getTemplateId(), size,
Volume.class.getName(), vol.getUuid(), vol.isDisplayVolume());

3
engine/schema/src/com/cloud/storage/DiskOfferingVO.java
View File

@ -44,9 +44,6 @@ import com.cloud.utils.db.GenericDao;
@Inheritance(strategy = InheritanceType.JOINED)
@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING, length = 32)
public class DiskOfferingVO implements DiskOffering {
public enum Type {
Disk, Service
};
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)

2
engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java
View File

@ -25,7 +25,7 @@ import javax.persistence.EntityExistsException;
import org.springframework.stereotype.Component;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.DiskOfferingVO.Type;
import com.cloud.offering.DiskOffering.Type;
import com.cloud.utils.db.Attribute;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;

2
server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java
View File

@ -27,7 +27,7 @@ import com.cloud.storage.Storage;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
import com.cloud.storage.DiskOfferingVO.Type;
import com.cloud.offering.DiskOffering.Type;
import com.cloud.utils.db.GenericDao;
@Entity