Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
integration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
integration
Commits
968d71d0
Commit
968d71d0
authored
4 years ago
by
Jono Wenger
Browse files
Options
Downloads
Patches
Plain Diff
Get UDB ID from contact instead of printing it
parent
83643e9c
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
basice2e/permissioning.yaml
+2
-2
2 additions, 2 deletions
basice2e/permissioning.yaml
basice2e/run.sh
+3
-5
3 additions, 5 deletions
basice2e/run.sh
smokeinfra/permissioning.yaml
+1
-1
1 addition, 1 deletion
smokeinfra/permissioning.yaml
smokeinfra/udContact.bin
+0
-0
0 additions, 0 deletions
smokeinfra/udContact.bin
with
6 additions
and
8 deletions
basice2e/permissioning.yaml
+
2
−
2
View file @
968d71d0
...
...
@@ -26,8 +26,8 @@ nodeMetricInterval: 3
disableGatewayPing
:
true
#
UDB ID
ud
bID
:
"
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
"
#
"Location of the user discovery contact file.
ud
ContactPath
:
"
results/udContact.bin
"
udbAddress
:
"
127.0.0.1:18001"
# Path to UDB public key PEM file
udbPubKeyPemPath
:
"
../keys/cmix.rip.crt"
...
...
This diff is collapsed.
Click to expand it.
basice2e/run.sh
+
3
−
5
View file @
968d71d0
...
...
@@ -36,6 +36,7 @@ CLIENTCLEAN=results/clients-cleaned
CLIENTOPTS
=
"--password hello --ndf results/ndf.json --waitTimeout 90 --unsafe-channel-creation --verbose"
CLIENTUDOPTS
=
"--password hello --ndf results/ndf.json --verbose"
CLIENTSINGLEOPTS
=
"--password hello --ndf results/ndf.json --verbose"
mkdir
-p
$SERVERLOGS
mkdir
-p
$GATEWAYLOGS
...
...
@@ -46,14 +47,11 @@ if [ "$PERMISSIONING" == "" ]
then
echo
"STARTING SERVERS..."
UDBID
=
$(
../bin/client init
-s
results/udbsession
-l
results/udbidgen.log
--password
hello
--ndf
ndf.json
)
UDBID
=
$(
../bin/client init
-s
results/udbsession
-l
results/udbidgen.log
--password
hello
--ndf
ndf.json
--writeContact
results/udContact.bin
)
echo
"GENERATED UDB ID:
$UDBID
"
UDBID
=
$(
sed
-e
's/[&\\/]/\\&/g; s/$/\\/'
-e
'$s/\\$//'
<<<
"
$UDBID
"
)
cp
permissioning.yaml permissioning-actual.yaml
sed
-i
.bak
"s/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD/
$UDBID
/g"
permissioning-actual.yaml
PERMCMD
=
"../bin/permissioning --logLevel 2 -c permissioning
-actual
.yaml "
PERMCMD
=
"../bin/permissioning --logLevel 2 -c permissioning.yaml "
$PERMCMD
>
results/permissioning-console.txt 2>&1 &
PIDVAL
=
$!
echo
"
$PERMCMD
--
$PIDVAL
"
...
...
This diff is collapsed.
Click to expand it.
smokeinfra/permissioning.yaml
+
1
−
1
View file @
968d71d0
...
...
@@ -53,7 +53,7 @@ certPath: "../keys/cmix.rip.crt"
# Path to the certificate file
serverCertPath
:
"
../keys/cmix.rip.crt"
ud
bID
:
"
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
"
ud
ContactPath
:
"
udContact.bin
"
udbAddress
:
"
127.0.0.1:18001"
# Path to UDB public key PEM file
udbPubKeyPemPath
:
"
../keys/cmix.rip.crt"
...
...
This diff is collapsed.
Click to expand it.
smokeinfra/udContact.bin
0 → 100644
+
0
−
0
View file @
968d71d0
File added
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment