diff --git a/core/admin.py b/core/admin.py index 80adec1..65d5bf2 100644 --- a/core/admin.py +++ b/core/admin.py @@ -1,7 +1,8 @@ from django.contrib import admin from core.models import FlavorPrice, VolumePrice, FloatingIpsPrice, BillingProject, Invoice, InvoiceVolume, \ - InvoiceFloatingIp, InvoiceInstance, DynamicSetting + InvoiceFloatingIp, InvoiceInstance, DynamicSetting, InvoiceImage, ImagePrice, SnapshotPrice, RouterPrice, \ + InvoiceSnapshot, InvoiceRouter @admin.register(DynamicSetting) @@ -24,6 +25,20 @@ class VolumePriceAdmin(admin.ModelAdmin): list_display = ('volume_type_id', 'hourly_price', 'monthly_price') +@admin.register(RouterPrice) +class RouterPriceAdmin(admin.ModelAdmin): + list_display = ('hourly_price', 'monthly_price') + + +@admin.register(SnapshotPrice) +class SnapshotPriceAdmin(admin.ModelAdmin): + list_display = ('hourly_price', 'monthly_price') + +@admin.register(ImagePrice) +class ImagePriceAdmin(admin.ModelAdmin): + list_display = ('hourly_price', 'monthly_price') + + @admin.register(BillingProject) class BillingProjectAdmin(admin.ModelAdmin): list_display = ('tenant_id',) @@ -47,3 +62,18 @@ class InvoiceFloatingIpAdmin(admin.ModelAdmin): @admin.register(InvoiceVolume) class InvoiceVolumeAdmin(admin.ModelAdmin): list_display = ('volume_id',) + + +@admin.register(InvoiceRouter) +class InvoiceRouterAdmin(admin.ModelAdmin): + list_display = ('router_id', 'name') + + +@admin.register(InvoiceSnapshot) +class InvoiceSnapshotAdmin(admin.ModelAdmin): + list_display = ('snapshot_id', 'name', 'space_allocation_gb') + +@admin.register(InvoiceImage) +class InvoiceImageAdmin(admin.ModelAdmin): + list_display = ('image_id', 'name', 'space_allocation_gb') + diff --git a/core/models.py b/core/models.py index c8e85b2..eb5045c 100644 --- a/core/models.py +++ b/core/models.py @@ -173,9 +173,9 @@ class InvoiceImage(BaseModel, InvoiceComponentMixin): # Informative name = models.CharField(max_length=256) - # - # @property - # def price_charged(self): - # price_without_allocation = super().price_charged - # return price_without_allocation * math.ceil(self.space_allocation_gb) + + @property + def price_charged(self): + price_without_allocation = super().price_charged + return price_without_allocation * math.ceil(self.space_allocation_gb) # end region