Merge pull request #161 from filecoin-saturn/feat/integrate-new-endpoint

Integrate new orchestrator endpoint

internal/state/state.go

@@ -9,3 +9,12 @@ type State struct {
 type PoolController interface {
 	DoRefresh()
 }
+
+type NodeInfo struct {
+	ID            string  `json:"id"`
+	IP            string  `json:"ip"`
+	Distance      float32 `json:"distance"`
+	Weight        int     `json:"weight"`
+	ComplianceCid string  `json:"complianceCid"`
+	Core          bool    `json:"core"`
+}

internal/util/harness.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"errors"
+	"math/rand"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -26,11 +27,21 @@ func BuildCabooseHarness(t *testing.T, n int, maxRetries int, opts ...HarnessOpt
 	ch := &CabooseHarness{}
 
 	ch.Endpoints = make([]*Endpoint, n)
-	purls := make([]string, n)
+	purls := make([]state.NodeInfo, n)
 	for i := 0; i < len(ch.Endpoints); i++ {
 		ch.Endpoints[i] = &Endpoint{}
 		ch.Endpoints[i].Setup()
-		purls[i] = strings.TrimPrefix(ch.Endpoints[i].Server.URL, "https://")
+		ip := strings.TrimPrefix(ch.Endpoints[i].Server.URL, "https://")
+
+		cid, _ := cid.V1Builder{Codec: uint64(multicodec.Raw), MhType: uint64(multicodec.Sha2_256)}.Sum([]byte(ip))
+
+		purls[i] = state.NodeInfo{
+			IP:            ip,
+			ID:            "node-id",
+			Weight:        rand.Intn(100),
+			Distance:      rand.Float32(),
+			ComplianceCid: cid.String(),
+		}
 	}
 	ch.goodOrch = true
 	orch := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

pool.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/filecoin-saturn/caboose/internal/state"
 	"io"
 	"math/rand"
 	"net/url"
@@ -38,13 +39,22 @@ func (p *pool) loadPool() ([]string, error) {
 	}
 	defer resp.Body.Close()
 
-	responses := make([]string, 0)
+	responses := make([]state.NodeInfo, 0)
+
 	if err := json.NewDecoder(resp.Body).Decode(&responses); err != nil {
 		goLogger.Warnw("failed to decode backends from orchestrator", "err", err, "endpoint", p.config.OrchestratorEndpoint.String())
 		return nil, err
 	}
+
 	goLogger.Infow("got backends from orchestrators", "cnt", len(responses), "endpoint", p.config.OrchestratorEndpoint.String())
-	return responses, nil
+
+	var ips []string
+
+	for _, r := range responses {
+		ips = append(ips, r.IP)
+	}
+
+	return ips, nil
 }
 
 type mirroredPoolRequest struct {