summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangjie <iamkadisi@163.com>2020-01-15 10:08:16 +0800
committerzhangjie <iamkadisi@163.com>2020-01-19 17:26:26 +0800
commit0e9411bdcaaf266bd1820e3f6f43df68c245c252 (patch)
tree5652cc00ffa49af762073dd22f94a05affbe8667
parentservice bus use new api config (diff)
downloadkubeedge-0e9411bdcaaf266bd1820e3f6f43df68c245c252.tar.gz
dbtest module use new config api
Signed-off-by: zhangjie <iamkadisi@163.com>
-rw-r--r--edge/cmd/edgecore/app/server.go2
-rw-r--r--edge/test/test.go15
2 files changed, 10 insertions, 7 deletions
diff --git a/edge/cmd/edgecore/app/server.go b/edge/cmd/edgecore/app/server.go
index f5f0addba..fd033fe84 100644
--- a/edge/cmd/edgecore/app/server.go
+++ b/edge/cmd/edgecore/app/server.go
@@ -156,6 +156,6 @@ func registerModules(c *v1alpha1.EdgeCoreConfig) {
edgemesh.Register(c.Modules.EdgeMesh)
metamanager.Register(c.Modules.MetaManager)
servicebus.Register(c.Modules.ServiceBus)
- test.Register()
+ test.Register(c.Modules.DBTest)
dbm.InitDBManager()
}
diff --git a/edge/test/test.go b/edge/test/test.go
index 7610e7b15..58e761b54 100644
--- a/edge/test/test.go
+++ b/edge/test/test.go
@@ -16,6 +16,7 @@ import (
"github.com/kubeedge/beehive/pkg/core/model"
"github.com/kubeedge/kubeedge/edge/pkg/common/message"
"github.com/kubeedge/kubeedge/edge/pkg/common/modules"
+ "github.com/kubeedge/kubeedge/pkg/apis/edgecore/v1alpha1"
)
const (
@@ -24,16 +25,14 @@ const (
EdgedPodHandler = "/pods"
)
-func Register() {
- core.Register(&testManager{})
+// TODO move this files into /edge/pkg/dbtest @kadisi
+func Register(t *v1alpha1.DBTest) {
+ core.Register(&testManager{enable: t.Enable})
}
type testManager struct {
moduleWait *sync.WaitGroup
-}
-
-type meta struct {
- UID string `json:"uid"`
+ enable bool
}
func (tm *testManager) Name() string {
@@ -45,6 +44,10 @@ func (tm *testManager) Group() string {
return modules.MetaGroup
}
+func (tm *testManager) Enable() bool {
+ return tm.enable
+}
+
//Function to get the pods from Edged
func GetPodListFromEdged(w http.ResponseWriter) error {
var pods v1.PodList