Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Alain Takoudjou
slapos
Commits
c9504e97
Commit
c9504e97
authored
2 years ago
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Plain Diff
Publish ipv6 in Theia connection parameters and in shell
See merge request
nexedi/slapos!1128
parents
b289489c
e415a724
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
5 deletions
+13
-5
software/theia/buildout.hash.cfg
software/theia/buildout.hash.cfg
+2
-2
software/theia/instance-output-schema.json
software/theia/instance-output-schema.json
+4
-0
software/theia/instance-resilient.cfg.jinja
software/theia/instance-resilient.cfg.jinja
+2
-1
software/theia/instance-theia.cfg.jinja.in
software/theia/instance-theia.cfg.jinja.in
+2
-2
software/theia/test/test.py
software/theia/test/test.py
+3
-0
No files found.
software/theia/buildout.hash.cfg
View file @
c9504e97
...
...
@@ -15,7 +15,7 @@
[instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum =
4df9f0d76a134a8abec9060a0c1be50b
md5sum =
00d15432c1486376d8ba7d0f5ec63c33
[instance]
_update_hash_filename_ = instance.cfg.in
...
...
@@ -31,7 +31,7 @@ md5sum = b3f1dd83033d6a45def0bd26e70d5a9c
[instance-resilient]
_update_hash_filename_ = instance-resilient.cfg.jinja
md5sum =
b1e338973bc9cfe1bb4e16d46b3c6da9
md5sum =
ad9499e7355ded4975ad313442cecb7a
[theia-common]
_update_hash_filename_ = theia_common.py
...
...
This diff is collapsed.
Click to expand it.
software/theia/instance-output-schema.json
View file @
c9504e97
...
...
@@ -17,6 +17,10 @@
"backend-url"
:
{
"description"
:
"Theia Backend URL"
,
"type"
:
"string"
},
"ipv6"
:
{
"description"
:
"A Theia ipv6 address"
,
"type"
:
"string"
}
},
"type"
:
"object"
...
...
This diff is collapsed.
Click to expand it.
software/theia/instance-resilient.cfg.jinja
View file @
c9504e97
...
...
@@ -33,7 +33,7 @@ parts +=
# Ask for the connection parameters of the main theia
[request-theia]
return += url username password backend-url
return += url username password backend-url
ipv6
# Publish connection parameters of the main theia and resiliency parameters
...
...
@@ -43,6 +43,7 @@ url = ${request-theia:connection-url}
username = ${request-theia:connection-username}
password = ${request-theia:connection-password}
backend-url = ${request-theia:connection-backend-url}
ipv6 = ${request-theia:connection-ipv6}
monitor-base-url = ${monitor-publish:monitor-base-url}
monitor-setup-url = ${monitor-publish:monitor-setup-url}
<= publish-connection-information
This diff is collapsed.
Click to expand it.
software/theia/instance-theia.cfg.jinja.in
View file @
c9504e97
...
...
@@ -37,7 +37,7 @@ additional-url = $${remote-additional-frontend:connection-secure_access}
username = $${frontend-instance-password:username}
password = $${frontend-instance-password:passwd}
backend-url = $${frontend-instance:url}
ipv6 = {{ ipv6_random }}
[directory]
recipe = slapos.cookbook:mkdirectory
...
...
@@ -353,7 +353,7 @@ template =
#!/bin/sh
export HOME=$${directory:home}
export PATH=${python-language-server:location}/bin:${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
export IPV6_SLAPRUNNER={{ ipv6_random }}
# Theia Backend
# -------------
...
...
This diff is collapsed.
Click to expand it.
software/theia/test/test.py
View file @
c9504e97
...
...
@@ -125,6 +125,9 @@ class TestTheia(TheiaTestCase):
resp = self.get(urljoin(authenticated_url, url))
self.assertTrue(resp.raw)
def test_ipv6_parameter_published(self):
self.assertIn('
ipv6
', self.connection_parameters)
def test_theia_slapos(self):
# Make sure we can use the shell and the integrated slapos command
process = pexpect.spawnu(
...
...
This diff is collapsed.
Click to expand it.
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