Merge pull request #3908 from wackxu/e2edebug

remove unsed e2e config

4 files changed, 9 insertions, 35 deletions

diff --git a/tests/e2e/scripts/fast_test.sh b/tests/e2e/scripts/fast_test.sh
index 266a675ae..f0655bfca 100755
--- a/tests/e2e/scripts/fast_test.sh
+++ b/tests/e2e/scripts/fast_test.sh
@@ -36,9 +36,6 @@ cat >config.json<<END
 {
         "image_url": ["nginx", "nginx"],
         "k8smasterforkubeedge":"https://$MASTER_IP:6443",
-        "dockerhubusername":"user",
-        "dockerhubpassword":"password",
-        "mqttendpoint":"tcp://127.0.0.1:1884",
         "kubeconfigpath":"$KUBECONFIG"
 }
 END
diff --git a/tests/e2e/scripts/keadm_deprecated_e2e.sh b/tests/e2e/scripts/keadm_deprecated_e2e.sh
index 2a6008de5..068c49795 100755
--- a/tests/e2e/scripts/keadm_deprecated_e2e.sh
+++ b/tests/e2e/scripts/keadm_deprecated_e2e.sh
@@ -76,9 +76,6 @@ function start_kubeedge() {
 {
         "image_url": ["nginx", "nginx"],
         "k8smasterforkubeedge":"https://$MASTER_IP:6443",
-        "dockerhubusername":"user",
-        "dockerhubpassword":"password",
-        "mqttendpoint":"tcp://127.0.0.1:1884",
         "kubeconfigpath":"$KUBECONFIG"
 }
 END
diff --git a/tests/e2e/scripts/keadm_e2e.sh b/tests/e2e/scripts/keadm_e2e.sh
index bea528fa9..5a608ce09 100755
--- a/tests/e2e/scripts/keadm_e2e.sh
+++ b/tests/e2e/scripts/keadm_e2e.sh
@@ -80,9 +80,6 @@ function start_kubeedge() {
 {
         "image_url": ["nginx", "nginx"],
         "k8smasterforkubeedge":"https://$MASTER_IP:6443",
-        "dockerhubusername":"user",
-        "dockerhubpassword":"password",
-        "mqttendpoint":"tcp://127.0.0.1:1884",
         "kubeconfigpath":"$KUBECONFIG"
 }
 END
diff --git a/tests/e2e/utils/config.go b/tests/e2e/utils/config.go
index 2ece5f036..b086cacda 100644
--- a/tests/e2e/utils/config.go
+++ b/tests/e2e/utils/config.go
@@ -23,30 +23,17 @@ import (
 	"time"
 )
 
-type vmSpec struct {
-	IP       string `json:"ip"`
-	Username string `json:"username"`
-	Passwd   string `json:"password"`
-}
-
 //config.json decode struct
 type Config struct {
-	AppImageURL                    []string          `json:"image_url"`
-	K8SMasterForKubeEdge           string            `json:"k8smasterforkubeedge"`
-	Nodes                          map[string]vmSpec `json:"k8snodes"`
-	NumOfNodes                     int               `json:"node_num"`
-	ImageRepo                      string            `json:"imagerepo"`
-	K8SMasterForProvisionEdgeNodes string            `json:"k8smasterforprovisionedgenodes"`
-	CloudImageURL                  string            `json:"cloudimageurl"`
-	EdgeImageURL                   string            `json:"edgeimageurl"`
-	Namespace                      string            `json:"namespace"`
-	ControllerStubPort             int               `json:"controllerstubport"`
-	Protocol                       string            `json:"protocol"`
-	DockerHubUserName              string            `json:"dockerhubusername"`
-	DockerHubPassword              string            `json:"dockerhubpassword"`
-	MqttEndpoint                   string            `json:"mqttendpoint"`
-	KubeConfigPath                 string            `json:"kubeconfigpath"`
-	Token                          string            `json:"token"`
+	AppImageURL                    []string `json:"image_url"`
+	K8SMasterForKubeEdge           string   `json:"k8smasterforkubeedge"`
+	NumOfNodes                     int      `json:"node_num"`
+	K8SMasterForProvisionEdgeNodes string   `json:"k8smasterforprovisionedgenodes"`
+	CloudImageURL                  string   `json:"cloudimageurl"`
+	EdgeImageURL                   string   `json:"edgeimageurl"`
+	ControllerStubPort             int      `json:"controllerstubport"`
+	Protocol                       string   `json:"protocol"`
+	KubeConfigPath                 string   `json:"kubeconfigpath"`
 }
 
 //config struct
@@ -91,10 +78,6 @@ func getConfigPath() string {
 	return path
 }
 
-func RandomInt(min, max int) int {
-	return min + rand.Intn(max-min)
-}
-
 //function to Generate Random string
 func GetRandomString(length int) string {
 	str := "0123456789abcdefghijklmnopqrstuvwxyz"