diff options
| author | wackxu <xushiwei5@huawei.com> | 2022-06-14 22:27:31 +0800 |
|---|---|---|
| committer | wackxu <xushiwei5@huawei.com> | 2022-06-14 22:27:31 +0800 |
| commit | 9416c41ec396717f73f084990ff0766a92e6a59d (patch) | |
| tree | c120750204f881985a4311dc06b0035b1c91e0aa /tests/e2e | |
| parent | Merge pull request #3908 from wackxu/e2edebug (diff) | |
| download | kubeedge-9416c41ec396717f73f084990ff0766a92e6a59d.tar.gz | |
remove unused e2e code
Signed-off-by: wackxu <xushiwei5@huawei.com>
Diffstat (limited to 'tests/e2e')
| -rw-r--r-- | tests/e2e/constants/constants.go | 21 | ||||
| -rw-r--r-- | tests/e2e/utils/test_setup.go | 179 |
2 files changed, 0 insertions, 200 deletions
diff --git a/tests/e2e/constants/constants.go b/tests/e2e/constants/constants.go index d546d130f..db1f9a92a 100644 --- a/tests/e2e/constants/constants.go +++ b/tests/e2e/constants/constants.go @@ -1,27 +1,6 @@ package constants const ( - CloudCoreConfigFile = "/tmp/cloudcore.yaml" - EdgeCoreConfigFile = "/tmp/edgecore.yaml" - EdgeSiteConfigFile = "/tmp/edgesite.yaml" - - CatCloudCoreConfigFile = "cat " + CloudCoreConfigFile - CatEdgeCoreConfigFile = "cat " + EdgeCoreConfigFile - CatEdgeSiteConfigFile = "cat " + EdgeSiteConfigFile - - RunCloudcore = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; sudo nohup ./cloudcore --config=" + CloudCoreConfigFile + " > cloudcore.log 2>&1 &" - RunEdgecore = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; sudo nohup ./edgecore --config=" + EdgeCoreConfigFile + " > edgecore.log 2>&1 &" - RunEdgeSite = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; sudo nohup ./edgesite --config=" + EdgeSiteConfigFile + " > edgesite.log 2>&1 &" - - CheckCloudcore = "sudo pgrep cloudcore" - CheckEdgecore = "sudo pgrep edgecore" - CheckEdgesite = "sudo pgrep edgesite" - - CatCloudcoreLog = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; cat cloudcore.log" - CatEdgecoreLog = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; cat edgecore.log" - CatEdgeSiteLog = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; cat edgesite.log" - AppHandler = "/api/v1/namespaces/default/pods" - NodeHandler = "/api/v1/nodes" DeploymentHandler = "/apis/apps/v1/namespaces/default/deployments" ) diff --git a/tests/e2e/utils/test_setup.go b/tests/e2e/utils/test_setup.go deleted file mode 100644 index 41e5c5dff..000000000 --- a/tests/e2e/utils/test_setup.go +++ /dev/null @@ -1,179 +0,0 @@ -/* -Copyright 2019 The KubeEdge Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package utils - -import ( - "encoding/json" - "fmt" - "io" - "net/http" - "os" - "os/exec" - "strings" - "time" - - v1 "k8s.io/api/core/v1" - "sigs.k8s.io/yaml" - - "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/servers/httpserver" - edgecore "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1" - "github.com/kubeedge/kubeedge/tests/e2e/constants" -) - -//GenerateCerts - Generates Cerificates for Edge and Cloud nodes copy to respective folders -func GenerateCerts() error { - cmd := exec.Command("bash", "-x", "scripts/generate_cert.sh") - return PrintCombinedOutput(cmd) -} - -func StartCloudCore() error { - catConfigCmd := exec.Command("sh", "-c", constants.CatCloudCoreConfigFile) - Infof("===========> Executing: %s\n", strings.Join(catConfigCmd.Args, " ")) - bytes, _ := catConfigCmd.CombinedOutput() - Infof("cloudcore, config:\n %v", string(bytes)) - - //Run ./cloudcore binary - cmd := exec.Command("sh", "-c", constants.RunCloudcore) - if err := PrintCombinedOutput(cmd); err != nil { - Errorf("start cloudcore error %v", err) - return err - } - //Expect(err).Should(BeNil()) - time.Sleep(5 * time.Second) - - checkcmd := exec.Command("sh", "-c", constants.CheckCloudcore) - if err := PrintCombinedOutput(checkcmd); err != nil { - catcmd := exec.Command("sh", "-c", constants.CatCloudcoreLog) - Infof("===========> Executing: %s\n", strings.Join(catcmd.Args, " ")) - lbytes, _ := catcmd.CombinedOutput() - Errorf("cloudcore, log:\n %v", string(lbytes)) - Errorf("cloudcore start error %v", err) - os.Exit(1) - } - return nil -} - -func StartEdgeCore(master, nodeName string) error { - token := getSecret(master) - createEdgeCoreConfigFile(token, nodeName) - - catConfig := exec.Command("sh", "-c", constants.CatEdgeCoreConfigFile) - Infof("===========> Executing: %s\n", strings.Join(catConfig.Args, " ")) - cbytes, _ := catConfig.CombinedOutput() - Infof("edgecore config :\n %v", string(cbytes)) - - //Run ./edgecore after node registration - cmd := exec.Command("sh", "-c", constants.RunEdgecore) - if err := PrintCombinedOutput(cmd); err != nil { - Errorf("start edgecore error %v", err) - return err - } - //Expect(err).Should(BeNil()) - time.Sleep(5 * time.Second) - - checkcmd := exec.Command("sh", "-c", constants.CheckEdgecore) - if err := PrintCombinedOutput(checkcmd); err != nil { - catcmd := exec.Command("sh", "-c", constants.CatEdgecoreLog) - Infof("===========> Executing: %s\n", strings.Join(catcmd.Args, " ")) - bytes, _ := catcmd.CombinedOutput() - Errorf("edgecore log:\n %v", string(bytes)) - Errorf("edgecore start error %v", err) - os.Exit(1) - } - return nil -} - -func getSecret(master string) string { - secret := v1.Secret{} - - resp, err := SendHTTPRequest(http.MethodGet, master+"/api/v1/namespaces/kubeedge/secrets/tokensecret") - if err != nil { - Fatalf("Send HTTP Request failed: %v", err) - } - defer resp.Body.Close() - contents, err := io.ReadAll(resp.Body) - if err != nil { - Fatalf("HTTP Response reading has failed: %v", err) - return "" - } - err = json.Unmarshal(contents, &secret) - if err != nil { - Fatalf("Unmarshal HTTP Response has failed: %v", err) - } - - return string(secret.Data[httpserver.TokenDataName]) -} - -func StartEdgeSite() error { - catConfig := exec.Command("sh", "-c", constants.CatEdgeSiteConfigFile) - Infof("===========> Executing: %s\n", strings.Join(catConfig.Args, " ")) - cbytes, _ := catConfig.CombinedOutput() - Infof("edgesite config:\n%v", string(cbytes)) - - //Run ./edgecore after node registration - cmd := exec.Command("sh", "-c", constants.RunEdgeSite) - if err := PrintCombinedOutput(cmd); err != nil { - Infof("start edgesite error %v", err) - return err - } - //Expect(err).Should(BeNil()) - time.Sleep(5 * time.Second) - - checkcmd := exec.Command("sh", "-c", constants.CheckEdgesite) - if err := PrintCombinedOutput(checkcmd); err != nil { - catcmd := exec.Command("sh", "-c", constants.CatEdgeSiteLog) - Infof("===========> Executing: %s\n", strings.Join(catcmd.Args, " ")) - bytes, _ := catcmd.CombinedOutput() - Errorf("edgesite log:\n %v", string(bytes)) - Errorf("edgesite start error %v", err) - os.Exit(1) - } - return nil -} - -func CleanUp(setupType string) error { - fmt.Println("**********************************", setupType) - cmd := exec.Command("bash", "-x", "scripts/cleanup.sh", setupType) - if err := PrintCombinedOutput(cmd); err != nil { - return err - } - time.Sleep(2 * time.Second) - return nil -} - -func createEdgeCoreConfigFile(token, nodeName string) { - c := edgecore.NewDefaultEdgeCoreConfig() - // TODO change ca file path @kadisi - c.Modules.EdgeHub.TLSCAFile = "/tmp/edgecore/rootCA.crt" - c.Modules.EdgeHub.TLSCertFile = "/tmp/edgecore/kubeedge.crt" - c.Modules.EdgeHub.TLSPrivateKeyFile = "/tmp/edgecore/kubeedge.key" - c.Modules.Edged.HostnameOverride = nodeName - c.DataBase.DataSource = "/tmp/edgecore/edgecore.db" - c.Modules.EventBus.MqttMode = edgecore.MqttModeInternal - c.Modules.EdgeStream.Enable = false - c.Modules.EdgeHub.Token = token - - data, err := yaml.Marshal(c) - if err != nil { - fmt.Printf("Marshal edgecore config to yaml error %v\n", err) - os.Exit(1) - } - if err := os.WriteFile(constants.EdgeCoreConfigFile, data, os.ModePerm); err != nil { - fmt.Printf("Create edgecore config file %v error %v\n", constants.EdgeCoreConfigFile, err) - os.Exit(1) - } -} |
