NET-1146: add node ipv6 addr to egress route (#2896)

* add node ipv6 addr to egress route

* fix egress route ipv6 address issue

* revert ipv6 peer addr change

---------

Co-authored-by: Max Ma <[email protected]>

logic/peers.go

@@ -173,7 +173,8 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
 			}
 			if peer.IsEgressGateway {
 				hostPeerUpdate.EgressRoutes = append(hostPeerUpdate.EgressRoutes, models.EgressNetworkRoutes{
-					NodeAddr:     node.PrimaryAddressIPNet(),
+					NodeAddr:     node.Address,
+					NodeAddr6:    node.Address6,
 					EgressRanges: peer.EgressGatewayRanges,
 				})
 			}

models/mqtt.go

@@ -43,6 +43,7 @@ type EgressInfo struct {
 // EgressNetworkRoutes - struct for egress network routes for adding routes to peer's interface
 type EgressNetworkRoutes struct {
 	NodeAddr     net.IPNet `json:"node_addr"`
+	NodeAddr6    net.IPNet `json:"node_addr6"`
 	EgressRanges []string  `json:"egress_ranges"`
 }