Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
1d35cf35
authored
Mar 16, 2014
by
Dudás Ádám
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: change variable name to more descriptive
parent
3e3e5bb4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
circle/vm/models/network.py
+4
-4
No files found.
circle/vm/models/network.py
View file @
1d35cf35
...
@@ -103,13 +103,13 @@ class Interface(Model):
...
@@ -103,13 +103,13 @@ class Interface(Model):
# TODO change Host's mac field's type to EUI in firewall
# TODO change Host's mac field's type to EUI in firewall
host
.
mac
=
str
(
cls
.
generate_mac
(
instance
,
vlan
))
host
.
mac
=
str
(
cls
.
generate_mac
(
instance
,
vlan
))
host
.
hostname
=
instance
.
vm_name
host
.
hostname
=
instance
.
vm_name
# Get adresses from firewall
# Get ad
d
resses from firewall
if
base_activity
is
None
:
if
base_activity
is
None
:
act
=
instance_activity
(
code_suffix
=
'allocating_ip'
,
act
_ctx
=
instance_activity
(
code_suffix
=
'allocating_ip'
,
instance
=
instance
,
user
=
owner
)
instance
=
instance
,
user
=
owner
)
else
:
else
:
act
=
base_activity
.
sub_activity
(
'allocating_ip'
)
act
_ctx
=
base_activity
.
sub_activity
(
'allocating_ip'
)
with
act
as
act
:
with
act
_ctx
as
act
:
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'
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment