update scheduler updates for manifest contract

Author: halfcyan

odorobo/src/actors/scheduler_actor/scheduling.rs

@@ -135,7 +135,7 @@ impl SchedulerActor {
         let used_vcpus = agent.data.used_vcpus.saturating_add(pending_vcpus);
         let used_ram = agent.data.used_ram.as_u64().saturating_add(pending_ram);
         let requested_vcpus = msg.config.desired.compute.vcpus;
-        let requested_memory = msg.config.desired.compute.memory.as_u64();
+        let requested_memory = msg.config.desired.compute.memory_bytes;
         let agent_used_vcpus = used_vcpus.saturating_add(requested_vcpus);
 
         if !has_capacity(
@@ -248,7 +248,7 @@ fn pending_resources_by_agent(
                 totals.0 = totals.0.saturating_add(manifest.desired.compute.vcpus);
                 totals.1 = totals
                     .1
-                    .saturating_add(manifest.desired.compute.memory.as_u64());
+                    .saturating_add(manifest.desired.compute.memory_bytes);
             }
         }
     }
@@ -283,9 +283,9 @@ pub(super) fn affinity_delta(strictness: &AffinityStrictness, follows_rule: bool
 /// Evaluates a rule against the metadata objects in its selected affinity scope.
 ///
 /// Requirements are OR-ed. For a requirement to match, every supplied metadata
-/// object must satisfy it; empty metadata therefore does not match. `inverse`
-/// negates the aggregate result, and a rule without requirements is false before
-/// inversion.
+/// object must satisfy it; empty metadata therefore does not match. The `anti`
+/// direction negates the aggregate result, and a rule without requirements is false
+/// before direction is applied.
 pub(super) fn evaluate_affinity_rule(
     metadata_tables: &MetadataTables<'_>,
     rule: &crate::manifest::AffinityRule,
@@ -313,7 +313,7 @@ pub(super) fn evaluate_affinity_rule(
         }
     }
 
-    if rule.inverse {
+    if matches!(rule.direction, crate::manifest::AffinityDirection::Anti) {
         !follows_rule
     } else {
         follows_rule

odorobo/src/actors/scheduler_actor/tests.rs

@@ -7,8 +7,8 @@ use super::{
 };
 
 use crate::manifest::{
-    AffinityRequirement, AffinityRule, AffinityStrictness, AffinityType, Boot, Compute,
-    DesiredState, Metadata, MetadataTable, Operator, VmManifest,
+    AffinityDirection, AffinityRequirement, AffinityRule, AffinityStrictness, AffinityType, Boot,
+    Compute, DesiredState, Metadata, MetadataTable, Operator, VmManifest,
 };
 use crate::messages::agent::AgentStatus;
 use crate::types::ObjectMetadata;
@@ -29,7 +29,7 @@ fn test_manifest(vcpus: u32, memory_bytes: u64) -> VmManifest {
             },
             compute: Compute {
                 vcpus,
-                memory: bytesize::ByteSize::b(memory_bytes),
+                memory_bytes,
                 ..Default::default()
             },
             boot: Boot::default(),
@@ -491,7 +491,7 @@ fn evaluates_inverse_and_empty_requirements() {
     let rule = AffinityRule {
         strictness: AffinityStrictness::Required,
         affinity_type: AffinityType::Agent,
-        inverse: true,
+        direction: AffinityDirection::Anti,
         requirements: vec![requirement(Operator::In, &["frontend"])],
     };
     assert!(!evaluate_affinity_rule(
@@ -502,7 +502,7 @@ fn evaluates_inverse_and_empty_requirements() {
     let empty_rule = AffinityRule {
         strictness: AffinityStrictness::Required,
         affinity_type: AffinityType::Agent,
-        inverse: false,
+        direction: AffinityDirection::Normal,
         requirements: Vec::new(),
     };
     assert!(!evaluate_affinity_rule(&[], &empty_rule));

odoroboctl/src/cli.rs

@@ -113,7 +113,7 @@ pub async fn run_command(cli: Cli) -> Result<()> {
                     },
                     compute: Compute {
                         vcpus: 4,
-                        memory: ByteSize::gib(4),
+                        memory_bytes: ByteSize::gib(4).as_u64(),
                         ..Default::default()
                     },
                     storage: vec![Storage {