Revision 8d325d4b
| b/snf-cyclades-app/synnefo/api/servers.py | ||
|---|---|---|
| 108 | 108 |
d = {'id': util.construct_nic_id(nic),
|
| 109 | 109 |
'network_id': str(nic.network.id), |
| 110 | 110 |
'mac_address': nic.mac, |
| 111 |
'ipv4': nic.ipv4 if nic.ipv4 else None,
|
|
| 112 |
'ipv6': nic.ipv6 if nic.ipv6 else None,
|
|
| 111 |
'ipv4': nic.ipv4, |
|
| 112 |
'ipv6': nic.ipv6, |
|
| 113 | 113 |
'OS-EXT-IPS:type': ip_type} |
| 114 | 114 |
|
| 115 | 115 |
if nic.firewall_profile: |
| b/snf-cyclades-app/synnefo/logic/backend.py | ||
|---|---|---|
| 231 | 231 |
vm.nics.all().delete() |
| 232 | 232 |
|
| 233 | 233 |
for nic in ganeti_nics: |
| 234 |
ipv4 = nic.get('ipv4', '')
|
|
| 234 |
ipv4 = nic["ipv4"]
|
|
| 235 | 235 |
net = nic['network'] |
| 236 | 236 |
if ipv4: |
| 237 | 237 |
net.reserve_address(ipv4) |
| ... | ... | |
| 257 | 257 |
net = Network.objects.get(pk=pk) |
| 258 | 258 |
|
| 259 | 259 |
# Get the new nic info |
| 260 |
mac = new_nic.get('mac', '')
|
|
| 261 |
ipv4 = new_nic.get('ip', '')
|
|
| 262 |
if net.subnet6: |
|
| 263 |
ipv6 = mac2eui64(mac, net.subnet6) |
|
| 264 |
else: |
|
| 265 |
ipv6 = '' |
|
| 266 |
|
|
| 267 |
firewall = new_nic.get('firewall', '')
|
|
| 268 |
firewall_profile = _reverse_tags.get(firewall, '') |
|
| 260 |
mac = new_nic.get('mac')
|
|
| 261 |
ipv4 = new_nic.get('ip')
|
|
| 262 |
ipv6 = mac2eui64(mac, net.subnet6) if net.subnet6 is not None else None |
|
| 263 |
|
|
| 264 |
firewall = new_nic.get('firewall')
|
|
| 265 |
firewall_profile = _reverse_tags.get(firewall) |
|
| 269 | 266 |
if not firewall_profile and net.public: |
| 270 | 267 |
firewall_profile = settings.DEFAULT_FIREWALL_PROFILE |
| 271 | 268 |
|
| b/snf-cyclades-app/synnefo/logic/tests.py | ||
|---|---|---|
| 470 | 470 |
nics = db_vm.nics.all() |
| 471 | 471 |
self.assertEqual(len(nics), 1) |
| 472 | 472 |
self.assertEqual(nics[0].index, 0) |
| 473 |
self.assertEqual(nics[0].ipv4, '')
|
|
| 474 |
self.assertEqual(nics[0].ipv6, '')
|
|
| 475 |
self.assertEqual(nics[0].mac, '')
|
|
| 473 |
self.assertEqual(nics[0].ipv4, None)
|
|
| 474 |
self.assertEqual(nics[0].ipv6, None)
|
|
| 475 |
self.assertEqual(nics[0].mac, None)
|
|
| 476 | 476 |
if public: |
| 477 | 477 |
self.assertEqual(nics[0].firewall_profile, |
| 478 | 478 |
settings.DEFAULT_FIREWALL_PROFILE) |
| 479 | 479 |
else: |
| 480 |
self.assertEqual(nics[0].firewall_profile, '')
|
|
| 480 |
self.assertEqual(nics[0].firewall_profile, None)
|
|
| 481 | 481 |
|
| 482 | 482 |
def test_full_nic(self, client): |
| 483 | 483 |
vm = mfactory.VirtualMachineFactory(operstate='ERROR') |
| ... | ... | |
| 496 | 496 |
self.assertEqual(len(nics), 1) |
| 497 | 497 |
self.assertEqual(nics[0].index, 0) |
| 498 | 498 |
self.assertEqual(nics[0].ipv4, '10.0.0.22') |
| 499 |
self.assertEqual(nics[0].ipv6, '')
|
|
| 499 |
self.assertEqual(nics[0].ipv6, None)
|
|
| 500 | 500 |
self.assertEqual(nics[0].mac, 'aa:bb:cc:00:11:22') |
| 501 | 501 |
pool = net.get_pool() |
| 502 | 502 |
self.assertFalse(pool.is_available('10.0.0.22'))
|
Also available in: Unified diff