Skip to content

Gelencsér Szabolcs / circlestack

Go to a project
Commit 7c658a86 by Őry Máté
Options

vm: use HRO for result strings

parent dbe6fd36
Showing with 9 additions and 5 deletions
circle/vm/models/network.py
...@@ -21,8 +21,9 @@ from logging import getLogger ...@@ -21,8 +21,9 @@ from logging import getLogger
from netaddr import EUI, mac_unix from netaddr import EUI, mac_unix
from django.db.models import Model, ForeignKey, BooleanField from django.db.models import Model, ForeignKey, BooleanField
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _, ugettext_noop
from common.models import create_readable
from firewall.models import Vlan, Host from firewall.models import Vlan, Host
from ..tasks import net_tasks from ..tasks import net_tasks
from .activity import instance_activity from .activity import instance_activity
...@@ -127,10 +128,13 @@ class Interface(Model): ...@@ -127,10 +128,13 @@ class Interface(Model):
addresses = vlan.get_new_address() addresses = vlan.get_new_address()
host.ipv4 = addresses['ipv4'] host.ipv4 = addresses['ipv4']
host.ipv6 = addresses['ipv6'] host.ipv6 = addresses['ipv6']
act.result = ('new addresses: ipv4: %(ip4)s, ipv6: %(ip6)s, ' act.result = create_readable(
'vlan: %(vlan)s' % {'ip4': host.ipv4, ugettext_noop("Interface successfully created."),
'ip6': host.ipv6, ugettext_noop("Interface successfully created. "
'vlan': vlan.name}) "New addresses: ipv4: %(ip4)s, "
"ipv6: %(ip6)s, vlan: %(vlan)s."),
ip4=unicode(host.ipv4), ip6=unicode(host.ipv6),
vlan=vlan.name)
host.owner = owner host.owner = owner
if vlan.network_type == 'public': if vlan.network_type == 'public':
host.shared_ip = False host.shared_ip = False
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment