Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gutyán Gábor
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
25746914
authored
Sep 05, 2013
by
Dudás Ádám
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: copy newly added attributes to instance when creating from template
parent
b8797058
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
circle/vm/models.py
+4
-2
No files found.
circle/vm/models.py
View file @
25746914
...
@@ -86,8 +86,8 @@ class Node(TimeStampedModel):
...
@@ -86,8 +86,8 @@ class Node(TimeStampedModel):
class
NodeActivity
(
TimeStampedModel
):
class
NodeActivity
(
TimeStampedModel
):
activity_code
=
models
.
CharField
(
max_length
=
100
)
activity_code
=
models
.
CharField
(
max_length
=
100
)
task_uuid
=
models
.
CharField
(
task_uuid
=
models
.
CharField
(
blank
=
True
,
max_length
=
50
,
null
=
True
,
max_length
=
50
,
unique
=
True
,
null
=
True
,
blank
=
True
)
unique
=
True
)
node
=
models
.
ForeignKey
(
Node
,
related_name
=
'activity_log'
)
node
=
models
.
ForeignKey
(
Node
,
related_name
=
'activity_log'
)
user
=
models
.
ForeignKey
(
User
,
blank
=
True
,
null
=
True
)
user
=
models
.
ForeignKey
(
User
,
blank
=
True
,
null
=
True
)
started
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
started
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
...
@@ -286,6 +286,8 @@ class Instance(BaseResourceConfigModel, TimeStampedModel):
...
@@ -286,6 +286,8 @@ class Instance(BaseResourceConfigModel, TimeStampedModel):
kwargs
.
setdefault
(
'max_ram_size'
,
template
.
max_ram_size
)
kwargs
.
setdefault
(
'max_ram_size'
,
template
.
max_ram_size
)
kwargs
.
setdefault
(
'arch'
,
template
.
arch
)
kwargs
.
setdefault
(
'arch'
,
template
.
arch
)
kwargs
.
setdefault
(
'priority'
,
template
.
priority
)
kwargs
.
setdefault
(
'priority'
,
template
.
priority
)
kwargs
.
setdefault
(
'boot_menu'
,
template
.
boot_menu
)
kwargs
.
setdefault
(
'raw_data'
,
template
.
raw_data
)
kwargs
.
setdefault
(
'lease'
,
template
.
lease
)
kwargs
.
setdefault
(
'lease'
,
template
.
lease
)
kwargs
.
setdefault
(
'access_method'
,
template
.
access_method
)
kwargs
.
setdefault
(
'access_method'
,
template
.
access_method
)
# create instance and do additional setup
# create instance and do additional setup
...
...
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