Revision 22571df6
b/aquarium/admin.py | ||
---|---|---|
14 | 14 |
|
15 | 15 |
form = LimitForm |
16 | 16 |
|
17 |
class UserForm(forms.ModelForm): |
|
18 |
class Meta: |
|
19 |
model = OceanUser |
|
20 |
|
|
21 |
class UserAdmin(admin.ModelAdmin): |
|
22 |
"" |
|
23 |
form = UserForm |
|
24 |
|
|
25 |
|
|
26 | 17 |
class UserLimitForm(forms.ModelForm): |
27 | 18 |
class Meta: |
28 | 19 |
model = UserLimit |
... | ... | |
61 | 52 |
|
62 | 53 |
form = ChargingLogForm |
63 | 54 |
|
55 |
class OceanUserForm(forms.ModelForm): |
|
56 |
class Meta: |
|
57 |
model = OceanUser |
|
58 |
|
|
59 |
class OceanUserAdmin(admin.ModelAdmin): |
|
60 |
"" |
|
61 |
form = OceanUserForm |
|
62 |
|
|
64 | 63 |
admin.site.register(Limit, LimitAdmin) |
65 |
admin.site.register(OceanUser, UserAdmin) |
|
64 |
admin.site.register(OceanUser, OceanUserAdmin)
|
|
66 | 65 |
admin.site.register(UserLimit, UserLimitAdmin) |
67 | 66 |
admin.site.register(Flavor, FlavorAdmin) |
68 | 67 |
admin.site.register(VirtualMachine, VirtualMachineAdmin) |
b/aquarium/models.py | ||
---|---|---|
9 | 9 |
def __unicode__(self): |
10 | 10 |
return self.description |
11 | 11 |
|
12 |
|
|
13 | 12 |
class OceanUser(models.Model): |
14 | 13 |
name = models.CharField(max_length=255) |
15 | 14 |
credit = models.IntegerField() |
... | ... | |
45 | 44 |
|
46 | 45 |
class VirtualMachine(models.Model): |
47 | 46 |
STATES = ( |
48 |
(0, 'down'), |
|
49 |
(1, 'up'), |
|
47 |
(0, 'VM_STOPPED'), |
|
48 |
(1, 'VM_RUNNING'), |
|
49 |
(2, 'VM_PAUSED'), |
|
50 |
(3, 'VM_INTERNAL'), |
|
50 | 51 |
# FIXME |
51 | 52 |
) |
52 | 53 |
|
... | ... | |
54 | 55 |
created = models.DateTimeField() |
55 | 56 |
state = models.IntegerField(choices=STATES) |
56 | 57 |
started = models.DateTimeField() |
58 |
vmid = models.IntegerField() |
|
59 |
imageid = models.IntegerField() |
|
60 |
hostid = models.CharField(max_length=100) |
|
61 |
server_label = models.CharField(max_length=100) |
|
62 |
image_version = models.CharField(max_length=100) |
|
57 | 63 |
owner = models.ForeignKey(OceanUser) |
58 | 64 |
flavor = models.ForeignKey(Flavor) |
59 | 65 |
|
... | ... | |
64 | 70 |
def __unicode__(self): |
65 | 71 |
return self.name |
66 | 72 |
|
73 |
class VirtualMachineAddress(models.Model): |
|
74 |
ipfour = models.CharField(max_length=15) |
|
75 |
ipsix = models.CharField(max_length=100) |
|
76 |
public = models.BooleanField() |
|
77 |
vmachine = models.ForeignKey(VirtualMachine) |
|
78 |
|
|
79 |
class Meta: |
|
80 |
verbose_name = u'Virtual Machine Network Address' |
|
81 |
|
|
82 |
def __unicode__(self): |
|
83 |
return u'%s address for vm named' % ( self.ipfour, self.vm_id.name ) |
|
84 |
|
|
67 | 85 |
class ChargingLog(models.Model): |
68 | 86 |
vm = models.ForeignKey(VirtualMachine) |
69 | 87 |
date = models.DateTimeField() |
Also available in: Unified diff