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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
geek 2017-06-26 16:16:33 +09:00
commit 5a3f23bec9
4 changed files with 95 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
proxy/infra/infra_service.go
View File

@ -79,8 +79,8 @@ func NewInfraService() *InfraService {
return &InfraService{} return &InfraService{}
} }
func (is *InfraService) Save(infra *Infra) (string, error) { func (is *InfraService) Regist(infra *Infra) (string, error) {
out, err := utils.InvokeDBByModel("infra", "save", infra, "com.loafle.overflow.module.infra.model.Infra") out, err := utils.InvokeDBByModel("infra", "save", infra, utils.MODEL_INFRA)
if err != nil { if err != nil {
return "", err return "", err
@ -89,8 +89,8 @@ func (is *InfraService) Save(infra *Infra) (string, error) {
return out, nil return out, nil
} }
func (is *InfraService) SaveMachine(i *InfraMachine) (string, error) { func (is *InfraService) RegistMachine(i *InfraMachine) (string, error) {
out, err := utils.InvokeDBByModel("infraMachine", "save", i, "com.loafle.overflow.module.infra.model.InfraMachine") out, err := utils.InvokeDBByModel("infraMachine", "save", i, utils.MODEL_INFRA_MACHINE)
if err != nil { if err != nil {
return "", err return "", err
@ -99,8 +99,8 @@ func (is *InfraService) SaveMachine(i *InfraMachine) (string, error) {
return out, nil return out, nil
} }
func (is *InfraService) SaveHost(i *InfraHost) (string, error) { func (is *InfraService) RegistHost(i *InfraHost) (string, error) {
out, err := utils.InvokeDBByModel("infraHost", "save", i, "com.loafle.overflow.module.infra.model.InfraHost") out, err := utils.InvokeDBByModel("infraHost", "save", i, utils.MODEL_INFRA_HOST)
if err != nil { if err != nil {
return "", err return "", err
@ -109,8 +109,8 @@ func (is *InfraService) SaveHost(i *InfraHost) (string, error) {
return out, nil return out, nil
} }
func (is *InfraService) SaveOS(i *InfraOS) (string, error) { func (is *InfraService) RegistOS(i *InfraOS) (string, error) {
out, err := utils.InvokeDBByModel("InfraOS", "save", i, "com.loafle.overflow.module.infra.model.InfraOS") out, err := utils.InvokeDBByModel("InfraOS", "save", i, utils.MODEL_INFRA_OS)
if err != nil { if err != nil {
return "", err return "", err
@ -119,8 +119,8 @@ func (is *InfraService) SaveOS(i *InfraOS) (string, error) {
return out, nil return out, nil
} }
func (is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error) { func (is *InfraService) RegistOSApplication(i *InfraOSApplication) (string, error) {
out, err := utils.InvokeDBByModel("InfraOSApplication", "save", i, "com.loafle.overflow.module.infra.model.InfraOSApplication") out, err := utils.InvokeDBByModel("InfraOSApplication", "save", i, utils.MODEL_INFRA_OS_APPLICATION)
if err != nil { if err != nil {
return "", err return "", err
@ -129,8 +129,8 @@ func (is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error)
return out, nil return out, nil
} }
func (is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) { func (is *InfraService) RegistOSDaemon(i *InfraOSDaemon) (string, error) {
out, err := utils.InvokeDBByModel("InfraOSDaemon", "save", i, "com.loafle.overflow.module.infra.model.InfraOSDaemon") out, err := utils.InvokeDBByModel("InfraOSDaemon", "save", i, utils.MODEL_INFRA_OS_DAEMON)
if err != nil { if err != nil {
return "", err return "", err
@ -139,8 +139,8 @@ func (is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) {
return out, nil return out, nil
} }
func (is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) { func (is *InfraService) RegistOSPort(i *InfraOSPort) (string, error) {
out, err := utils.InvokeDBByModel("InfraOSPort", "save", i, "com.loafle.overflow.module.infra.model.InfraOSPort") out, err := utils.InvokeDBByModel("InfraOSPort", "save", i, utils.MODEL_INFRA_OS_PORT)
if err != nil { if err != nil {
return "", err return "", err
@ -149,8 +149,8 @@ func (is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) {
return out, nil return out, nil
} }
func (is *InfraService) SaveService(i *InfraService) (string, error) { func (is *InfraService) RegistService(i *InfraService) (string, error) {
out, err := utils.InvokeDBByModel("InfraService", "save", i, "com.loafle.overflow.module.infra.model.InfraService") out, err := utils.InvokeDBByModel("InfraService", "save", i, utils.MODEL_INFRA_SERVICE)
if err != nil { if err != nil {
return "", err return "", err
@ -161,7 +161,7 @@ func (is *InfraService) SaveService(i *InfraService) (string, error) {
func (is *InfraService) Read(id string) (string, error) { func (is *InfraService) Read(id string) (string, error) {
out, err := utils.InvokeDBByModel("infra", "findOne", id, "java.lang.Long") out, err := utils.InvokeDBByModel("infra", "findOne", id, utils.MODEL_LONG)
if err != nil { if err != nil {
return "", err return "", err
@ -172,7 +172,7 @@ func (is *InfraService) Read(id string) (string, error) {
func (is *InfraService) ReadChild(infraType, id string) (string, error) { func (is *InfraService) ReadChild(infraType, id string) (string, error) {
out, err := utils.InvokeDBByModel(infraType, "findOne", id, "java.lang.Long") out, err := utils.InvokeDBByModel(infraType, "findOne", id, utils.MODEL_LONG)
if err != nil { if err != nil {
return "", err return "", err

36
proxy/infra/infra_service_test.go Normal file
View File

@ -0,0 +1,36 @@
package infra
import (
"encoding/json"
"git.loafle.net/overflow/commons_go/model/timestamp"
"git.loafle.net/overflow/overflow_service/proxy/meta"
"testing"
)
func TestInfraRegist(t *testing.T) {
is := InfraService{}
infraType := meta.MetaInfraType{
Id: json.Number("1"),
}
infra := &Infra{
MetaInfraType: infraType,
ChildId: json.Number("0"),
CreateDate: timestamp.Now(),
}
res, err := is.Regist(infra)
if err != nil {
t.Fatal(err)
}
t.Log(res)
}
func TestInfraList(t *testing.T) {
is := InfraService{}
res, err := is.Read("1")
if err != nil {
t.Fatal(err)
}
t.Log(res)
}

106
proxy/target/target_service.go
View File

@ -3,30 +3,19 @@ package target
import ( import (
"encoding/json" "encoding/json"
"git.loafle.net/overflow/commons_go/model/timestamp" "git.loafle.net/overflow/commons_go/model/timestamp"
"git.loafle.net/overflow/overflow_service/proxy/member" "git.loafle.net/overflow/overflow_service/proxy/infra"
"git.loafle.net/overflow/overflow_service/proxy" "git.loafle.net/overflow/overflow_service/proxy/probe"
"fmt"
"git.loafle.net/overflow/overflow_service/proxy/utils" "git.loafle.net/overflow/overflow_service/proxy/utils"
"git.loafle.net/overflow/overflow_service/proxy/session"
) )
type Target struct { type Target struct {
Id json.Number `json:"id,Number,omitempty"` Id json.Number `json:"id,Number,omitempty"`
Ip int64 `json:"ip,omitempty"`
Port int `json:"port,omitempty"`
TargetType string `json:"targetType,omitempty"`
VendorName string `json:"vendorName,omitempty"`
Kinds string `json:"kinds,omitempty"`
Version string `json:"version,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"` CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
PortType string `json:"portType,omitempty"` Probe *probe.Probe `json:"probe,omitempty"`
Member *member.Member `json:"member,omitempty"` Infra *infra.Infra `json:"infra,omitempty"`
} }
type TargetService struct { type TargetService struct {
} }
func NewTargetService() *TargetService { func NewTargetService() *TargetService {
@ -37,98 +26,23 @@ func (t *TargetService)GetModel() interface{} {
return &Target{} return &Target{}
} }
func (t *TargetService)List(tm *Target) (string, error) { func (t *TargetService) ReadAllByProbe(p *probe.Probe) (string, error) {
tm.Member.Id = session.GetSessionMember().Id out, err := utils.InvokeDBByModel("target", "findAllByProbe", p, utils.MODEL_PROBE)
bytes, err := json.Marshal(tm)
if err != nil { if err != nil {
return "", err return "", err
} }
m := make(map[string]string) return out, err
m["com.loafle.overflow.target.model.Target"] = string(bytes) }
out, err := proxy.InvokeDB("target", "findAll", m) func (t *TargetService) Regist(target *Target) (string, error) {
out, err := utils.InvokeDBByModel("target", "save", target, utils.MODEL_TARGET)
if err != nil { if err != nil {
return "", err return "", err
} }
return out, err;
}
func (t *TargetService)Create(tm *Target) (string,error) {
//bytes, err := json.Marshal(tm)
//
//if err != nil {
// return ""
//}
//
//m := make(map[string]string)
//m["com.loafle.overflow.target.model.Target"] = string(bytes)
//
//out := proxy.InvokeDB("target", "create", m)
out, err := utils.InvokeDB("target", "create", tm)
if err != nil {
return "", err
}
return out, nil return out, nil
}
func (t *TargetService)CreateAll(tmlist *[]*Target) (string,error) {
outlist := make([]string, 0)
for _, ttt := range *tmlist {
ttt.Member = session.GetSessionMember()
out,err := t.Create(ttt)
if err != nil {
return "", err
}
outlist = append(outlist, out)
}
bytes,err := json.Marshal(outlist)
if err != nil {
return "", err
}
return string(bytes), nil
}
func (t *TargetService)CreateListTT(tmlist *[]*Target) (string, error) {
bytes, err := json.Marshal(tmlist)
if err != nil {
return "",err
}
m := make(map[string]string)
m["java.util.List"] = string(bytes)
fmt.Println(string(bytes))
out, err := proxy.InvokeDB("target", "createAll", m)
if err != nil {
return "", err
}
//
//
return out, nil;
//return ""
} }

126
proxy/target/target_service_test.go
View File

@ -1,114 +1,42 @@
package target package target
import ( import (
"encoding/json"
"git.loafle.net/overflow/commons_go/model/timestamp"
"git.loafle.net/overflow/overflow_service/proxy/infra"
"git.loafle.net/overflow/overflow_service/proxy/probe"
"testing" "testing"
//"git.loafle.net/overflow/overflow_service/proxy/member"
"git.loafle.net/overflow/overflow_service/proxy/member"
) )
func TestCreateTarget(t *testing.T) { func TestTargetRegist(t *testing.T) {
tt := Target{
Ip:3232235882,
Port:5432,
TargetType:"DATABASE",
Kinds:"PostgreSQL0000000",
Version:"9.5.0",
VendorName:"PostgreSQL 9.5.0",
PortType:"TCP",
Member:&member.Member{Id:"1"},
}
ts := NewTargetService() ts := NewTargetService()
p := &probe.Probe{}
p.Id = json.Number("1")
i := &infra.Infra{}
i.Id = json.Number("1")
ts.Create(&tt) target := &Target{
CreateDate: timestamp.Now(),
Probe: p,
Infra: i,
}
res, err := ts.Regist(target)
if err != nil {
t.Fatal(err)
}
t.Log(res)
} }
func TestTargetList(t *testing.T) {
func TestFindAll(t *testing.T) {
tt := Target{
Member:&member.Member{Id:"1"},
}
ts := NewTargetService() ts := NewTargetService()
p := &probe.Probe{
Id: "1",
str := ts.List(&tt)
t.Log(str)
} }
res, err := ts.ReadAllByProbe(p)
if err != nil {
func TestCreateAll(t *testing.T) { t.Fatal(err)
}
tl := make([]*Target, 0) t.Log(res)
tl = append(tl, &Target{
Ip:3232235882,
Port:5432,
TargetType:"DATABASE",
Kinds:"PostgreSQL2222",
Version:"9.5.0",
VendorName:"PostgreSQL 9.5.0",
PortType:"TCP",
Member:&member.Member{Id:"1"},
})
tl = append(tl, &Target{
Ip:3232235882,
Port:5432,
TargetType:"DATABASE",
Kinds:"PostgreSQL3333",
Version:"9.5.0",
VendorName:"PostgreSQL 9.5.0",
PortType:"TCP",
Member:&member.Member{Id:"1"},
})
tl = append(tl, &Target{
Ip:3232235882,
Port:5432,
TargetType:"DATABASE",
Kinds:"PostgreSQL4444",
Version:"9.5.0",
VendorName:"PostgreSQL 9.5.0",
PortType:"TCP",
Member:&member.Member{Id:"1"},
})
tl = append(tl, &Target{
Ip:3232235882,
Port:5432,
TargetType:"DATABASE",
Kinds:"PostgreSQL5555",
Version:"9.5.0",
VendorName:"PostgreSQL 9.5.0",
PortType:"TCP",
Member:&member.Member{Id:"1"},
})
tl = append(tl, &Target{
Ip:3232235882,
Port:5432,
TargetType:"DATABASE",
Kinds:"PostgreSQL6666",
Version:"9.5.0",
VendorName:"PostgreSQL 9.5.0",
PortType:"TCP",
Member:&member.Member{Id:"1"},
})
ts := NewTargetService()
ts.CreateListTT(&tl)
} }