Revision 6dafedf6

b/snf-cyclades-app/synnefo/api/management/commands/network-list.py
88 88
        "mode": ("mode", "The mode of the network"),
89 89
        "link": ("link", "The link of the network"),
90 90
        "mac_prefix": ("mac_prefix", "The network's MAC prefix"),
91
        "drained": ("drained", "Whether network is drained or not"),
91 92
        "vms": (get_machines, "Number of connected servers"),
92 93
        "backends": (get_backends, "IDs of Ganeti backends that the network is"
93 94
                                   " connected to"),
94 95
    }
95 96

  
96 97
    fields = ["id", "name", "user.uuid", "state", "public", "subnet.ipv4",
97
              "gateway.ipv4", "link", "mac_prefix", "dhcp"]
98
              "gateway.ipv4", "link", "mac_prefix", "dhcp", "drained"]
98 99

  
99 100
    def handle_args(self, *args, **options):
100 101
        if options["public"]:
b/snf-cyclades-app/synnefo/api/management/commands/network-modify.py
109 109
            '--remove-reserved-ips',
110 110
            dest="remove_reserved_ips",
111 111
            help="Comma seperated list of IPs to externally release."),
112

  
112
        make_option(
113
            "--drained",
114
            dest="drained",
115
            metavar="True|False",
116
            choices=["True", "False"],
117
            help="Set as drained to exclude for IP allocation."
118
                 " Only used for public networks.")
113 119
    )
114 120

  
115 121
    def handle(self, *args, **options):
......
133 139
        dhcp = options.get("dhcp")
134 140
        if dhcp:
135 141
            options["dhcp"] = parse_bool(dhcp)
142
        drained = options.get("drained")
143
        if drained:
144
            options["drained"] = parse_bool(drained)
136 145
        fields = ('name', 'userid', 'subnet', 'gateway', 'subnet6', 'gateway6',
137
                  'dhcp', 'state', 'link', 'mac_prefix')
146
                  'dhcp', 'state', 'link', 'mac_prefix', 'drained')
138 147
        for field in fields:
139 148
            value = options.get(field, None)
140 149
            if value is not None:
b/snf-cyclades-app/synnefo/api/test/servers.py
211 211
        self.assertEqual(api_server['name'], db_vm.name)
212 212
        self.assertEqual(api_server['status'], db_vm.operstate)
213 213

  
214
        # Test drained flag in Network:
215
        network.drained = True
216
        network.save()
217
        with mocked_quotaholder():
218
            response = self.post('/api/v1.1/servers', 'test_user',
219
                                     json.dumps(request), 'json')
220
        self.assertEqual(response.status_code, 503, "serviceUnavailable")
221

  
214 222
    def test_create_server_no_flavor(self, mrapi, mimage):
