overflow_backup_2018_0455/overflow_service
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIXED META

Browse Source
This commit is contained in:
snoop
2017-06-26 14:50:56 +09:00
parent ebacd8930a
commit 925979e557
5 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
proxy/probe/probe_service.go
View File

@@ -17,7 +17,7 @@ type ProbeService struct {
type Probe struct {
Id json.Number `json:"id,Number,omitempty"`
Status *meta.MetaNoAuthProbeStatus `json:"status,omitempty"`
Status *meta.MetaProbeStatus `json:"status,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
LastPollingDate timestamp.Timestamp `json:"lastPollingDate,omitempty"`
NextPollingDate timestamp.Timestamp `json:"nextPollingDate,omitempty"`
@@ -34,7 +34,7 @@ func NewProbeService() *ProbeService {
func NewProbe(probeKey string, encryptionKey string) *Probe {
na := &Probe{
Status:meta.NewMetaNoAuthProbeStatus(meta.PROBE_STATUS_PROCESS),
Status:meta.NewMetaProbeStatus(meta.PROBE_STATUS_INITIAL),
ProbeKey:probeKey,
EncryptionKey:encryptionKey,
@@ -44,7 +44,7 @@ func NewProbe(probeKey string, encryptionKey string) *Probe {
func (as *ProbeService) Save(p *Probe) (string, error) {
out, err := utils.InvokeDBByModel("probe", "save", p, "com.loafle.overflow.module.probe.model.Probe")
out, err := utils.InvokeDBByModel("probe", "save", p, utils.MODEL_PROBE)
if err != nil {
return "", err
@@ -55,7 +55,7 @@ func (as *ProbeService) Save(p *Probe) (string, error) {
func (as *ProbeService) GetList(d *domain.Domain) (string, error) {
out, err := utils.InvokeDBByModel("probe", "findAgentListByMemberId", d, "com.loafle.overflow.module.domain.model.Domain")
out, err := utils.InvokeDBByModel("probe", "findAllByDomain", d, utils.MODEL_DOMAIN)
if err != nil {
return "", err

38
proxy/probe/probe_service_test.go
View File

@@ -1,23 +1,33 @@
package probe
import (
"encoding/json"
"testing"
"git.loafle.net/overflow/overflow_service/proxy/member"
"git.loafle.net/overflow/overflow_service/proxy/keystore"
"git.loafle.net/overflow/overflow_service/proxy/domain"
)
//func TestSaveAgent(t *testing.T) {
// m := member.Member{}
// m.Id = json.Number("1")
//
// agt := NewAgent("test agent424", m)
// as := NewProbeService()
//
// res, err := as.SaveAgent(agt)
// if err != nil {
// t.Log(res)
// }
//}
func TestSaveProbe(t *testing.T) {
ks := keystore.NewKeyStoreSerivce()
pks, _ := ks.CreateKey()
enks, _ := ks.CreateKey()
ppp := NewProbe(pks, enks)
ppp.Domain = &domain.Domain{Id:"1"}
as := NewProbeService()
res, err := as.Save(ppp)
if err != nil {
t.Log(res)
}
}
//
//func TestListAgent(t *testing.T) {