Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
slapos.core
Commits
0fd94f65
Commit
0fd94f65
authored
Mar 27, 2023
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapformat: Fix ipv6_prefixshift typo
parent
b0561e00
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
slapos/format.py
slapos/format.py
+4
-4
No files found.
slapos/format.py
View file @
0fd94f65
...
@@ -1312,14 +1312,14 @@ class Interface(object):
...
@@ -1312,14 +1312,14 @@ class Interface(object):
self
.
_reserveIpv6Range
(
result_addr
[
'addr'
],
result_addr
[
'prefixlen'
])
self
.
_reserveIpv6Range
(
result_addr
[
'addr'
],
result_addr
[
'prefixlen'
])
return
result_addr
return
result_addr
if
self
.
_
ipv6_prefixshift
!=
16
:
if
self
.
ipv6_prefixshift
!=
16
:
self
.
_logger
.
error
(
self
.
_logger
.
error
(
"Address %s/%s for partition %s is already taken;"
"Address %s/%s for partition %s is already taken;"
" aborting because IPv6 prefixshift is %s != 16"
%
(
" aborting because IPv6 prefixshift is %s != 16"
%
(
result_addr
[
'addr'
],
result_addr
[
'addr'
],
result_addr
[
'prefixlen'
],
result_addr
[
'prefixlen'
],
'%s tap'
%
partition_index
if
tap
else
partition_index
,
'%s tap'
%
partition_index
if
tap
else
partition_index
,
self
.
_
ipv6_prefixshift
,
self
.
ipv6_prefixshift
,
))
))
raise
AddressGenerationError
(
addr
)
raise
AddressGenerationError
(
addr
)
...
@@ -1375,13 +1375,13 @@ class Interface(object):
...
@@ -1375,13 +1375,13 @@ class Interface(object):
if
self
.
_tryReserveIpv6Range
(
ipv6_range
[
'addr'
],
ipv6_range
[
'prefixlen'
]):
if
self
.
_tryReserveIpv6Range
(
ipv6_range
[
'addr'
],
ipv6_range
[
'prefixlen'
]):
return
ipv6_range
return
ipv6_range
if
self
.
_
ipv6_prefixshift
!=
16
:
if
self
.
ipv6_prefixshift
!=
16
:
self
.
_logger
.
error
(
self
.
_logger
.
error
(
"Address % for partition %s is already taken;"
"Address % for partition %s is already taken;"
" aborting because IPv6 prefixshift is %s != 16"
%
(
" aborting because IPv6 prefixshift is %s != 16"
%
(
ipv6_range
[
'network'
],
ipv6_range
[
'network'
],
'%s tun'
%
i
if
tun
else
i
,
'%s tun'
%
i
if
tun
else
i
,
self
.
_
ipv6_prefixshift
,
self
.
ipv6_prefixshift
,
))
))
raise
AddressGenerationError
(
ipv6_range
[
'addr'
])
raise
AddressGenerationError
(
ipv6_range
[
'addr'
])
...
...
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