diff --git a/makefiles/clab/Makefile b/makefiles/clab/Makefile index b5a7f395793453bc521b523d9a063235672b03d7..3280e90d4f52c8285027c74d2c4824b35e1aa70b 100644 --- a/makefiles/clab/Makefile +++ b/makefiles/clab/Makefile @@ -20,7 +20,8 @@ containerlab-slim-start-reconfigure: create-clab-dir containerize-all generate-a sudo containerlab deploy --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn_slim.clab.yaml --reconfigure containerlab-slim-start-configured: containerlab-slim-start - .$(SCRIPTS_DIR)/setup-clab-slim.sh -s true + @echo 'Waiting 20 seconds for containers to start...' + @.$(SCRIPTS_DIR)/setup-clab-slim.sh -s true containerlab-slim-stop: create-clab-dir cd $(CLAB_DIR) &&\ diff --git a/scripts/setup-clab-slim.sh b/scripts/setup-clab-slim.sh index 3046f11bf69a4094c7d1b291f7629c907e0a048a..390ae6f8e25a248a1acc89dfd9f8459d1cce4745 100755 --- a/scripts/setup-clab-slim.sh +++ b/scripts/setup-clab-slim.sh @@ -9,7 +9,7 @@ GOSDN_ADDRESS="172.100.0.5:55055" ADMINPW="TestPassword" OPENCONFIG_PLUGIN="d1c269a2-6482-4010-b0d8-679dff73153b" ## Adjust this if timer is to short. -SLEEP_TIMER=15 +SLEEP_TIMER=20 ## Check for provided flags. while getopts s: flag @@ -22,6 +22,8 @@ done ## Sleep is needed to give gosdn some time to start correctly. sleep $SLEEP_TIMER +echo 'Logging in via gosdnc and setting up gnmi-targets in controller...' + ## Call login and create entries for all the network elements. ## Could be a bit more automated in the future, but fine for now. $GOSDNC_PATH login --controller $GOSDN_ADDRESS --u admin --p $ADMINPW