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
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
3572f870
authored
Nov 18, 2013
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: networks as objects and not dicts in Instance create_from_template
parent
4b2c34ea
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
circle/dashboard/views.py
+4
-3
circle/vm/models.py
+2
-2
No files found.
circle/dashboard/views.py
View file @
3572f870
...
@@ -224,11 +224,12 @@ class VmCreate(TemplateView):
...
@@ -224,11 +224,12 @@ class VmCreate(TemplateView):
'priority'
:
int
(
request
.
POST
.
get
(
'cpu-priority'
)),
'priority'
:
int
(
request
.
POST
.
get
(
'cpu-priority'
)),
}
}
networks
=
[{
'vlan'
:
Vlan
.
objects
.
get
(
pk
=
l
),
'managed'
:
True
}
networks
=
[
InterfaceTemplate
(
vlan
=
Vlan
.
objects
.
get
(
pk
=
l
),
managed
=
True
)
for
l
in
request
.
POST
.
getlist
(
'managed-vlans'
)
for
l
in
request
.
POST
.
getlist
(
'managed-vlans'
)
]
]
networks
.
extend
([
{
'vlan'
:
Vlan
.
objects
.
get
(
pk
=
l
),
networks
.
extend
([
InterfaceTemplate
(
vlan
=
Vlan
.
objects
.
get
(
pk
=
l
),
'managed'
:
False
}
managed
=
False
)
for
l
in
request
.
POST
.
getlist
(
'unmanaged-vlans'
)
for
l
in
request
.
POST
.
getlist
(
'unmanaged-vlans'
)
])
])
...
...
circle/vm/models.py
View file @
3572f870
...
@@ -429,8 +429,8 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
...
@@ -429,8 +429,8 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
inst
.
disks
.
add
(
*
[
disk
.
get_exclusive
()
for
disk
in
disks
])
inst
.
disks
.
add
(
*
[
disk
.
get_exclusive
()
for
disk
in
disks
])
for
net
in
networks
:
for
net
in
networks
:
i
=
Interface
.
create
(
instance
=
inst
,
vlan
=
net
[
'vlan'
]
,
owner
=
owner
,
i
=
Interface
.
create
(
instance
=
inst
,
vlan
=
net
.
vlan
,
owner
=
owner
,
managed
=
net
[
'managed'
]
)
managed
=
net
.
managed
)
if
i
.
host
:
if
i
.
host
:
i
.
host
.
enable_net
()
i
.
host
.
enable_net
()
port
,
proto
=
ACCESS_PROTOCOLS
[
i
.
instance
.
access_method
][
1
:
3
]
port
,
proto
=
ACCESS_PROTOCOLS
[
i
.
instance
.
access_method
][
1
:
3
]
...
...
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