Revision 4e3a6674

b/snf-cyclades-app/synnefo/db/migrations/0076_auto__add_subnet__add_field_ippooltable_subnet.py
1
# -*- coding: utf-8 -*-
2
import datetime
3
from south.db import db
4
from south.v2 import SchemaMigration
5
from django.db import models
6

  
7

  
8
class Migration(SchemaMigration):
9

  
10
    def forwards(self, orm):
11
        # Adding model 'Subnet'
12
        db.create_table('db_subnet', (
13
            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
14
            ('network', self.gf('django.db.models.fields.related.ForeignKey')(related_name='subnets', to=orm['db.Network'])),
15
            ('name', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
16
            ('ipversion', self.gf('django.db.models.fields.IntegerField')(default=4)),
17
            ('cidr', self.gf('django.db.models.fields.CharField')(max_length=64, null=True)),
18
            ('gateway', self.gf('django.db.models.fields.CharField')(max_length=64, null=True)),
19
            ('dhcp', self.gf('django.db.models.fields.BooleanField')(default=True)),
20
            ('deleted', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),
21
            ('host_routes', self.gf('synnefo.db.fields.SeparatedValuesField')(null=True)),
22
            ('dns_nameservers', self.gf('synnefo.db.fields.SeparatedValuesField')(null=True)),
23
        ))
24
        db.send_create_signal('db', ['Subnet'])
25

  
26
        # Adding field 'IPPoolTable.subnet'
27
        db.add_column('db_ippooltable', 'subnet',
28
                      self.gf('django.db.models.fields.related.ForeignKey')(related_name='ip_pools', null=True, to=orm['db.Subnet']),
29
                      keep_default=False)
30

  
31

  
32
    def backwards(self, orm):
33
        # Deleting model 'Subnet'
34
        db.delete_table('db_subnet')
35

  
36
        # Deleting field 'IPPoolTable.subnet'
37
        db.delete_column('db_ippooltable', 'subnet_id')
38

  
39

  
40
    models = {
41
        'db.backend': {
42
            'Meta': {'ordering': "['clustername']", 'object_name': 'Backend'},
43
            'clustername': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
44
            'ctotal': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
45
            'dfree': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
46
            'disk_templates': ('synnefo.db.fields.SeparatedValuesField', [], {'null': 'True'}),
47
            'drained': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
48
            'dtotal': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
49
            'hash': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
50
            'hypervisor': ('django.db.models.fields.CharField', [], {'default': "'kvm'", 'max_length': '32'}),
51
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
52
            'index': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'unique': 'True'}),
53
            'mfree': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
54
            'mtotal': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
55
            'offline': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
56
            'password_hash': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
57
            'pinst_cnt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
58
            'port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '5080'}),
59
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
60
            'username': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'})
61
        },
62
        'db.backendnetwork': {
63
            'Meta': {'unique_together': "(('network', 'backend'),)", 'object_name': 'BackendNetwork'},
64
            'backend': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'networks'", 'on_delete': 'models.PROTECT', 'to': "orm['db.Backend']"}),
65
            'backendjobid': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
66
            'backendjobstatus': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
67
            'backendlogmsg': ('django.db.models.fields.TextField', [], {'null': 'True'}),
68
            'backendopcode': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
69
            'backendtime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1, 1, 1, 0, 0)'}),
70
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
71
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
72
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
73
            'mac_prefix': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
74
            'network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'backend_networks'", 'to': "orm['db.Network']"}),
75
            'operstate': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '30'}),
76
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
77
        },
78
        'db.bridgepooltable': {
79
            'Meta': {'object_name': 'BridgePoolTable'},
80
            'available_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
81
            'base': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
82
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
83
            'offset': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
84
            'reserved_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
85
            'size': ('django.db.models.fields.IntegerField', [], {})
86
        },
87
        'db.flavor': {
88
            'Meta': {'unique_together': "(('cpu', 'ram', 'disk', 'disk_template'),)", 'object_name': 'Flavor'},
89
            'cpu': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
90
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
91
            'disk': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
92
            'disk_template': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
93
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
94
            'ram': ('django.db.models.fields.IntegerField', [], {'default': '0'})
95
        },
