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
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Rafael Monnerat
slapos.core
Commits
3723acdd
Commit
3723acdd
authored
Nov 14, 2023
by
Rafael Monnerat
👻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: Change for certificate authority (source_reference to csr_id)
parent
791d1f9b
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
38 deletions
+37
-38
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudComputeNodeSlapInterfaceWorkflow.py
...t.erp5.testSlapOSCloudComputeNodeSlapInterfaceWorkflow.py
+29
-29
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudInstanceSlapInterfaceWorkflow.py
...test.erp5.testSlapOSCloudInstanceSlapInterfaceWorkflow.py
+5
-6
master/bt5/slapos_jio/TestTemplateItem/portal_components/test.erp5.testSlapOSHalJsonStyleSkins.py
...ortal_components/test.erp5.testSlapOSHalJsonStyleSkins.py
+3
-3
No files found.
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudComputeNodeSlapInterfaceWorkflow.py
View file @
3723acdd
This diff is collapsed.
Click to expand it.
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudInstanceSlapInterfaceWorkflow.py
View file @
3723acdd
...
@@ -1339,8 +1339,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin):
...
@@ -1339,8 +1339,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin):
self
.
assertEqual
(
certificate_login
.
getValidationState
(),
'validated'
)
self
.
assertEqual
(
certificate_login
.
getValidationState
(),
'validated'
)
self
.
assertNotEqual
(
certificate_login
.
getReference
(),
None
)
self
.
assertNotEqual
(
certificate_login
.
getReference
(),
None
)
self
.
assertNotEqual
(
certificate_login
.
getCsrId
(),
None
)
self
.
assertNotEqual
(
certificate_login
.
getSourceReference
(),
None
)
ssl_certificate
=
x509
.
load_pem_x509_certificate
(
self
.
software_instance
.
getSslCertificate
())
ssl_certificate
=
x509
.
load_pem_x509_certificate
(
self
.
software_instance
.
getSslCertificate
())
self
.
assertEqual
(
len
(
ssl_certificate
.
subject
),
2
)
self
.
assertEqual
(
len
(
ssl_certificate
.
subject
),
2
)
cn
=
[
i
.
value
for
i
in
ssl_certificate
.
subject
if
i
.
oid
==
NameOID
.
COMMON_NAME
][
0
]
cn
=
[
i
.
value
for
i
in
ssl_certificate
.
subject
if
i
.
oid
==
NameOID
.
COMMON_NAME
][
0
]
...
@@ -1373,7 +1372,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin):
...
@@ -1373,7 +1372,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin):
certificate_login
=
certificate_login_list
[
0
]
certificate_login
=
certificate_login_list
[
0
]
self
.
assertEqual
(
certificate_login
.
getValidationState
(),
'validated'
)
self
.
assertEqual
(
certificate_login
.
getValidationState
(),
'validated'
)
self
.
assertNotEqual
(
certificate_login
.
getReference
(),
None
)
self
.
assertNotEqual
(
certificate_login
.
getReference
(),
None
)
self
.
assertNotEqual
(
certificate_login
.
get
SourceReference
(),
None
)
self
.
assertNotEqual
(
certificate_login
.
get
CsrId
(),
None
)
self
.
assertNotEqual
(
self
.
software_instance
.
getSslKey
(),
self
.
assertNotEqual
(
self
.
software_instance
.
getSslKey
(),
ssl_key
)
ssl_key
)
...
@@ -1400,11 +1399,11 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin):
...
@@ -1400,11 +1399,11 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin):
self
.
assertEqual
(
another_certificate_login
.
getValidationState
(),
'validated'
)
self
.
assertEqual
(
another_certificate_login
.
getValidationState
(),
'validated'
)
self
.
assertNotEqual
(
another_certificate_login
.
getReference
(),
None
)
self
.
assertNotEqual
(
another_certificate_login
.
getReference
(),
None
)
self
.
assertNotEqual
(
another_certificate_login
.
get
SourceReference
(),
None
)
self
.
assertNotEqual
(
another_certificate_login
.
get
CsrId
(),
None
)
self
.
assertEqual
(
certificate_login
.
getValidationState
(),
'invalidated'
)
self
.
assertEqual
(
certificate_login
.
getValidationState
(),
'invalidated'
)
self
.
assertNotEqual
(
certificate_login
.
getReference
(),
self
.
assertNotEqual
(
certificate_login
.
getReference
(),
another_certificate_login
.
getReference
())
another_certificate_login
.
getReference
())
self
.
assertNotEqual
(
certificate_login
.
get
SourceReference
(),
self
.
assertNotEqual
(
certificate_login
.
get
CsrId
(),
another_certificate_login
.
get
SourceReference
())
another_certificate_login
.
get
CsrId
())
master/bt5/slapos_jio/TestTemplateItem/portal_components/test.erp5.testSlapOSHalJsonStyleSkins.py
View file @
3723acdd
...
@@ -618,7 +618,7 @@ class TestPerson_get_Certificate(TestSlapOSHalJsonStyleMixin):
...
@@ -618,7 +618,7 @@ class TestPerson_get_Certificate(TestSlapOSHalJsonStyleMixin):
self
.
assertSameSet
(
response_dict
.
keys
(),
[
"common_name"
,
"certificate"
,
"id"
,
"key"
])
self
.
assertSameSet
(
response_dict
.
keys
(),
[
"common_name"
,
"certificate"
,
"id"
,
"key"
])
self
.
assertEqual
(
response_dict
[
"id"
],
login
.
get
SourceReference
())
self
.
assertEqual
(
response_dict
[
"id"
],
login
.
get
CsrId
())
self
.
assertEqual
(
json
.
dumps
(
response_dict
[
"common_name"
]),
json
.
dumps
(
login
.
getReference
()))
self
.
assertEqual
(
json
.
dumps
(
response_dict
[
"common_name"
]),
json
.
dumps
(
login
.
getReference
()))
self
.
assertEqual
(
self
.
portal
.
REQUEST
.
RESPONSE
.
getStatus
(),
200
)
self
.
assertEqual
(
self
.
portal
.
REQUEST
.
RESPONSE
.
getStatus
(),
200
)
...
@@ -632,11 +632,11 @@ class TestPerson_get_Certificate(TestSlapOSHalJsonStyleMixin):
...
@@ -632,11 +632,11 @@ class TestPerson_get_Certificate(TestSlapOSHalJsonStyleMixin):
self
.
assertEqual
(
"validated"
,
login
.
getValidationState
())
self
.
assertEqual
(
"validated"
,
login
.
getValidationState
())
self
.
assertEqual
(
"validated"
,
new_login
.
getValidationState
())
self
.
assertEqual
(
"validated"
,
new_login
.
getValidationState
())
self
.
assertNotEqual
(
login
.
getReference
(),
new_login
.
getReference
())
self
.
assertNotEqual
(
login
.
getReference
(),
new_login
.
getReference
())
self
.
assertNotEqual
(
login
.
get
SourceReference
(),
new_login
.
getSourceReference
())
self
.
assertNotEqual
(
login
.
get
CsrId
(),
new_login
.
getCsrId
())
self
.
assertSameSet
(
new_response_dict
.
keys
(),
[
"common_name"
,
"certificate"
,
"id"
,
"key"
])
self
.
assertSameSet
(
new_response_dict
.
keys
(),
[
"common_name"
,
"certificate"
,
"id"
,
"key"
])
self
.
assertEqual
(
json
.
dumps
(
new_response_dict
[
"common_name"
]),
json
.
dumps
(
new_login
.
getReference
()))
self
.
assertEqual
(
json
.
dumps
(
new_response_dict
[
"common_name"
]),
json
.
dumps
(
new_login
.
getReference
()))
self
.
assertEqual
(
new_response_dict
[
"id"
],
new_login
.
get
SourceReference
())
self
.
assertEqual
(
new_response_dict
[
"id"
],
new_login
.
get
CsrId
())
self
.
assertNotEqual
(
new_response_dict
[
"common_name"
],
response_dict
[
"common_name"
])
self
.
assertNotEqual
(
new_response_dict
[
"common_name"
],
response_dict
[
"common_name"
])
self
.
assertNotEqual
(
new_response_dict
[
"id"
],
response_dict
[
"id"
])
self
.
assertNotEqual
(
new_response_dict
[
"id"
],
response_dict
[
"id"
])
...
...
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