Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
bb711f39
Commit
bb711f39
authored
Nov 27, 2013
by
Stéphane Graber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
python3: Allow passing create flags
Signed-off-by:
Stéphane Graber
<
stgraber@ubuntu.com
>
Acked-by:
Serge E. Hallyn
<
serge.hallyn@ubuntu.com
>
parent
1314b689
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
13 deletions
+24
-13
lxc.c
src/python-lxc/lxc.c
+9
-5
__init__.py
src/python-lxc/lxc/__init__.py
+15
-8
No files found.
src/python-lxc/lxc.c
View file @
bb711f39
...
...
@@ -694,13 +694,14 @@ static PyObject *
Container_create
(
Container
*
self
,
PyObject
*
args
,
PyObject
*
kwds
)
{
char
*
template_name
=
NULL
;
int
flags
=
0
;
char
**
create_args
=
{
NULL
};
PyObject
*
retval
=
NULL
,
*
vargs
=
NULL
;
int
i
=
0
;
static
char
*
kwlist
[]
=
{
"template"
,
"args"
,
NULL
};
static
char
*
kwlist
[]
=
{
"template"
,
"
flags"
,
"
args"
,
NULL
};
if
(
!
PyArg_ParseTupleAndKeywords
(
args
,
kwds
,
"s|O"
,
kwlist
,
&
template_name
,
&
vargs
))
if
(
!
PyArg_ParseTupleAndKeywords
(
args
,
kwds
,
"s|
i
O"
,
kwlist
,
&
template_name
,
&
flags
,
&
vargs
))
return
NULL
;
if
(
vargs
)
{
...
...
@@ -716,8 +717,8 @@ Container_create(Container *self, PyObject *args, PyObject *kwds)
}
}
if
(
self
->
container
->
create
(
self
->
container
,
template_name
,
NULL
,
NULL
,
0
,
create_args
))
if
(
self
->
container
->
create
(
self
->
container
,
template_name
,
NULL
,
NULL
,
flags
,
create_args
))
retval
=
Py_True
;
else
retval
=
Py_False
;
...
...
@@ -1536,6 +1537,9 @@ PyInit__lxc(void)
PYLXC_EXPORT_CONST
(
LXC_CLONE_KEEPNAME
);
PYLXC_EXPORT_CONST
(
LXC_CLONE_SNAPSHOT
);
/* create: create flags */
PYLXC_EXPORT_CONST
(
LXC_CREATE_QUIET
);
#undef PYLXC_EXPORT_CONST
return
m
;
...
...
src/python-lxc/lxc/__init__.py
View file @
bb711f39
...
...
@@ -229,22 +229,29 @@ class Container(_lxc.Container):
return
_lxc
.
Container
.
set_config_item
(
self
,
key
,
value
)
def
create
(
self
,
template
,
args
=
{}
):
def
create
(
self
,
template
,
flags
=
0
,
args
=
()
):
"""
Create a new rootfs for the container.
"template" must be a valid template name.
"args" (optional) is a dictionary of parameters and values to pass
to the template.
"flags" (optional) is an integer representing the optional
create flags to be passed.
"args" (optional) is a tuple of arguments to pass to the
template. It can also be provided as a dict.
"""
template_args
=
[]
for
item
in
args
.
items
():
template_args
.
append
(
"--
%
s"
%
item
[
0
])
template_args
.
append
(
"
%
s"
%
item
[
1
])
if
isinstance
(
args
,
dict
):
template_args
=
[]
for
item
in
args
.
items
():
template_args
.
append
(
"--
%
s"
%
item
[
0
])
template_args
.
append
(
"
%
s"
%
item
[
1
])
else
:
template_args
=
args
return
_lxc
.
Container
.
create
(
self
,
template
,
tuple
(
template_args
))
return
_lxc
.
Container
.
create
(
self
,
template
=
template
,
flags
=
flags
,
args
=
tuple
(
template_args
))
def
clone
(
self
,
newname
,
config_path
=
None
,
flags
=
0
,
bdevtype
=
None
,
bdevdata
=
None
,
newsize
=
0
,
hookargs
=
()):
...
...
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