96
        'db.floatingip': {
97
            'Meta': {'object_name': 'FloatingIP'},
98
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
99
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
100
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
101
            'ipv4': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15', 'db_index': 'True'}),
102
            'machine': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'floating_ips'", 'null': 'True', 'to': "orm['db.VirtualMachine']"}),
103
            'network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'floating_ips'", 'to': "orm['db.Network']"}),
104
            'serial': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'floating_ips'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['db.QuotaHolderSerial']"}),
105
            'userid': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'})
106
        },
107
        'db.ippooltable': {
108
            'Meta': {'object_name': 'IPPoolTable'},
109
            'available_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
110
            'base': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
111
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
112
            'offset': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
113
            'reserved_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
114
            'size': ('django.db.models.fields.IntegerField', [], {}),
115
            'subnet': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ip_pools'", 'null': 'True', 'to': "orm['db.Subnet']"})
116
        },
117
        'db.macprefixpooltable': {
118
            'Meta': {'object_name': 'MacPrefixPoolTable'},
119
            'available_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
120
            'base': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
121
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
122
            'offset': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
123
            'reserved_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
124
            'size': ('django.db.models.fields.IntegerField', [], {})
125
        },
126
        'db.network': {
127
            'Meta': {'object_name': 'Network'},
128
            'action': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '32', 'null': 'True'}),
129
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
130
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
131
            'dhcp': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
132
            'drained': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
133
            'flavor': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
134
            'floating_ip_pool': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
135
            'gateway': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
136
            'gateway6': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
137
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
138
            'link': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
139
            'mac_prefix': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
140
            'machines': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['db.VirtualMachine']", 'through': "orm['db.NetworkInterface']", 'symmetrical': 'False'}),
141
            'mode': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True'}),
142
            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
143
            'pool': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'network'", 'unique': 'True', 'null': 'True', 'to': "orm['db.IPPoolTable']"}),
144
            'public': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
145
            'serial': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'network'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['db.QuotaHolderSerial']"}),
146
            'state': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '32'}),
147
            'subnet': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
148
            'subnet6': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
149
            'tags': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
150
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
151
            'userid': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'db_index': 'True'})
152
        },
153
        'db.networkinterface': {
154
            'Meta': {'unique_together': "(('network', 'ipv4'),)", 'object_name': 'NetworkInterface'},
155
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
156
            'dirty': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
157
            'firewall_profile': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
158
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
159
            'index': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
160
            'ipv4': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True'}),
161
            'ipv6': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
162
            'mac': ('django.db.models.fields.CharField', [], {'max_length': '32', 'unique': 'True', 'null': 'True'}),
163
            'machine': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nics'", 'to': "orm['db.VirtualMachine']"}),
164
            'network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nics'", 'to': "orm['db.Network']"}),
165
            'state': ('django.db.models.fields.CharField', [], {'default': "'ACTIVE'", 'max_length': '32'}),
166
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
167
        },
168
        'db.quotaholderserial': {
169
            'Meta': {'ordering': "['serial']", 'object_name': 'QuotaHolderSerial'},
170
            'accept': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
171
            'pending': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
172
            'resolved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
173
            'serial': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True', 'db_index': 'True'})
174
        },
175
        'db.subnet': {
176
            'Meta': {'object_name': 'Subnet'},
177
            'cidr': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
178
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
179
            'dhcp': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
180
            'dns_nameservers': ('synnefo.db.fields.SeparatedValuesField', [], {'null': 'True'}),
181
            'gateway': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
182
            'host_routes': ('synnefo.db.fields.SeparatedValuesField', [], {'null': 'True'}),
183
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
184
            'ipversion': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
185
            'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
186
            'network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'subnets'", 'to': "orm['db.Network']"})
187
        },
188
        'db.virtualmachine': {
189
            'Meta': {'object_name': 'VirtualMachine'},
190
            'action': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '30', 'null': 'True'}),
191
            'backend': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'virtual_machines'", 'null': 'True', 'on_delete': 'models.PROTECT', 'to': "orm['db.Backend']"}),
192
            'backend_hash': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
193
            'backendjobid': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
194
            'backendjobstatus': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
195
            'backendlogmsg': ('django.db.models.fields.TextField', [], {'null': 'True'}),
196
            'backendopcode': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
197
            'backendtime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1, 1, 1, 0, 0)'}),
198
            'buildpercentage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
199
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
200
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
201
            'flavor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.Flavor']", 'on_delete': 'models.PROTECT'}),
202
            'hostid': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
203
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
204
            'imageid': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
205
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
206
            'operstate': ('django.db.models.fields.CharField', [], {'default': "'BUILD'", 'max_length': '30'}),
207
            'serial': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'virtual_machine'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['db.QuotaHolderSerial']"}),
208
            'suspended': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
209
            'task': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
210
            'task_job_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
211
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
212
            'userid': ('django.db.models.fields.CharField', [], {'max_length': '100', 'db_index': 'True'})
213
        },
214
        'db.virtualmachinediagnostic': {
215
            'Meta': {'ordering': "['-created']", 'object_name': 'VirtualMachineDiagnostic'},
216
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
217
            'details': ('django.db.models.fields.TextField', [], {'null': 'True'}),
218
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
219
            'level': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
220
            'machine': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'diagnostics'", 'to': "orm['db.VirtualMachine']"}),
221
            'message': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
222
            'source': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
223
            'source_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
224
        },
225
        'db.virtualmachinemetadata': {
226
            'Meta': {'unique_together': "(('meta_key', 'vm'),)", 'object_name': 'VirtualMachineMetadata'},
227
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
228
            'meta_key': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
229
            'meta_value': ('django.db.models.fields.CharField', [], {'max_length': '500'}),
230
            'vm': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'metadata'", 'to': "orm['db.VirtualMachine']"})
231
        }
232
    }
233

  
234
    complete_apps = ['db']
b/snf-cyclades-app/synnefo/db/models.py
500 500
    drained = models.BooleanField("Drained", default=False, null=False)
501 501
    floating_ip_pool = models.BooleanField('Floating IP Pool', null=False,
502 502
                                           default=False)
503
    pool = models.OneToOneField('IPPoolTable', related_name='network',
504
                                default=lambda: IPPoolTable.objects.create(
505
                                                            available_map='',
506
                                                            reserved_map='',
507
                                                            size=0),
508
                                null=True)
503
    pool = models.OneToOneField('IPPoolTable', related_name='network', null=True)
509 504
    serial = models.ForeignKey(QuotaHolderSerial, related_name='network',
510 505
                               null=True, on_delete=models.SET_NULL)
511 506

  
......
586 581
            return repr(str(self._action))
587 582

  
588 583

  
584
class Subnet(models.Model):
585
    SUBNET_NAME_LENGTH = 128
586

  
587
    network = models.ForeignKey('Network', null=False, db_index=True,
588
                                related_name="subnets")
589
    name = models.CharField('Subnet Name', max_length=SUBNET_NAME_LENGTH,
590
                            null=True)
591
    ipversion = models.IntegerField('IP Version', default=4, null=False)
592
    cidr = models.CharField('Subnet', max_length=64, null=True)
593
    gateway = models.CharField('Gateway', max_length=64, null=True)
594
    dhcp = models.BooleanField('DHCP', default=True)
595
    deleted = models.BooleanField('Deleted', default=False, db_index=True)
596
    host_routes = fields.SeparatedValuesField('Host Routes', null=True)
597
    dns_nameservers = fields.SeparatedValuesField('DNS Nameservers', null=True)
598

  
599
    def __unicode__(self):
600
        return "<Subnet %s, Network: %s>" % (self.id, self.network_id)
601

  
602

  
589 603
class BackendNetwork(models.Model):
590 604
    OPER_STATES = (
591 605
        ('PENDING', 'Pending'),
......
792 806
class IPPoolTable(PoolTable):
793 807
    manager = pools.IPPool
794 808

  
795
    def __unicode__(self):
796
        return u"<IPv4AdressPool, network: %s>" % self.network
809
    subnet = models.ForeignKey('Subnet', related_name="ip_pools",
810
                               db_index=True, null=True)
797 811

  
812
    def __unicode__(self):
813
        return u"<IPv4AdressPool, Subnet: %s>" % self.subnet_id
798 814

  
799 815
@contextmanager
800 816
def pooled_rapi_client(obj):

Also available in: Unified diff