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
Jérome Perrin
slapos.core
Commits
4fda45cc
Commit
4fda45cc
authored
May 15, 2013
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Decode slave reference to unicode.
parent
3e5f56eb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py
...5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py
+5
-5
master/bt5/slapos_slap_tool/bt/revision
master/bt5/slapos_slap_tool/bt/revision
+1
-1
master/product/Vifib/Tool/SlapTool.py
master/product/Vifib/Tool/SlapTool.py
+1
-1
No files found.
master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py
View file @
4fda45cc
...
@@ -279,7 +279,7 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
...
@@ -279,7 +279,7 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<string>slap_software_type</string>
<string>slap_software_type</string>
<unicode>%(slave_1_software_type)s</unicode>
<unicode>%(slave_1_software_type)s</unicode>
<string>slave_reference</string>
<string>slave_reference</string>
<
string>%(slave_1_instance_guid)s</string
>
<
unicode>%(slave_1_instance_guid)s</unicode
>
<string>slave_title</string>
<string>slave_title</string>
<unicode>%(slave_1_title)s</unicode>
<unicode>%(slave_1_title)s</unicode>
</dictionary>
</dictionary>
...
@@ -785,7 +785,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
...
@@ -785,7 +785,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>slap_software_type</string>
<string>slap_software_type</string>
<unicode>%(slave_1_software_type)s</unicode>
<unicode>%(slave_1_software_type)s</unicode>
<string>slave_reference</string>
<string>slave_reference</string>
<
string>%(slave_1_instance_guid)s</string
>
<
unicode>%(slave_1_instance_guid)s</unicode
>
<string>slave_title</string>
<string>slave_title</string>
<unicode>%(slave_1_title)s</unicode>
<unicode>%(slave_1_title)s</unicode>
</dictionary>
</dictionary>
...
@@ -989,7 +989,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
...
@@ -989,7 +989,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>slap_software_type</string>
<string>slap_software_type</string>
<unicode>%(slave_1_software_type)s</unicode>
<unicode>%(slave_1_software_type)s</unicode>
<string>slave_reference</string>
<string>slave_reference</string>
<
string>%(slave_1_instance_guid)s</string
>
<
unicode>%(slave_1_instance_guid)s</unicode
>
<string>slave_title</string>
<string>slave_title</string>
<unicode>%(slave_1_title)s</unicode>
<unicode>%(slave_1_title)s</unicode>
</dictionary>
</dictionary>
...
@@ -1872,7 +1872,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
...
@@ -1872,7 +1872,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>slap_software_type</string>
<string>slap_software_type</string>
<unicode>%(slave_1_software_type)s</unicode>
<unicode>%(slave_1_software_type)s</unicode>
<string>slave_reference</string>
<string>slave_reference</string>
<
string>%(slave_1_instance_guid)s</string
>
<
unicode>%(slave_1_instance_guid)s</unicode
>
<string>slave_title</string>
<string>slave_title</string>
<unicode>%(slave_1_title)s</unicode>
<unicode>%(slave_1_title)s</unicode>
</dictionary>
</dictionary>
...
@@ -2390,4 +2390,4 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
...
@@ -2390,4 +2390,4 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
self
.
assertRevokeComputerCertificateSimulator
((),
{})
self
.
assertRevokeComputerCertificateSimulator
((),
{})
finally
:
finally
:
if
os
.
path
.
exists
(
self
.
revoke_computer_certificate_simulator
):
if
os
.
path
.
exists
(
self
.
revoke_computer_certificate_simulator
):
os
.
unlink
(
self
.
revoke_computer_certificate_simulator
)
os
.
unlink
(
self
.
revoke_computer_certificate_simulator
)
\ No newline at end of file
master/bt5/slapos_slap_tool/bt/revision
View file @
4fda45cc
28
29
\ No newline at end of file
\ No newline at end of file
master/product/Vifib/Tool/SlapTool.py
View file @
4fda45cc
...
@@ -1324,7 +1324,7 @@ class SlapTool(BaseTool):
...
@@ -1324,7 +1324,7 @@ class SlapTool(BaseTool):
'slave_title'
:
slave_instance
.
getTitle
().
decode
(
"UTF-8"
),
'slave_title'
:
slave_instance
.
getTitle
().
decode
(
"UTF-8"
),
'slap_software_type'
:
\
'slap_software_type'
:
\
slave_instance
.
getSourceReference
().
decode
(
"UTF-8"
),
slave_instance
.
getSourceReference
().
decode
(
"UTF-8"
),
'slave_reference'
:
slave_instance
.
getReference
(),
'slave_reference'
:
slave_instance
.
getReference
()
.
decode
(
"UTF-8"
)
,
'xml'
:
slave_instance
.
getTextContent
(),
'xml'
:
slave_instance
.
getTextContent
(),
'connection_xml'
:
slave_instance
.
getConnectionXml
(),
'connection_xml'
:
slave_instance
.
getConnectionXml
(),
})
})
...
...
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