Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
b840b335
Commit
b840b335
authored
Apr 13, 2012
by
Vincent Pelletier
Committed by
Kazuhiko Shiozaki
Jun 07, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Provide access to partition network settings.
parent
52aa3a62
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
1 deletion
+25
-1
slapos/recipe/slapconfiguration.py
slapos/recipe/slapconfiguration.py
+25
-1
No files found.
slapos/recipe/slapconfiguration.py
View file @
b840b335
...
...
@@ -26,6 +26,7 @@
##############################################################################
import
slapos.slap
from
ConfigParser
import
RawConfigParser
from
netaddr
import
valid_ipv4
,
valid_ipv6
class
Recipe
(
object
):
"""
...
...
@@ -33,6 +34,8 @@ class Recipe(object):
buildout section in various ways, and in various encodings.
Populates the buildout section it is used in with all slap partition
parameters.
Also provides access to partition properties: all IPv4, IPv6 and tap
interfaces it is allowed to use.
Input:
url
...
...
@@ -57,6 +60,12 @@ class Recipe(object):
Output:
slap-software-type
Current partition's software type.
ipv4
Set of IPv4 addresses.
ipv6
Set of IPv6 addresses.
tap
Set of TAP interfaces.
configuration
Dict of all parameters.
configuration.<key>
...
...
@@ -85,7 +94,22 @@ class Recipe(object):
# Discard them, and make them available as separate section keys.
options
[
'slap-software-type'
]
=
parameter_dict
.
pop
(
'slap_software_type'
)
del
parameter_dict
[
'ip_list'
]
ipv4_set
=
set
()
v4_add
=
ipv4_set
.
add
ipv6_set
=
set
()
v6_add
=
ipv6_set
.
add
tap_set
=
set
()
tap_add
=
tap_set
.
add
for
tap
,
ip
in
parameter_dict
.
pop
(
'ip_list'
):
tap_add
(
tap
)
if
valid_ipv4
(
ip
):
v4_add
(
ip
)
elif
valid_ipv6
(
ip
):
v6_add
(
ip
)
# XXX: emit warning on unknown address type ?
options
[
'ipv4'
]
=
ipv4_set
options
[
'ipv6'
]
=
ipv6_set
options
[
'tap'
]
=
tap_set
options
[
'configuration'
]
=
parameter_dict
match
=
self
.
OPTCRE_match
for
key
,
value
in
parameter_dict
.
iteritems
():
...
...
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