Update placeholder branch for containerized_rqd (#1550)

Signed-off-by: Diego Tavares <[email protected]>
AcademySoftwareFoundation · Oct 18, 2024 · b117568 · b117568
1 parent 4e365d4
commit b117568
Show file tree

Hide file tree

Showing 17 changed files with 440 additions and 349 deletions.
diff --git a/cuebot/src/main/java/com/imageworks/spcue/DispatchFrame.java b/cuebot/src/main/java/com/imageworks/spcue/DispatchFrame.java
@@ -49,5 +49,8 @@ public class DispatchFrame extends FrameEntity implements FrameInterface {
 
     // A comma separated list of services
     public String services;
+
+    // The Operational System this frame is expected to run in
+    public String os;
 }
 
diff --git a/cuebot/src/main/java/com/imageworks/spcue/DispatchHost.java b/cuebot/src/main/java/com/imageworks/spcue/DispatchHost.java
@@ -51,7 +51,7 @@ public class DispatchHost extends Entity
     public long gpuMemory;
     public long idleGpuMemory;
     public String tags;
-    public String os;
+    private String os;
 
     public boolean isNimby;
     public boolean isLocalDispatch = false;
@@ -81,6 +81,14 @@ public String getFacilityId() {
         return facilityId;
     }
 
+    public String[] getOs() {
+        return this.os.split(",");
+    }
+
+    public void setOs(String os) {
+        this.os = os;
+    }
+
     public boolean canHandleNegativeCoresRequest(int requestedCores) {
         // Request is positive, no need to test further.
         if (requestedCores > 0) {

diff --git a/cuebot/src/main/java/com/imageworks/spcue/VirtualProc.java b/cuebot/src/main/java/com/imageworks/spcue/VirtualProc.java
@@ -85,7 +85,9 @@ public String getName() {
      * @param frame
      * @return
      */
-    public static final VirtualProc build(DispatchHost host, DispatchFrame frame, String... selfishServices) {
+    public static final VirtualProc build(DispatchHost host,
+                                          DispatchFrame frame,
+                                          String... selfishServices) {
         VirtualProc proc = new VirtualProc();
         proc.allocationId = host.getAllocationId();
         proc.hostId = host.getHostId();
@@ -94,7 +96,7 @@ public static final VirtualProc build(DispatchHost host, DispatchFrame frame, St
         proc.jobId = frame.getJobId();
         proc.showId = frame.getShowId();
         proc.facilityId = frame.getFacilityId();
-        proc.os = host.os;
+        proc.os = frame.os;
 
         proc.hostName = host.getName();
         proc.unbooked = false;
@@ -148,7 +150,7 @@ else if (proc.coresReserved >= 100) {
                 proc.coresReserved = wholeCores * 100;
             } else {
                 if (frame.threadable) {
-                    if (selfishServices != null && 
+                    if (selfishServices != null &&
                         frame.services != null &&
                         containsSelfishService(frame.services.split(","), selfishServices)){
                         proc.coresReserved = wholeCores * 100;
@@ -238,7 +240,7 @@ public static final VirtualProc build(DispatchHost host,
         proc.jobId = frame.getJobId();
         proc.showId = frame.getShowId();
         proc.facilityId = frame.getFacilityId();
-        proc.os = host.os;
+        proc.os = frame.os;
 
         proc.hostName = host.getName();
         proc.unbooked = false;