Merge branch 'master' into fnux-hacks

This commit is contained in:
fnux 2020-02-28 13:58:36 +01:00
commit b5a242f176
16 changed files with 106 additions and 90 deletions

View file

@ -75,8 +75,12 @@ class OperatingSystemDisk(VMDiskProduct):
class VMNetworkCard(models.Model):
vm = models.ForeignKey(VMProduct, on_delete=models.CASCADE)
mac_address = models.IntegerField()
ip_address = models.GenericIPAddressField(blank=True,
null=True)
class VMSnapshotProduct(Product):
price_per_gb_ssd = 0.35
@ -86,7 +90,8 @@ class VMSnapshotProduct(Product):
gb_ssd = models.FloatField(editable=False)
gb_hdd = models.FloatField(editable=False)
vm_uuid = models.UUIDField()
vm = models.ForeignKey(VMProduct, on_delete=models.CASCADE)
#vm_uuid = models.UUIDField()
# Need to setup recurring_price and one_time_price and recurring period