Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace dashes with underscores in source path #378

Merged
merged 1 commit into from
Sep 6, 2023
Merged

Replace dashes with underscores in source path #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fleetspeak/src/e2etesting/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Replies with an appropriate
TrafficResponseData.
7. Forwards the received TrafficResponseData to the FRR master server.

8. [frr_master_server_main.go](https://github.com/google/fleetspeak/blob/master/fleetspeak/src/e2etesting/frr-master-server-main/frr_master_server_main.go)
8. [frr_master_server_main.go](https://github.com/google/fleetspeak/blob/master/fleetspeak/src/e2etesting/frr_master_server_main/frr_master_server_main.go)

9. [frr.go](https://github.com/google/fleetspeak/blob/master/fleetspeak/src/inttesting/frr/frr.go)
contains the logic to run a FRR master server, however the logic can't be
Expand Down
0 ...ter-server-main/frr_master_server_main.go → ...ter_server_main/frr_master_server_main.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion fleetspeak/src/e2etesting/setup/setup_components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ func (cc *ComponentsInfo) start(configDir string, frontendAddress, msAddress str
firstAdminPort := 6061

// Start Master server
cc.masterServerCmd = exec.Command("fleetspeak/src/e2etesting/frr-master-server-main/frr_master_server_main", "--listen_address", msAddress, "--admin_address", fmt.Sprintf("localhost:%v", firstAdminPort))
cc.masterServerCmd = exec.Command("fleetspeak/src/e2etesting/frr_master_server_main/frr_master_server_main", "--listen_address", msAddress, "--admin_address", fmt.Sprintf("localhost:%v", firstAdminPort))
startCommand(cc.masterServerCmd)

// Start servers and their services
Expand Down
2 changes: 1 addition & 1 deletion terraform/main_vm_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ python3 frr_python/setup.py bdist_wheel
gsutil cp frr_python/dist/* ${storage_bucket_url}/frr_python/wheel/
pip3 install fleetspeak
fleetspeak/build.sh
gsutil cp fleetspeak/src/e2etesting/frr-master-server-main/frr_master_server_main ${storage_bucket_url}/bin/frr_master_server_main
gsutil cp fleetspeak/src/e2etesting/frr_master_server_main/frr_master_server_main ${storage_bucket_url}/bin/frr_master_server_main
gsutil cp fleetspeak/src/client/client/client ${storage_bucket_url}/bin/client
gsutil cp fleetspeak/src/server/server/server ${storage_bucket_url}/bin/server

Expand Down
Loading