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
Ophélie Gagnard
slapos.core
Commits
34dde4bb
Commit
34dde4bb
authored
Mar 20, 2015
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tap network information should not cause incompatibility with old SR
parent
eb76d6cc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
master/product/Vifib/Tool/SlapTool.py
master/product/Vifib/Tool/SlapTool.py
+5
-1
No files found.
master/product/Vifib/Tool/SlapTool.py
View file @
34dde4bb
...
@@ -1428,6 +1428,7 @@ class SlapTool(BaseTool):
...
@@ -1428,6 +1428,7 @@ class SlapTool(BaseTool):
timestamp
=
newtimestamp
timestamp
=
newtimestamp
ip_list
=
[]
ip_list
=
[]
full_ip_list
=
[]
for
internet_protocol_address
in
computer_partition
.
contentValues
(
portal_type
=
'Internet Protocol Address'
):
for
internet_protocol_address
in
computer_partition
.
contentValues
(
portal_type
=
'Internet Protocol Address'
):
# XXX - There is new values, and we must keep compatibility
# XXX - There is new values, and we must keep compatibility
address_tuple
=
(
address_tuple
=
(
...
@@ -1439,7 +1440,9 @@ class SlapTool(BaseTool):
...
@@ -1439,7 +1440,9 @@ class SlapTool(BaseTool):
internet_protocol_address
.
getGatewayIpAddress
().
decode
(
"UTF-8"
),
internet_protocol_address
.
getGatewayIpAddress
().
decode
(
"UTF-8"
),
internet_protocol_address
.
getNetmask
().
decode
(
"UTF-8"
),
internet_protocol_address
.
getNetmask
().
decode
(
"UTF-8"
),
internet_protocol_address
.
getNetworkAddress
(
''
).
decode
(
"UTF-8"
))
internet_protocol_address
.
getNetworkAddress
(
''
).
decode
(
"UTF-8"
))
ip_list
.
append
(
address_tuple
)
full_ip_list
.
append
(
address_tuple
)
else
:
ip_list
.
append
(
address_tuple
)
slave_instance_list
=
[]
slave_instance_list
=
[]
if
(
software_instance
.
getPortalType
()
==
"Software Instance"
):
if
(
software_instance
.
getPortalType
()
==
"Software Instance"
):
...
@@ -1480,6 +1483,7 @@ class SlapTool(BaseTool):
...
@@ -1480,6 +1483,7 @@ class SlapTool(BaseTool):
software_instance
.
getUrlString
().
decode
(
"UTF-8"
),
software_instance
.
getUrlString
().
decode
(
"UTF-8"
),
'slave_instance_list'
:
slave_instance_list
,
'slave_instance_list'
:
slave_instance_list
,
'ip_list'
:
ip_list
,
'ip_list'
:
ip_list
,
'full_ip_list'
:
full_ip_list
,
'timestamp'
:
"%i"
%
timestamp
,
'timestamp'
:
"%i"
%
timestamp
,
}
}
...
...
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