feat: Add missing NodeOperator node feature and update offboarding fo…

…r sygnum zh5 (#1166)
dfinity · Dec 23, 2024 · f0dea0e · f0dea0e
1 parent 7cb6022
commit f0dea0e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/cordoned_features.yaml b/cordoned_features.yaml
@@ -29,9 +29,9 @@ features:
   - feature: data_center
     value: ty2
     explanation: "offboarding TY2 DC after 48 months; https://forum.dfinity.org/t/proposal-update-interim-gen-1-node-provider-remuneration-after-48-months/35001/32 and https://forum.dfinity.org/t/proposal-update-interim-gen-1-node-provider-remuneration-after-48-months/35001/42"
-  - feature: data_center
-    value: zh5
-    explanation: "offboarding ZH5 DC after 48 months; https://forum.dfinity.org/t/proposal-update-interim-gen-1-node-provider-remuneration-after-48-months/35001/27"
+  - feature: node_operator
+    value: 4ohfd-bdyeu-5djlz-rf3lc-bqca2-h22rg-t5ipt-cjhl2-r5dbf-tk3fv-hae
+    explanation: "offboarding Sygnum ZH5 DC after 48 months; https://forum.dfinity.org/t/proposal-update-interim-gen-1-node-provider-remuneration-after-48-months/35001/27"
   - feature: data_center
     value: ch2
     explanation: "offboarding CH2 DC after 48 months; https://forum.dfinity.org/t/proposal-update-interim-gen-1-node-provider-remuneration-after-48-months/35001/40"

diff --git a/rs/cli/src/cordoned_feature_fetcher.rs b/rs/cli/src/cordoned_feature_fetcher.rs
@@ -148,6 +148,8 @@ features:
       value: mu1
     - feature: node_provider
       value: some-np
+    - feature: node_operator
+      value: some-node-operator
     - feature: data_center_owner
       value: some-dco
     - feature: area
@@ -162,7 +164,7 @@ features:
 
         let parsed = fetcher.parse(contents).unwrap();
 
-        assert_eq!(parsed.len(), 6)
+        assert_eq!(parsed.len(), 7)
     }
 
     #[test]

diff --git a/rs/decentralization/src/lib.rs b/rs/decentralization/src/lib.rs
@@ -56,17 +56,18 @@ impl SubnetChangeResponse {
                 change.old_nodes.iter().fold(
                     NodeFeature::variants()
                         .into_iter()
+                        .filter(|f| f != &NodeFeature::NodeOperator)
                         .map(|f| (f, FeatureDiff::new()))
                         .collect::<IndexMap<NodeFeature, FeatureDiff>>(),
                     |mut acc, n| {
-                        for f in NodeFeature::variants() {
+                        for f in NodeFeature::variants().into_iter().filter(|f| f != &NodeFeature::NodeOperator) {
                             acc.get_mut(&f).unwrap().entry(n.get_feature(&f).unwrap_or_default()).or_insert((0, 0)).0 += 1;
                         }
                         acc
                     },
                 ),
                 |mut acc, n| {
-                    for f in NodeFeature::variants() {
+                    for f in NodeFeature::variants().into_iter().filter(|f| f != &NodeFeature::NodeOperator) {
                         acc.get_mut(&f).unwrap().entry(n.get_feature(&f).unwrap_or_default()).or_insert((0, 0)).1 += 1;
                     }
                     acc
@@ -96,6 +97,7 @@ impl Display for SubnetChangeResponse {
             .scores_individual()
             .keys()
             .sorted()
+            .filter(|f| *f != &NodeFeature::NodeOperator)
             .map(|k| {
                 let before = before_individual.get(k).unwrap();
                 let after = after_individual.get(k).unwrap();

diff --git a/rs/decentralization/src/nakamoto/mod.rs b/rs/decentralization/src/nakamoto/mod.rs
@@ -530,6 +530,7 @@ mod tests {
         let score_expected = NakamotoScore {
             coefficients: IndexMap::from([
                 (NodeFeature::NodeProvider, 1.),
+                (NodeFeature::NodeOperator, 1.),
                 (NodeFeature::DataCenter, 1.),
                 (NodeFeature::DataCenterOwner, 1.),
                 (NodeFeature::Area, 1.),
@@ -538,6 +539,7 @@ mod tests {
             value_counts: IndexMap::new(),
             controlled_nodes: IndexMap::from([
                 (NodeFeature::NodeProvider, 1),
+                (NodeFeature::NodeOperator, 1),
                 (NodeFeature::DataCenter, 1),
                 (NodeFeature::DataCenterOwner, 1),
                 (NodeFeature::Area, 1),
@@ -854,7 +856,7 @@ mod tests {
         // Convert the subnet snapshot to the "Subnet" struct
         let subnet_all: DecentralizedSubnet = DecentralizedSubnet::from(subnet_all);
         let re_unhealthy_nodes = Regex::new(r"^(gp7wd|e4ysi|qhz4y|2fbvp)-.+$").unwrap();
-        let subnet_healthy: DecentralizedSubnet = DecentralizedSubnet {
+        let subnet_healthy = DecentralizedSubnet {
             id: subnet_all.id,
             nodes: subnet_all
                 .nodes

diff --git a/rs/ic-management-types/src/lib.rs b/rs/ic-management-types/src/lib.rs
@@ -382,6 +382,7 @@ impl Node {
                         .map(|d| d.name.clone())
                         .unwrap_or_else(|| "unknown".to_string()),
                 ),
+                (NodeFeature::NodeOperator, self.operator.principal.to_string()),
                 (NodeFeature::NodeProvider, self.operator.provider.principal.to_string()),
             ])
         };
@@ -471,6 +472,7 @@ impl Eq for Node {}
 #[serde(rename_all = "snake_case")]
 pub enum NodeFeature {
     NodeProvider,
+    NodeOperator,
     DataCenter,
     DataCenterOwner,
     Area,    // Represents smaller geographic entities like cities and states