Răsfoiți Sursa

add egress domain model to egress host update

abhishek9686 3 săptămâni în urmă
părinte
comite
54d8459fa6
2 a modificat fișierele cu 16 adăugiri și 13 ștergeri
  1. 10 6
      controllers/egress.go
  2. 6 7
      models/host.go

+ 10 - 6
controllers/egress.go

@@ -52,7 +52,7 @@ func createEgress(w http.ResponseWriter, r *http.Request) {
 		isDomain := logic.IsFQDN(req.Range)
 		if cidrErr != nil && !isDomain {
 			if cidrErr != nil {
-				logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+				logic.ReturnErrorResponse(w, r, logic.FormatError(cidrErr, "badrequest"))
 			} else {
 				logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("bad domain name"), "badrequest"))
 			}
@@ -134,11 +134,15 @@ func createEgress(w http.ResponseWriter, r *http.Request) {
 				}
 				fmt.Println("=======> Sending Host Update: ", host.Name)
 				mq.HostUpdate(&models.HostUpdate{
-					Action:   models.EgressUpdate,
-					Host:     *host,
-					EgressID: e.ID,
-					Domain:   e.Domain,
-					Node:     node,
+					Action: models.EgressUpdate,
+					Host:   *host,
+					EgressDomain: models.EgressDomain{
+						ID:     e.ID,
+						Host:   *host,
+						Node:   node,
+						Domain: e.Domain,
+					},
+					Node: node,
 				})
 			}
 		}

+ 6 - 7
models/host.go

@@ -140,13 +140,12 @@ const (
 
 // HostUpdate - struct for host update
 type HostUpdate struct {
-	Action     HostMqAction
-	Host       Host
-	Node       Node
-	Signal     Signal
-	EgressID   string
-	Domain     string
-	NewMetrics Metrics
+	Action       HostMqAction
+	Host         Host
+	Node         Node
+	Signal       Signal
+	EgressDomain EgressDomain
+	NewMetrics   Metrics
 }
 
 // HostTurnRegister - struct for host turn registration