First port of Garage to Netapp

src/rpc/ring.rs

@@ -3,6 +3,8 @@
 use std::collections::{HashMap, HashSet};
 use std::convert::TryInto;
 
+use netapp::NodeID;
+
 use serde::{Deserialize, Serialize};
 
 use garage_util::data::*;
@@ -98,7 +100,7 @@ pub struct Ring {
 	pub config: NetworkConfig,
 
 	// Internal order of nodes used to make a more compact representation of the ring
-	nodes: Vec<Uuid>,
+	nodes: Vec<NodeID>,
 
 	// The list of entries in the ring
 	ring: Vec<RingEntry>,
@@ -260,6 +262,11 @@ impl Ring {
 			})
 			.collect::<Vec<_>>();
 
+		let nodes = nodes
+			.iter()
+			.map(|id| NodeID::from_slice(id.as_slice()).unwrap())
+			.collect::<Vec<_>>();
+
 		Self {
 			replication_factor,
 			config,
@@ -291,7 +298,7 @@ impl Ring {
 	}
 
 	/// Walk the ring to find the n servers in which data should be replicated
-	pub fn get_nodes(&self, position: &Hash, n: usize) -> Vec<Uuid> {
+	pub fn get_nodes(&self, position: &Hash, n: usize) -> Vec<NodeID> {
 		if self.ring.len() != 1 << PARTITION_BITS {
 			warn!("Ring not yet ready, read/writes will be lost!");
 			return vec![];