drozdziak1
/
hscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

topo: builds

master
Serge Bazanski 2018-10-25 12:35:55 +01:00
parent f03b5da5a8
commit ab55ccac0d
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go/svc/topo/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
a_main-packr.go

2
go/svc/topo/graph/graph.go
View File

@ -10,7 +10,7 @@ import (
"github.com/digitalocean/go-netbox/netbox/models"
"github.com/golang/glog"
confpb "code.hackerspace.pl/q3k/topo/proto/config"
confpb "code.hackerspace.pl/hscloud/go/svc/topo/proto/config"
)
type MachinePort struct {

8
go/svc/topo/main.go
View File

@ -7,16 +7,16 @@ import (
"flag"
"io/ioutil"
"code.hackerspace.pl/q3k/mirko"
"code.hackerspace.pl/hscloud/go/mirko"
"github.com/digitalocean/go-netbox/netbox"
"github.com/digitalocean/go-netbox/netbox/client"
"github.com/golang/glog"
"github.com/golang/protobuf/proto"
confpb "code.hackerspace.pl/q3k/topo/proto/config"
confpb "code.hackerspace.pl/hscloud/go/svc/topo/proto/config"
"code.hackerspace.pl/q3k/topo/graph"
"code.hackerspace.pl/q3k/topo/state"
"code.hackerspace.pl/hscloud/go/svc/topo/graph"
"code.hackerspace.pl/hscloud/go/svc/topo/state"
)
var (

8
go/svc/topo/service.go
View File

@ -7,15 +7,15 @@ import (
"sort"
"strings"
"code.hackerspace.pl/q3k/mirko"
"code.hackerspace.pl/hscloud/go/mirko"
"github.com/gobuffalo/packr"
"github.com/q3k/statusz"
"vbom.ml/util/sortorder"
"code.hackerspace.pl/q3k/topo/graph"
"code.hackerspace.pl/q3k/topo/state"
"code.hackerspace.pl/hscloud/go/svc/topo/graph"
"code.hackerspace.pl/hscloud/go/svc/topo/state"
pb "code.hackerspace.pl/q3k/topo/proto/control"
pb "code.hackerspace.pl/hscloud/go/svc/topo/proto/control"
)
type Service struct {

8
go/svc/topo/state/state.go
View File

@ -7,10 +7,10 @@ import (
"google.golang.org/grpc"
cpb "code.hackerspace.pl/q3k/topo/proto/config"
pb "code.hackerspace.pl/q3k/topo/proto/control"
cpb "code.hackerspace.pl/hscloud/go/svc/topo/proto/config"
pb "code.hackerspace.pl/hscloud/go/svc/topo/proto/control"
"code.hackerspace.pl/q3k/hspki"
"code.hackerspace.pl/hscloud/go/pki"
)
type SwitchportState struct {
@ -56,7 +56,7 @@ func (s *StateManager) FetchState(ctx context.Context, conf *cpb.Config) error {
conn, ok := s.Conns[sw.ControlAddress]
if !ok {
var err error
conn, err = grpc.Dial(sw.ControlAddress, hspki.WithClientHSPKI())
conn, err = grpc.Dial(sw.ControlAddress, pki.WithClientHSPKI())
if err != nil {
return fmt.Errorf("when connecting to switch %s: %v", sw.Name, err)
}