/ - Diff - Synnefo - Greek Research and Technology Network's projects

     def nic_to_dict(nic):
         ip_type = "floating" if nic.is_floating_ip else "fixed"
         d = {'id': util.construct_nic_id(nic),
              'network_id': str(nic.network.id),
              'mac_address': nic.mac,
              'ipv4': nic.ipv4 if nic.ipv4 else None,
              'ipv6': nic.ipv6 if nic.ipv6 else None}
              'ipv6': nic.ipv6 if nic.ipv6 else None,
              'OS-EXT-IPS:type': ip_type}
         if nic.firewall_profile:
             d['firewallProfile'] = nic.firewall_profile
         return d
     def nics_to_addresses(nics):
     def attachments_to_addresses(attachments):
         addresses = {}
         for nic in nics:
         for nic in attachments:
             net_nics = []
             net_nics.append({"version": 4,
                              "addr": nic.ipv4,
                              "OS-EXT-IPS:type": "fixed"})
             if nic.ipv6:
                              "addr": nic["ipv4"],
                              "OS-EXT-IPS:type": nic["OS-EXT-IPS:type"]})
             if nic["ipv6"]:
                 net_nics.append({"version": 6,
                                  "addr": nic.ipv6,
                                  "OS-EXT-IPS:type": "fixed"})
             addresses[nic.network.id] = net_nics
                                  "addr": nic["ipv6"],
                                  "OS-EXT-IPS:type": nic["OS-EXT-IPS:type"]})
             addresses[nic["network_id"]] = net_nics
         return addresses
-...
             vm_nics = vm.nics.filter(state="ACTIVE").order_by("index")
             attachments = map(nic_to_dict, vm_nics)
             d['attachments'] = attachments
             d['addresses'] = nics_to_addresses(vm_nics)
             d['addresses'] = attachments_to_addresses(attachments)
             # include the latest vm diagnostic, if set
             diagnostic = vm.get_last_diagnostic()
-...
         log.debug('list_addresses %s', server_id)
         vm = util.get_vm(server_id, request.user_uniq)
         attachments = [nic_to_dict(nic) for nic in vm.nics.all()]
         addresses = nics_to_addresses(vm.nics.all())
         addresses = attachments_to_addresses(attachments)
         if request.serialization == 'xml':
             data = render_to_string('list_addresses.xml', {'addresses': addresses})
-...
         machine = util.get_vm(server_id, request.user_uniq)
         network = util.get_network(network_id, request.user_uniq)
         nics = machine.nics.filter(network=network).all()
         addresses = nics_to_addresses(nics)
         addresses = attachments_to_addresses(map(nic_to_dict, nics))
         if request.serialization == 'xml':
             data = render_to_string('address.xml', {'addresses': addresses})

             ip1_after = FloatingIP.objects.get(id=ip1.id)
             self.assertEqual(ip1_after.machine, self.vm)
             self.assertTrue(ip1_after.in_use())
             self.vm.nics.create(ipv4=ip1_after.ipv4, network=ip1_after.network,
                                 state="ACTIVE", index=0)
             response = self.get(SERVERS_URL + "/%s" % self.vm.id,
                                 self.vm.userid)
             self.assertSuccess(response)
             nic = json.loads(response.content)["server"]["attachments"][0]
             self.assertEqual(nic["OS-EXT-IPS:type"], "floating")
         @patch('synnefo.logic.rapi_pool.GanetiRapiClient')
         def test_remove_floating_ip(self, mock):

b/snf-cyclades-app/synnefo/api/test/servers.py
142	142	self.assertEqual(api_nic['firewallProfile'], nic.firewall_profile)
143	143	self.assertEqual(api_nic['ipv4'], nic.ipv4)
144	144	self.assertEqual(api_nic['ipv6'], nic.ipv6)
	145	self.assertEqual(api_nic['OS-EXT-IPS:type'],"fixed")
145	146	self.assertEqual(api_nic['id'], 'nic-%s-%s' % (db_vm.id, nic.index))
146	147	api_address = server["addresses"]
147	148	self.assertEqual(api_address[str(net.id)],

Synnefo

Revision 78c165cf