diff --git a/cmd/edenSetup.go b/cmd/edenSetup.go index 5925c1871..69357928b 100644 --- a/cmd/edenSetup.go +++ b/cmd/edenSetup.go @@ -155,6 +155,7 @@ var setupCmd = &cobra.Command{ log.Info("GenerateEveCerts done") } } else { + log.Info("GenerateEveCerts done") log.Infof("Certs already exists in certs dir: %s", certsDir) } if err := eden.GenerateEVEConfig(certsDir, certsDomain, certsEVEIP, adamPort, apiV1); err != nil { @@ -211,7 +212,6 @@ var setupCmd = &cobra.Command{ } } else { log.Infof("EVE already exists in dir: %s", eveDist) - } } else { if _, err := os.Lstat(eveImageFile); os.IsNotExist(err) { @@ -241,6 +241,7 @@ var setupCmd = &cobra.Command{ } } } else { + log.Infof("download EVE done: %s", eveImageFile) log.Infof("EVE already exists in dir: %s", filepath.Dir(eveImageFile)) } } diff --git a/cmd/eve.go b/cmd/eve.go index d66b8541b..a55166757 100644 --- a/cmd/eve.go +++ b/cmd/eve.go @@ -248,14 +248,14 @@ var ipEveCmd = &cobra.Command{ return nil }, Run: func(cmd *cobra.Command, args []string) { - statusAdam, err := eden.StatusAdam() - if err == nil && statusAdam != "container doesn't exist" { - if ip, err := eveLastRequests(); err == nil && ip != "" { - fmt.Println(ip) - return - } + if !eveRemote && runtime.GOOS == "darwin" { + fmt.Println("127.0.0.1") + return + } + if ip, err := eveLastRequests(); err == nil && ip != "" { + fmt.Println(ip) + return } - log.Fatal("not found") }, } diff --git a/tests/network/testdata/test_networking.txt b/tests/network/testdata/test_networking.txt index 7775e8a7e..c27d36373 100644 --- a/tests/network/testdata/test_networking.txt +++ b/tests/network/testdata/test_networking.txt @@ -1,6 +1,6 @@ [!exec:bash] stop [!exec:grep] stop -[!exec:sed] stop +[!exec:cut] stop [!exec:curl] stop [!exec:sleep] stop @@ -91,7 +91,7 @@ stdout 'no app with app3 found' echo "defining of environment variables for the first app" -echo net=$(grep '10.2.0.0/24' network_ls | sed '$s/\(^[^\t]*\).*$/\1/')>.env +echo net=$(grep '10.2.0.0/24' network_ls | cut -f1)>.env echo external_port=''>>.env echo metadata={{$test_data}}>>.env echo name=app1>>.env @@ -106,7 +106,7 @@ $EDEN pod ps>pod_ps echo "defining of environment variables for the second app" -echo net=$(grep '10.1.0.0/24' network_ls | sed '$s/\(^[^\t]*\).*$/\1/'),$(grep '10.2.0.0/24' network_ls | sed '$s/\(^[^\t]*\).*$/\1/')>.env +echo net=$(grep '10.1.0.0/24' network_ls | cut -f1),$(grep '10.2.0.0/24' network_ls | cut -f1)>.env echo external_port=-p 8027:80>>.env echo metadata=http://$(grep '10.2.0.' pod_ps | grep -o -E '10.2.0.[0-9]{1,3}')/user-data.html>>.env echo name=app2>>.env @@ -128,7 +128,7 @@ until curl $address | grep {{$test_data}}; do sleep 3; done echo "defining of environment variables for the third app" -echo net=$(grep '10.1.0.0/24' network_ls | sed '$s/\(^[^\t]*\).*$/\1/'),$(grep '10.2.0.0/24' network_ls | sed '$s/\(^[^\t]*\).*$/\1/')>.env +echo net=$(grep '10.1.0.0/24' network_ls | cut -f1),$(grep '10.2.0.0/24' network_ls | cut -f1)>.env echo external_port=-p 8028:80>>.env echo metadata=http://$(grep '10.2.0.' pod_ps |grep app1| grep -o -E '10.2.0.[0-9]{1,3}')/user-data.html>>.env echo name=app3>>.env