From 2a8af2b325ffc63211126e7541224a87d137c9e3 Mon Sep 17 00:00:00 2001 From: zkofiro Date: Tue, 6 Feb 2024 15:35:59 -0800 Subject: [PATCH 1/2] update this with the nonlinear update (switch from numAgents to totalRamp --- .../intuit/tank/project/JobTreeTableBean.java | 19 ++++++++++++------- web/web_ui/src/main/webapp/agents/index.xhtml | 5 +++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/web/web_support/src/main/java/com/intuit/tank/project/JobTreeTableBean.java b/web/web_support/src/main/java/com/intuit/tank/project/JobTreeTableBean.java index bb0c7629b..4db009e84 100644 --- a/web/web_support/src/main/java/com/intuit/tank/project/JobTreeTableBean.java +++ b/web/web_support/src/main/java/com/intuit/tank/project/JobTreeTableBean.java @@ -33,6 +33,10 @@ import javax.inject.Inject; import com.amazonaws.xray.AWSXRay; +import com.intuit.tank.vm.api.enumerated.JobStatus; +import com.intuit.tank.vm.api.enumerated.VMImageType; +import com.intuit.tank.vm.api.enumerated.VMRegion; +import com.intuit.tank.vm.vmManager.models.*; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.time.DateUtils; @@ -49,11 +53,6 @@ import com.intuit.tank.PropertyComparer; import com.intuit.tank.PropertyComparer.SortOrder; import com.intuit.tank.vm.vmManager.VMTracker; -import com.intuit.tank.vm.vmManager.models.CloudVmStatus; -import com.intuit.tank.vm.vmManager.models.CloudVmStatusContainer; -import com.intuit.tank.vm.vmManager.models.ProjectStatusContainer; -import com.intuit.tank.vm.vmManager.models.UserDetail; -import com.intuit.tank.vm.vmManager.models.ValidationStatus; import com.intuit.tank.auth.Security; import com.intuit.tank.dao.JobInstanceDao; import com.intuit.tank.dao.JobQueueDao; @@ -576,9 +575,15 @@ private TreeNode createJobNode(Set trackerJobs, JobQueue jobQueue) { int jobInstanceActive = 0; int jobInstanceTotal = 0; ValidationStatus jobInstanceFailures = new ValidationStatus(); - CloudVmStatusContainer container = vmTracker.getVmStatusForJob(Integer.toString(jobInstance.getId())); + CloudVmStatusContainer container = new CloudVmStatusContainer(); if ( container != null ) { - List vmNodes = getVMStatus(container, hasRights); + List vmNodes = new ArrayList<>(); + CloudVmStatus vmStatus1 = new CloudVmStatus("instanceId1234", "4567", "SG-446", JobStatus.Running, VMImageType.AGENT, VMRegion.US_WEST_2, VMStatus.running, new ValidationStatus(), 1000, 344, new Date(), new Date()); + CloudVmStatus vmStatus2 = new CloudVmStatus("instanceId12345", "4568", "SG-446", JobStatus.Running, VMImageType.AGENT, VMRegion.US_WEST_2, VMStatus.running, new ValidationStatus(), 500, 98, new Date(), new Date()); + VMNodeBean entry1 = new VMNodeBean(vmStatus1, true, null); + VMNodeBean entry2 = new VMNodeBean(vmStatus2, true, null); + vmNodes.add(entry1); + vmNodes.add(entry2); for (VMNodeBean vmNodeBean : vmNodes) { jobInstanceNode.addVMBean(vmNodeBean); diff --git a/web/web_ui/src/main/webapp/agents/index.xhtml b/web/web_ui/src/main/webapp/agents/index.xhtml index 805d14e57..b83209845 100644 --- a/web/web_ui/src/main/webapp/agents/index.xhtml +++ b/web/web_ui/src/main/webapp/agents/index.xhtml @@ -136,9 +136,10 @@ rendered="#{jobQueueManager.tablePrefs.isVisible('totalUsersColumn')}"> - + + - + Date: Tue, 6 Feb 2024 15:38:12 -0800 Subject: [PATCH 2/2] also add est. target user per agent for nonlinear --- .../intuit/tank/project/JobTreeTableBean.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/web/web_support/src/main/java/com/intuit/tank/project/JobTreeTableBean.java b/web/web_support/src/main/java/com/intuit/tank/project/JobTreeTableBean.java index 4db009e84..bb0c7629b 100644 --- a/web/web_support/src/main/java/com/intuit/tank/project/JobTreeTableBean.java +++ b/web/web_support/src/main/java/com/intuit/tank/project/JobTreeTableBean.java @@ -33,10 +33,6 @@ import javax.inject.Inject; import com.amazonaws.xray.AWSXRay; -import com.intuit.tank.vm.api.enumerated.JobStatus; -import com.intuit.tank.vm.api.enumerated.VMImageType; -import com.intuit.tank.vm.api.enumerated.VMRegion; -import com.intuit.tank.vm.vmManager.models.*; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.time.DateUtils; @@ -53,6 +49,11 @@ import com.intuit.tank.PropertyComparer; import com.intuit.tank.PropertyComparer.SortOrder; import com.intuit.tank.vm.vmManager.VMTracker; +import com.intuit.tank.vm.vmManager.models.CloudVmStatus; +import com.intuit.tank.vm.vmManager.models.CloudVmStatusContainer; +import com.intuit.tank.vm.vmManager.models.ProjectStatusContainer; +import com.intuit.tank.vm.vmManager.models.UserDetail; +import com.intuit.tank.vm.vmManager.models.ValidationStatus; import com.intuit.tank.auth.Security; import com.intuit.tank.dao.JobInstanceDao; import com.intuit.tank.dao.JobQueueDao; @@ -575,15 +576,9 @@ private TreeNode createJobNode(Set trackerJobs, JobQueue jobQueue) { int jobInstanceActive = 0; int jobInstanceTotal = 0; ValidationStatus jobInstanceFailures = new ValidationStatus(); - CloudVmStatusContainer container = new CloudVmStatusContainer(); + CloudVmStatusContainer container = vmTracker.getVmStatusForJob(Integer.toString(jobInstance.getId())); if ( container != null ) { - List vmNodes = new ArrayList<>(); - CloudVmStatus vmStatus1 = new CloudVmStatus("instanceId1234", "4567", "SG-446", JobStatus.Running, VMImageType.AGENT, VMRegion.US_WEST_2, VMStatus.running, new ValidationStatus(), 1000, 344, new Date(), new Date()); - CloudVmStatus vmStatus2 = new CloudVmStatus("instanceId12345", "4568", "SG-446", JobStatus.Running, VMImageType.AGENT, VMRegion.US_WEST_2, VMStatus.running, new ValidationStatus(), 500, 98, new Date(), new Date()); - VMNodeBean entry1 = new VMNodeBean(vmStatus1, true, null); - VMNodeBean entry2 = new VMNodeBean(vmStatus2, true, null); - vmNodes.add(entry1); - vmNodes.add(entry2); + List vmNodes = getVMStatus(container, hasRights); for (VMNodeBean vmNodeBean : vmNodes) { jobInstanceNode.addVMBean(vmNodeBean);