Skip to content

Commit

Permalink
scripts;cmd/storj-sim: include satellite node id in satellite address
Browse files Browse the repository at this point in the history
Expose satellite ID from storj-sim so we can have access to it when
changing satellite address.

Change-Id: Ife816f4d35eae2d0bc9f9ad592fe75d73d93d9ff
  • Loading branch information
VinozzZ committed Jun 5, 2020
1 parent 34db4a8 commit 175f048
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
11 changes: 10 additions & 1 deletion cmd/storj-sim/network.go
Expand Up @@ -356,7 +356,16 @@ func newNetwork(flags *Flags) (*Processes, error) {
)
}
apiProcess.ExecBefore["run"] = func(process *Process) error {
return readConfigString(&process.Address, process.Directory, "server.address")
if err := readConfigString(&process.Address, process.Directory, "server.address"); err != nil {
return err
}

satNodeID, err := identity.NodeIDFromCertPath(filepath.Join(apiProcess.Directory, "identity.cert"))
if err != nil {
return err
}
process.AddExtra("ID", satNodeID.String())
return nil
}

migrationProcess := processes.New(Info{
Expand Down
3 changes: 2 additions & 1 deletion scripts/tests/rollingupgrade/test-rolling-upgrade.sh
Expand Up @@ -28,7 +28,8 @@ if [ ! -d ${main_cfg_dir}/uplink-old-api ]; then
mkdir -p ${main_cfg_dir}/uplink-old-api
access=$(storj-sim --config-dir=$main_cfg_dir network env GATEWAY_0_ACCESS)
new_access=$(go run $update_access_script_path $(storj-sim --config-dir=$main_cfg_dir network env SATELLITE_0_DIR) $access)
old_sat_api_addr="127.0.0.1:30000"
sat_id=$(storj-sim --config-dir=$main_cfg_dir network env SATELLITE_0_ID)
old_sat_api_addr="$sat_id@127.0.0.1:30000"
uplink import --satellite-address="$old_sat_api_addr" --config-dir="${main_cfg_dir}/uplink-old-api" "$new_access"
fi

Expand Down

0 comments on commit 175f048

Please sign in to comment.