215 223
        request = {
216 224
                    "server": {
b/snf-cyclades-app/synnefo/api/util.py
299 299
    to the specified backend.
300 300

  
301 301
    """
302
    for network in Network.objects.filter(public=True, deleted=False):
302
    for network in Network.objects.filter(public=True, deleted=False,
303
                                          drained=False):
303 304
        if BackendNetwork.objects.filter(network=network,
304 305
                                         backend=backend).exists():
305 306
            yield network
b/snf-cyclades-app/synnefo/db/migrations/0068_auto__add_field_network_drained.py
1
# encoding: 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
class Migration(SchemaMigration):
8

  
9
    def forwards(self, orm):
10
        
11
        # Adding field 'Network.drained'
12
        db.add_column('db_network', 'drained', self.gf('django.db.models.fields.BooleanField')(default=False, blank=True), keep_default=False)
13

  
14

  
15
    def backwards(self, orm):
16
        
17
        # Deleting field 'Network.drained'
18
        db.delete_column('db_network', 'drained')
19

  
20

  
21
    models = {
22
        'db.backend': {
23
            'Meta': {'object_name': 'Backend'},
24
            'clustername': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
25
            'ctotal': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
26
            'dfree': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
27
            'drained': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
28
            'dtotal': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
29
            'hash': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
30
            'hypervisor': ('django.db.models.fields.CharField', [], {'default': "'kvm'", 'max_length': '32'}),
31
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
32
            'index': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'unique': 'True'}),
33
            'mfree': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
34
            'mtotal': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
35
            'offline': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
36
            'password_hash': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
37
            'pinst_cnt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
38
            'port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '5080'}),
39
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
40
            'username': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'})
41
        },
42
        'db.backendnetwork': {
43
            'Meta': {'unique_together': "(('network', 'backend'),)", 'object_name': 'BackendNetwork'},
44
            'backend': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'networks'", 'to': "orm['db.Backend']"}),
45
            'backendjobid': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
46
            'backendjobstatus': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
47
            'backendlogmsg': ('django.db.models.fields.TextField', [], {'null': 'True'}),
48
            'backendopcode': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
49
            'backendtime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1, 1, 1, 0, 0)'}),
50
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
51
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
52
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
53
            'mac_prefix': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
54
            'network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'backend_networks'", 'to': "orm['db.Network']"}),
55
            'operstate': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '30'}),
56
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
57
        },
58
        'db.bridgepooltable': {
59
            'Meta': {'object_name': 'BridgePoolTable'},
60
            'available_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
61
            'base': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
62
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
63
            'offset': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
64
            'reserved_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
65
            'size': ('django.db.models.fields.IntegerField', [], {})
66
        },
67
        'db.flavor': {
68
            'Meta': {'unique_together': "(('cpu', 'ram', 'disk', 'disk_template'),)", 'object_name': 'Flavor'},
69
            'cpu': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
70
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
71
            'disk': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
72
            'disk_template': ('django.db.models.fields.CharField', [], {'default': "'plain'", 'max_length': '32'}),
73
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
74
            'ram': ('django.db.models.fields.IntegerField', [], {'default': '0'})
75
        },
76
        'db.ippooltable': {
77
            'Meta': {'object_name': 'IPPoolTable'},
78
            'available_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
79
            'base': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
80
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
81
            'offset': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
82
            'reserved_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
83
            'size': ('django.db.models.fields.IntegerField', [], {})
84
        },
85
        'db.macprefixpooltable': {
86
            'Meta': {'object_name': 'MacPrefixPoolTable'},
87
            'available_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
88
            'base': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
89
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
90
            'offset': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
91
            'reserved_map': ('django.db.models.fields.TextField', [], {'default': "''"}),
92
            'size': ('django.db.models.fields.IntegerField', [], {})
93
        },
94
        'db.network': {
95
            'Meta': {'object_name': 'Network'},
96
            'action': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '32', 'null': 'True'}),
97
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
98
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}),
99
            'dhcp': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
100
            'drained': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
101
            'flavor': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
102
            'gateway': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
103
            'gateway6': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
104
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
105
            'link': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
106
            'mac_prefix': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
107
            'machines': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['db.VirtualMachine']", 'through': "orm['db.NetworkInterface']", 'symmetrical': 'False'}),
108
            'mode': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True'}),
109
            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
110
            'pool': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'network'", 'unique': 'True', 'null': 'True', 'to': "orm['db.IPPoolTable']"}),
111
            'public': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}),
112
            'serial': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'network'", 'null': 'True', 'to': "orm['db.QuotaHolderSerial']"}),
113
            'state': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '32'}),
114
            'subnet': ('django.db.models.fields.CharField', [], {'default': "'10.0.0.0/24'", 'max_length': '32'}),
115
            'subnet6': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
116
            'tags': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
117
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
118
            'userid': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'db_index': 'True'})
119
        },
120
        'db.networkinterface': {
121
            'Meta': {'object_name': 'NetworkInterface'},
122
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
123
            'dirty': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
124
            'firewall_profile': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
125
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
126
            'index': ('django.db.models.fields.IntegerField', [], {}),
127
            'ipv4': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True'}),
128
            'ipv6': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
129
            'mac': ('django.db.models.fields.CharField', [], {'max_length': '32', 'unique': 'True', 'null': 'True'}),
130
            'machine': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nics'", 'to': "orm['db.VirtualMachine']"}),
131
            'network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nics'", 'to': "orm['db.Network']"}),
132
            'state': ('django.db.models.fields.CharField', [], {'default': "'ACTIVE'", 'max_length': '32'}),
133
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
134
        },
135
        'db.quotaholderserial': {
136
            'Meta': {'object_name': 'QuotaHolderSerial'},
137
            'accept': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
138
            'pending': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True', 'blank': 'True'}),
139
            'resolved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
140
            'serial': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True', 'db_index': 'True'})
141
        },
142
        'db.virtualmachine': {
143
            'Meta': {'object_name': 'VirtualMachine'},
144
            'action': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
145
            'backend': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'virtual_machines'", 'null': 'True', 'to': "orm['db.Backend']"}),
146
            'backend_hash': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
147
            'backendjobid': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
148
            'backendjobstatus': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
149
            'backendlogmsg': ('django.db.models.fields.TextField', [], {'null': 'True'}),
150
            'backendopcode': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
151
            'backendtime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1, 1, 1, 0, 0)'}),
152
            'buildpercentage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
153
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
154
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}),
155
            'flavor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.Flavor']"}),
156
            'hostid': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
157
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
158
            'imageid': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
159
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
160
            'operstate': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
161
            'serial': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'virtual_machine'", 'null': 'True', 'to': "orm['db.QuotaHolderSerial']"}),
162
            'suspended': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
163
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
164
            'userid': ('django.db.models.fields.CharField', [], {'max_length': '100', 'db_index': 'True'})
165
        },
166
        'db.virtualmachinediagnostic': {
167
            'Meta': {'object_name': 'VirtualMachineDiagnostic'},
168
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
169
            'details': ('django.db.models.fields.TextField', [], {'null': 'True'}),
170
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
171
            'level': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
172
            'machine': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'diagnostics'", 'to': "orm['db.VirtualMachine']"}),
173
            'message': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
174
            'source': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
175
            'source_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
176
        },
177
        'db.virtualmachinemetadata': {
178
            'Meta': {'unique_together': "(('meta_key', 'vm'),)", 'object_name': 'VirtualMachineMetadata'},
179
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
180
            'meta_key': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
181
            'meta_value': ('django.db.models.fields.CharField', [], {'max_length': '500'}),
182
            'vm': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'metadata'", 'to': "orm['db.VirtualMachine']"})
183
        }
184
    }
185

  
186
    complete_apps = ['db']
b/snf-cyclades-app/synnefo/db/models.py
512 512
                                      through='NetworkInterface')
513 513
    action = models.CharField(choices=ACTIONS, max_length=32, null=True,
514 514
                              default=None)
515
    drained = models.BooleanField("Drained", default=False, null=False)
515 516

  
516 517
    pool = models.OneToOneField('IPPoolTable', related_name='network',
517 518
                default=lambda: IPPoolTable.objects.create(available_map='',
b/snf-cyclades-app/synnefo/logic/management/commands/backend-list.py
52 52
        free_ips = 0
53 53
        total_ips = 0
54 54
        for bnet in backend.networks.filter(deleted=False,
55
                                            network__drained=False,
55 56
                                            network__public=True,
56 57
                                            network__deleted=False):
57 58
            network = bnet.network

Also available in: Unified diff