Revision 051e47f8

b/snf-cyclades-app/synnefo/api/servers.py
489 489 

  		





  490
  490
  
    
    log.debug('list_addresses %s', server_id)


  		





  491
  491
  
    
    vm = util.get_vm(server_id, request.user_uniq)


  		





  492
  
  
    
    attachments = [nic_to_dict(nic) for nic in vm.nics.all()]


  		





  
  492
  
    
    attachments = [nic_to_dict(nic) for nic in vm.nics.filter(state="ACTIVE")]


  		





  493
  493
  
    
    addresses = attachments_to_addresses(attachments)


  		





  494
  494
  
    

  		





  495
  495
  
    
    if request.serialization == 'xml':


  		





  ......




  513
  513
  
    
    log.debug('list_addresses_by_network %s %s', server_id, network_id)


  		





  514
  514
  
    
    machine = util.get_vm(server_id, request.user_uniq)


  		





  515
  515
  
    
    network = util.get_network(network_id, request.user_uniq)


  		





  516
  
  
    
    nics = machine.nics.filter(network=network).all()


  		





  
  516
  
    
    nics = machine.nics.filter(network=network, state="ACTIVE").all()


  		





  517
  517
  
    
    addresses = attachments_to_addresses(map(nic_to_dict, nics))


  		





  518
  518
  
    

  		





  519
  519
  
    
    if request.serialization == 'xml':


  		












  

    
      b/snf-cyclades-app/synnefo/db/migrations/0072_auto__chg_field_networkinterface_index.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
  
    

  		





  
  12
  
    
        # Changing field 'NetworkInterface.index'


  		





  
  13
  
    
        db.alter_column('db_networkinterface', 'index', self.gf('django.db.models.fields.IntegerField')(null=True))


  		





  
  14
  
    

  		





  
  15
  
    
    def backwards(self, orm):


  		





  
  16
  
    

  		





  
  17
  
    
        # Changing field 'NetworkInterface.index'


  		





  
  18
  
    
        db.alter_column('db_networkinterface', 'index', self.gf('django.db.models.fields.IntegerField')(default=0))


  		





  
  19
  
    

  		





  
  20
  
    
    models = {


  		





  
  21
  
    
        'db.backend': {


  		





  
  22
  
    
            'Meta': {'ordering': "['clustername']", 'object_name': 'Backend'},


  		





  
  23
  
    
            'clustername': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),


  		





  
  24
  
    
            'ctotal': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),


  		





  
  25
  
    
            'dfree': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),


  		





  
  26
  
    
            'drained': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  27
  
    
            'dtotal': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),


  		





  
  28
  
    
            'hash': ('django.db.models.fields.CharField', [], {'max_length': '40'}),


  		





  
  29
  
    
            'hypervisor': ('django.db.models.fields.CharField', [], {'default': "'kvm'", 'max_length': '32'}),


  		





  
  30
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  31
  
    
            'index': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'unique': 'True'}),


  		





  
  32
  
    
            'mfree': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),


  		





  
  33
  
    
            'mtotal': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),


  		





  
  34
  
    
            'offline': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  35
  
    
            'password_hash': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),


  		





  
  36
  
    
            'pinst_cnt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),


  		





  
  37
  
    
            'port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '5080'}),


  		





  
  38
  
    
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  39
  
    
            'username': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'})


  		





  
  40
  
    
        },


  		





  
  41
  
    
        'db.backendnetwork': {


  		





  
  42
  
    
            'Meta': {'unique_together': "(('network', 'backend'),)", 'object_name': 'BackendNetwork'},


  		





  
  43
  
    
            'backend': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'networks'", 'to': "orm['db.Backend']"}),


  		





  
  44
  
    
            'backendjobid': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),


  		





  
  45
  
    
            'backendjobstatus': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),


  		





  
  46
  
    
            'backendlogmsg': ('django.db.models.fields.TextField', [], {'null': 'True'}),


  		





  
  47
  
    
            'backendopcode': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),


  		





  
  48
  
    
            'backendtime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1, 1, 1, 0, 0)'}),


  		





  
  49
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  50
  
    
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  51
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  52
  
    
            'mac_prefix': ('django.db.models.fields.CharField', [], {'max_length': '32'}),


  		





  
  53
  
    
            'network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'backend_networks'", 'to': "orm['db.Network']"}),


  		





  
  54
  
    
            'operstate': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '30'}),


  		





  
  55
  
    
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})


  		





  
  56
  
    
        },


  		





  
  57
  
    
        'db.bridgepooltable': {


  		





  
  58
  
    
            'Meta': {'object_name': 'BridgePoolTable'},


  		





  
  59
  
    
            'available_map': ('django.db.models.fields.TextField', [], {'default': "''"}),


  		





  
  60
  
    
            'base': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),


  		





  
  61
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  62
  
    
            'offset': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),


  		





  
  63
  
    
            'reserved_map': ('django.db.models.fields.TextField', [], {'default': "''"}),


  		





  
  64
  
    
            'size': ('django.db.models.fields.IntegerField', [], {})


  		





  
  65
  
    
        },


  		





  
  66
  
    
        'db.flavor': {


  		





  
  67
  
    
            'Meta': {'unique_together': "(('cpu', 'ram', 'disk', 'disk_template'),)", 'object_name': 'Flavor'},


  		





  
  68
  
    
            'cpu': ('django.db.models.fields.IntegerField', [], {'default': '0'}),


  		





  
  69
  
    
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  70
  
    
            'disk': ('django.db.models.fields.IntegerField', [], {'default': '0'}),


  		





  
  71
  
    
            'disk_template': ('django.db.models.fields.CharField', [], {'max_length': '32'}),


  		





  
  72
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  73
  
    
            'ram': ('django.db.models.fields.IntegerField', [], {'default': '0'})


  		





  
  74
  
    
        },


  		





  
  75
  
    
        'db.floatingip': {


  		





  
  76
  
    
            'Meta': {'object_name': 'FloatingIP'},


  		





  
  77
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  78
  
    
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  79
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  80
  
    
            'ipv4': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15', 'db_index': 'True'}),


  		





  
  81
  
    
            'machine': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'floating_ips'", 'null': 'True', 'to': "orm['db.VirtualMachine']"}),


  		





  
  82
  
    
            'network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'floating_ips'", 'to': "orm['db.Network']"}),


  		





  
  83
  
    
            'serial': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'floating_ips'", 'null': 'True', 'to': "orm['db.QuotaHolderSerial']"}),


  		





  
  84
  
    
            'userid': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'})


  		





  
  85
  
    
        },


  		





  
  86
  
    
        'db.ippooltable': {


  		





  
  87
  
    
            'Meta': {'object_name': 'IPPoolTable'},


  		





  
  88
  
    
            'available_map': ('django.db.models.fields.TextField', [], {'default': "''"}),


  		





  
  89
  
    
            'base': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),


  		





  
  90
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  91
  
    
            'offset': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),


  		





  
  92
  
    
            'reserved_map': ('django.db.models.fields.TextField', [], {'default': "''"}),


  		





  
  93
  
    
            'size': ('django.db.models.fields.IntegerField', [], {})


  		





  
  94
  
    
        },


  		





  
  95
  
    
        'db.macprefixpooltable': {


  		





  
  96
  
    
            'Meta': {'object_name': 'MacPrefixPoolTable'},


  		





  
  97
  
    
            'available_map': ('django.db.models.fields.TextField', [], {'default': "''"}),


  		





  
  98
  
    
            'base': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),


  		





  
  99
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  100
  
    
            'offset': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),


  		





  
  101
  
    
            'reserved_map': ('django.db.models.fields.TextField', [], {'default': "''"}),


  		





  
  102
  
    
            'size': ('django.db.models.fields.IntegerField', [], {})


  		





  
  103
  
    
        },


  		





  
  104
  
    
        'db.network': {


  		





  
  105
  
    
            'Meta': {'object_name': 'Network'},


  		





  
  106
  
    
            'action': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '32', 'null': 'True'}),


  		





  
  107
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  108
  
    
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),


  		





  
  109
  
    
            'dhcp': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),


  		





  
  110
  
    
            'drained': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  111
  
    
            'flavor': ('django.db.models.fields.CharField', [], {'max_length': '32'}),


  		





  
  112
  
    
            'floating_ip_pool': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  113
  
    
            'gateway': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),


  		





  
  114
  
    
            'gateway6': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),


  		





  
  115
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  116
  
    
            'link': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),


  		





  
  117
  
    
            'mac_prefix': ('django.db.models.fields.CharField', [], {'max_length': '32'}),


  		





  
  118
  
    
            'machines': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['db.VirtualMachine']", 'through': "orm['db.NetworkInterface']", 'symmetrical': 'False'}),


  		





  
  119
  
    
            'mode': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True'}),


  		





  
  120
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),


  		





  
  121
  
    
            'pool': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'network'", 'unique': 'True', 'null': 'True', 'to': "orm['db.IPPoolTable']"}),


  		





  
  122
  
    
            'public': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),


  		





  
  123
  
    
            'serial': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'network'", 'null': 'True', 'to': "orm['db.QuotaHolderSerial']"}),


  		





  
  124
  
    
            'state': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '32'}),


  		





  
  125
  
    
            'subnet': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),


  		





  
  126
  
    
            'subnet6': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),


  		





  
  127
  
    
            'tags': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),


  		





  
  128
  
    
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),


  		





  
  129
  
    
            'userid': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'db_index': 'True'})


  		





  
  130
  
    
        },


  		





  
  131
  
    
        'db.networkinterface': {


  		





  
  132
  
    
            'Meta': {'object_name': 'NetworkInterface'},


  		





  
  133
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  134
  
    
            'dirty': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  135
  
    
            'firewall_profile': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),


  		





  
  136
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  137
  
    
            'index': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),


  		





  
  138
  
    
            'ipv4': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True'}),


  		





  
  139
  
    
            'ipv6': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),


  		





  
  140
  
    
            'mac': ('django.db.models.fields.CharField', [], {'max_length': '32', 'unique': 'True', 'null': 'True'}),


  		





  
  141
  
    
            'machine': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nics'", 'to': "orm['db.VirtualMachine']"}),


  		





  
  142
  
    
            'network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nics'", 'to': "orm['db.Network']"}),


  		





  
  143
  
    
            'state': ('django.db.models.fields.CharField', [], {'default': "'ACTIVE'", 'max_length': '32'}),


  		





  
  144
  
    
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})


  		





  
  145
  
    
        },


  		





  
  146
  
    
        'db.quotaholderserial': {


  		





  
  147
  
    
            'Meta': {'ordering': "['serial']", 'object_name': 'QuotaHolderSerial'},


  		





  
  148
  
    
            'accept': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  149
  
    
            'pending': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),


  		





  
  150
  
    
            'resolved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  151
  
    
            'serial': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True', 'db_index': 'True'})


  		





  
  152
  
    
        },


  		





  
  153
  
    
        'db.virtualmachine': {


  		





  
  154
  
    
            'Meta': {'object_name': 'VirtualMachine'},


  		





  
  155
  
    
            'action': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '30', 'null': 'True'}),


  		





  
  156
  
    
            'backend': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'virtual_machines'", 'null': 'True', 'to': "orm['db.Backend']"}),


  		





  
  157
  
    
            'backend_hash': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),


  		





  
  158
  
    
            'backendjobid': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),


  		





  
  159
  
    
            'backendjobstatus': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),


  		





  
  160
  
    
            'backendlogmsg': ('django.db.models.fields.TextField', [], {'null': 'True'}),


  		





  
  161
  
    
            'backendopcode': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),


  		





  
  162
  
    
            'backendtime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1, 1, 1, 0, 0)'}),


  		





  
  163
  
    
            'buildpercentage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),


  		





  
  164
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  165
  
    
            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),


  		





  
  166
  
    
            'flavor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.Flavor']"}),


  		





  
  167
  
    
            'hostid': ('django.db.models.fields.CharField', [], {'max_length': '100'}),


  		





  
  168
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  169
  
    
            'imageid': ('django.db.models.fields.CharField', [], {'max_length': '100'}),


  		





  
  170
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),


  		





  
  171
  
    
            'operstate': ('django.db.models.fields.CharField', [], {'default': "'BUILD'", 'max_length': '30'}),


  		





  
  172
  
    
            'serial': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'virtual_machine'", 'null': 'True', 'to': "orm['db.QuotaHolderSerial']"}),


  		





  
  173
  
    
            'suspended': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  174
  
    
            'task': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),


  		





  
  175
  
    
            'task_job_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),


  		





  
  176
  
    
            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),


  		





  
  177
  
    
            'userid': ('django.db.models.fields.CharField', [], {'max_length': '100', 'db_index': 'True'})


  		





  
  178
  
    
        },


  		





  
  179
  
    
        'db.virtualmachinediagnostic': {


  		





  
  180
  
    
            'Meta': {'ordering': "['-created']", 'object_name': 'VirtualMachineDiagnostic'},


  		





  
  181
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  182
  
    
            'details': ('django.db.models.fields.TextField', [], {'null': 'True'}),


  		





  
  183
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  184
  
    
            'level': ('django.db.models.fields.CharField', [], {'max_length': '20'}),


  		





  
  185
  
    
            'machine': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'diagnostics'", 'to': "orm['db.VirtualMachine']"}),


  		





  
  186
  
    
            'message': ('django.db.models.fields.CharField', [], {'max_length': '255'}),


  		





  
  187
  
    
            'source': ('django.db.models.fields.CharField', [], {'max_length': '100'}),


  		





  
  188
  
    
            'source_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})


  		





  
  189
  
    
        },


  		





  
  190
  
    
        'db.virtualmachinemetadata': {


  		





  
  191
  
    
            'Meta': {'unique_together': "(('meta_key', 'vm'),)", 'object_name': 'VirtualMachineMetadata'},


  		





  
  192
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  193
  
    
            'meta_key': ('django.db.models.fields.CharField', [], {'max_length': '50'}),


  		





  
  194
  
    
            'meta_value': ('django.db.models.fields.CharField', [], {'max_length': '500'}),


  		





  
  195
  
    
            'vm': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'metadata'", 'to': "orm['db.VirtualMachine']"})


  		





  
  196
  
    
        }


  		





  
  197
  
    
    }


  		





  
  198
  
    

  		





  
  199
  
    
    complete_apps = ['db']


  		












  

    
      b/snf-cyclades-app/synnefo/db/models.py
    
  






  698
  698
  
    
    network = models.ForeignKey(Network, related_name='nics')


  		





  699
  699
  
    
    created = models.DateTimeField(auto_now_add=True)


  		





  700
  700
  
    
    updated = models.DateTimeField(auto_now=True)


  		





  701
  
  
    
    index = models.IntegerField(null=False)


  		





  
  701
  
    
    index = models.IntegerField(null=True)


  		





  702
  702
  
    
    mac = models.CharField(max_length=32, null=True, unique=True)


  		





  703
  703
  
    
    ipv4 = models.CharField(max_length=15, null=True)


  		





  704
  704
  
    
    ipv6 = models.CharField(max_length=100, null=True)


  		












Also available in:
  Unified diff