This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/grpc-armeria-migration in repository https://gitbox.apache.org/repos/asf/airavata.git
commit f5e56f5fe77797c5d8de91f38575eb8b349bf736 Author: yasithdev <[email protected]> AuthorDate: Tue Mar 31 20:52:58 2026 -0400 fix: complete proto migration for remaining test files Migrate ComputeResourceRepositoryTest, GatewayProfileRepositoryTest, and GroupResourceProfileRepositoryTest from Thrift mutable style to proto builder patterns (newBuilder/toBuilder, addAll* for repeated fields, proto-canonical getter names). --- .../repository/ComputeResourceRepositoryTest.java | 6 +- .../repository/GatewayProfileRepositoryTest.java | 14 +- .../GroupResourceProfileRepositoryTest.java | 310 +++++++++++---------- 3 files changed, 180 insertions(+), 150 deletions(-) diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/repository/ComputeResourceRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/repository/ComputeResourceRepositoryTest.java index 12e08a312e..0654e193fc 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/repository/ComputeResourceRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/repository/ComputeResourceRepositoryTest.java @@ -537,7 +537,7 @@ public class ComputeResourceRepositoryTest extends TestBase { private UnicoreJobSubmission prepareUnicoreJobSubmission() { return UnicoreJobSubmission.newBuilder() .setSecurityProtocol(SecurityProtocol.KERBEROS) - .setUnicoreEndPointURL("http://endpoint";) + .setUnicoreEndPointUrl("http://endpoint";) .build(); } @@ -581,7 +581,7 @@ public class ComputeResourceRepositoryTest extends TestBase { private UnicoreDataMovement prepareUnicoreDataMovement() { return UnicoreDataMovement.newBuilder() .setSecurityProtocol(SecurityProtocol.KERBEROS) - .setUnicoreEndPointURL("http://endpoint";) + .setUnicoreEndPointUrl("http://endpoint";) .build(); } @@ -589,7 +589,7 @@ public class ComputeResourceRepositoryTest extends TestBase { GridFTPDataMovement.Builder builder = GridFTPDataMovement.newBuilder() .setSecurityProtocol(SecurityProtocol.SSH_KEYS); for (String ep : endpoints) { - builder.addGridFTPEndPoints(ep); + builder.addGridFtpEndPoints(ep); } return builder.build(); } diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/repository/GatewayProfileRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/repository/GatewayProfileRepositoryTest.java index dfdc57360c..f8af1714a3 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/repository/GatewayProfileRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/repository/GatewayProfileRepositoryTest.java @@ -64,7 +64,7 @@ public class GatewayProfileRepositoryTest extends TestBase { ServerSettings.getDefaultUserGateway(), defaultGatewayResourceProfileList.get(0).getGatewayId()); - GatewayResourceProfile gf = new GatewayResourceProfile(); + GatewayResourceProfile gf = GatewayResourceProfile.getDefaultInstance(); ComputeResourceRepository computeResourceRepository = new ComputeResourceRepository(); ComputeResourceDescription cm1 = ComputeResourceDescription.newBuilder().setHostName("localhost").build(); cm1 = cm1.toBuilder().setResourceDescription("test compute host").build(); @@ -75,7 +75,7 @@ public class GatewayProfileRepositoryTest extends TestBase { String hostId2 = computeResourceRepository.addComputeResource(cm2); ComputeResourcePreference preference1 = ComputeResourcePreference.newBuilder().setComputeResourceId(hostId1).build(); - preference1 = preference1.toBuilder().setOverridebyAiravata(true).build(); + preference1 = preference1.toBuilder().setOverrideByAiravata(true).build(); preference1 = preference1.toBuilder().setPreferredJobSubmissionProtocol(JobSubmissionProtocol.SSH).build(); preference1 = preference1.toBuilder().setPreferredDataMovementProtocol(DataMovementProtocol.SCP).build(); preference1 = preference1.toBuilder().setPreferredBatchQueue("queue1").build(); @@ -84,10 +84,10 @@ public class GatewayProfileRepositoryTest extends TestBase { Map<String, String> sshConfig = new HashMap<>(); sshConfig.put("ANYTEST", "check"); - preference1 = preference1.toBuilder().setSshAccountProvisionerConfig(sshConfig).build(); + preference1 = preference1.toBuilder().putAllSshAccountProvisionerConfig(sshConfig).build(); ComputeResourcePreference preference2 = ComputeResourcePreference.newBuilder().setComputeResourceId(hostId2).build(); - preference2 = preference2.toBuilder().setOverridebyAiravata(false).build(); + preference2 = preference2.toBuilder().setOverrideByAiravata(false).build(); preference2 = preference2.toBuilder().setPreferredJobSubmissionProtocol(JobSubmissionProtocol.LOCAL).build(); preference2 = preference2.toBuilder().setPreferredDataMovementProtocol(DataMovementProtocol.GRID_FTP).build(); preference2 = preference2.toBuilder().setPreferredBatchQueue("queue2").build(); @@ -102,7 +102,7 @@ public class GatewayProfileRepositoryTest extends TestBase { gf = gf.toBuilder().setCredentialStoreToken("testCredential").build(); gf = gf.toBuilder().setIdentityServerPwdCredToken("pwdCredential").build(); gf = gf.toBuilder().setIdentityServerTenant("testTenant").build(); - gf = gf.toBuilder().setComputeResourcePreferences(list).build(); + gf = gf.toBuilder().addAllComputeResourcePreferences(list).build(); GatewayResourceProfile gf1 = GatewayResourceProfile.newBuilder().setGatewayId("testGateway1").build(); gf1 = gf1.toBuilder().setCredentialStoreToken("testCredential").build(); @@ -133,12 +133,12 @@ public class GatewayProfileRepositoryTest extends TestBase { .filter(p -> p.getComputeResourceId().equals(hostId1)) .findFirst() .get(); - assertTrue(pref1.isOverridebyAiravata()); + assertTrue(pref1.getOverrideByAiravata()); ComputeResourcePreference pref2 = preferences.stream() .filter(p -> p.getComputeResourceId().equals(hostId2)) .findFirst() .get(); - assertFalse(pref2.isOverridebyAiravata()); + assertFalse(pref2.getOverrideByAiravata()); for (ComputeResourcePreference cm : preferences) { System.out.println("******** host id ********* : " + cm.getComputeResourceId()); System.out.println(cm.getPreferredBatchQueue()); diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/repository/GroupResourceProfileRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/repository/GroupResourceProfileRepositoryTest.java index b13c25bd4d..d15585c1b1 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/repository/GroupResourceProfileRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/repository/GroupResourceProfileRepositoryTest.java @@ -69,7 +69,7 @@ public class GroupResourceProfileRepositoryTest extends TestBase { List<String> ipdaresses = new ArrayList<String>(); ipdaresses.add("222.33.43.444"); ipdaresses.add("23.344.44.454"); - description = description.toBuilder().setIpAddresses(ipdaresses).build(); + description = description.toBuilder().addAllIpAddresses(ipdaresses).build(); BatchQueue batchQueue1 = BatchQueue.newBuilder().setQueueName(QUEUE1_NAME).build(); batchQueue1 = batchQueue1.toBuilder().setQueueDescription("que1Desc1").build(); @@ -86,7 +86,7 @@ public class GroupResourceProfileRepositoryTest extends TestBase { List<BatchQueue> batchQueueList = new ArrayList<BatchQueue>(); batchQueueList.add(batchQueue1); batchQueueList.add(batchQueue2); - description = description.toBuilder().setBatchQueues(batchQueueList).build(); + description = description.toBuilder().addAllBatchQueues(batchQueueList).build(); this.resourceId1 = computeResourceRepository.addComputeResource(description); @@ -108,7 +108,7 @@ public class GroupResourceProfileRepositoryTest extends TestBase { List<BatchQueue> cmbatchQueueList = new ArrayList<BatchQueue>(); cmbatchQueueList.add(cm_batchQueue1); cmbatchQueueList.add(cm_batchQueue2); - cm2 = cm2.toBuilder().setBatchQueues(cmbatchQueueList).build(); + cm2 = cm2.toBuilder().addAllBatchQueues(cmbatchQueueList).build(); this.resourceId2 = computeResourceRepository.addComputeResource(cm2); } @@ -117,76 +117,83 @@ public class GroupResourceProfileRepositoryTest extends TestBase { @Test public void GroupResourceProfileRepositoryTest() throws AppCatalogException { - GroupResourceProfile groupResourceProfile = new GroupResourceProfile(); - groupResourceProfile.setGatewayId(gatewayId); - groupResourceProfile.setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME"); - groupResourceProfile.setDefaultCredentialStoreToken("test-cred-store-token"); - - GroupAccountSSHProvisionerConfig groupAccountSSHProvisionerConfig = new GroupAccountSSHProvisionerConfig(); - groupAccountSSHProvisionerConfig.setResourceId(resourceId1); - groupAccountSSHProvisionerConfig.setConfigName("configName"); - groupAccountSSHProvisionerConfig.setConfigValue("configvalue"); - - ComputeResourceReservation reservation1 = new ComputeResourceReservation(); - reservation1.setReservationName("test-reservation1"); - reservation1.setStartTime(AiravataUtils.getCurrentTimestamp().getTime()); - reservation1.setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 100000); - reservation1.addToQueueNames(QUEUE1_NAME); - reservation1.addToQueueNames(QUEUE2_NAME); - - ComputeResourceReservation reservation2 = new ComputeResourceReservation(); - reservation2.setReservationName("test-reservation2"); - reservation2.setStartTime(AiravataUtils.getCurrentTimestamp().getTime() + 200000); - reservation2.setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 300000); - reservation2.addToQueueNames(QUEUE1_NAME); - - GroupComputeResourcePreference groupComputeResourcePreference1 = new GroupComputeResourcePreference(); - groupComputeResourcePreference1.setComputeResourceId(resourceId1); + GroupAccountSSHProvisionerConfig groupAccountSSHProvisionerConfig = GroupAccountSSHProvisionerConfig.newBuilder() + .setResourceId(resourceId1) + .setConfigName("configName") + .setConfigValue("configvalue") + .build(); + + ComputeResourceReservation reservation1 = ComputeResourceReservation.newBuilder() + .setReservationName("test-reservation1") + .setStartTime(AiravataUtils.getCurrentTimestamp().getTime()) + .setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 100000) + .addQueueNames(QUEUE1_NAME) + .addQueueNames(QUEUE2_NAME) + .build(); + + ComputeResourceReservation reservation2 = ComputeResourceReservation.newBuilder() + .setReservationName("test-reservation2") + .setStartTime(AiravataUtils.getCurrentTimestamp().getTime() + 200000) + .setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 300000) + .addQueueNames(QUEUE1_NAME) + .build(); + + GroupComputeResourcePreference groupComputeResourcePreference1 = GroupComputeResourcePreference.newBuilder() + .setComputeResourceId(resourceId1) + .build(); // // groupComputeResourcePreference1.addToGroupSSHAccountProvisionerConfigs(groupAccountSSHProvisionerConfig); // groupComputeResourcePreference1.addToReservations(reservation1); // groupComputeResourcePreference1.addToReservations(reservation2); - GroupComputeResourcePreference groupComputeResourcePreference2 = new GroupComputeResourcePreference(); - groupComputeResourcePreference2.setComputeResourceId(resourceId2); + GroupComputeResourcePreference groupComputeResourcePreference2 = GroupComputeResourcePreference.newBuilder() + .setComputeResourceId(resourceId2) + .build(); List<GroupComputeResourcePreference> groupComputeResourcePreferenceList = new ArrayList<>(); groupComputeResourcePreferenceList.add(groupComputeResourcePreference1); groupComputeResourcePreferenceList.add(groupComputeResourcePreference2); - groupResourceProfile.setComputePreferences(groupComputeResourcePreferenceList); + ComputeResourcePolicy computeResourcePolicy = ComputeResourcePolicy.newBuilder() + .setComputeResourceId(resourceId1) + .addAllowedBatchQueues("queue1") + .build(); - ComputeResourcePolicy computeResourcePolicy = new ComputeResourcePolicy(); - computeResourcePolicy.setComputeResourceId(resourceId1); - computeResourcePolicy.addToAllowedBatchQueues("queue1"); - - ComputeResourcePolicy computeResourcePolicy2 = new ComputeResourcePolicy(); - computeResourcePolicy2.setComputeResourceId(resourceId2); - computeResourcePolicy2.addToAllowedBatchQueues("cmqueue1"); + ComputeResourcePolicy computeResourcePolicy2 = ComputeResourcePolicy.newBuilder() + .setComputeResourceId(resourceId2) + .addAllowedBatchQueues("cmqueue1") + .build(); List<ComputeResourcePolicy> computeResourcePolicyList = new ArrayList<>(); computeResourcePolicyList.add(computeResourcePolicy); computeResourcePolicyList.add(computeResourcePolicy2); - groupResourceProfile.setComputeResourcePolicies(computeResourcePolicyList); - - BatchQueueResourcePolicy batchQueueResourcePolicy = new BatchQueueResourcePolicy(); - batchQueueResourcePolicy.setComputeResourceId(resourceId1); - batchQueueResourcePolicy.setQueuename("queue1"); - batchQueueResourcePolicy.setMaxAllowedCores(2); - batchQueueResourcePolicy.setMaxAllowedWalltime(10); + BatchQueueResourcePolicy batchQueueResourcePolicy = BatchQueueResourcePolicy.newBuilder() + .setComputeResourceId(resourceId1) + .setQueuename("queue1") + .setMaxAllowedCores(2) + .setMaxAllowedWalltime(10) + .build(); - BatchQueueResourcePolicy batchQueueResourcePolicy2 = new BatchQueueResourcePolicy(); - batchQueueResourcePolicy2.setComputeResourceId(resourceId2); - batchQueueResourcePolicy2.setQueuename("cmqueue1"); - batchQueueResourcePolicy2.setMaxAllowedCores(3); - batchQueueResourcePolicy2.setMaxAllowedWalltime(12); + BatchQueueResourcePolicy batchQueueResourcePolicy2 = BatchQueueResourcePolicy.newBuilder() + .setComputeResourceId(resourceId2) + .setQueuename("cmqueue1") + .setMaxAllowedCores(3) + .setMaxAllowedWalltime(12) + .build(); List<BatchQueueResourcePolicy> batchQueueResourcePolicyList = new ArrayList<>(); batchQueueResourcePolicyList.add(batchQueueResourcePolicy); batchQueueResourcePolicyList.add(batchQueueResourcePolicy2); - groupResourceProfile.setBatchQueueResourcePolicies(batchQueueResourcePolicyList); + GroupResourceProfile groupResourceProfile = GroupResourceProfile.newBuilder() + .setGatewayId(gatewayId) + .setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME") + .setDefaultCredentialStoreToken("test-cred-store-token") + .addAllComputePreferences(groupComputeResourcePreferenceList) + .addAllComputeResourcePolicies(computeResourcePolicyList) + .addAllBatchQueueResourcePolicies(batchQueueResourcePolicyList) + .build(); groupResourceProfileId = groupResourceProfileRepository.addGroupResourceProfile(groupResourceProfile); @@ -200,15 +207,15 @@ public class GroupResourceProfileRepositoryTest extends TestBase { assertTrue(getGroupResourceProfile.getGroupResourceProfileId().equals(groupResourceProfileId)); assertEquals("test-cred-store-token", getGroupResourceProfile.getDefaultCredentialStoreToken()); - assertTrue(getGroupResourceProfile.getComputePreferences().size() == 2); + assertTrue(getGroupResourceProfile.getComputePreferencesList().size() == 2); assertTrue(getGroupResourceProfile.getComputeResourcePoliciesList().size() == 2); - assertTrue(getGroupResourceProfile.getBatchQueueResourcePolicies().size() == 2); + assertTrue(getGroupResourceProfile.getBatchQueueResourcePoliciesList().size() == 2); computeResourcePolicyId1 = getGroupResourceProfile.getComputeResourcePoliciesList().stream() .filter(crp -> crp.getComputeResourceId().equals(resourceId1)) .map(crp -> crp.getResourcePolicyId()) .findFirst() .get(); - batchQueueResourcePolicyId2 = getGroupResourceProfile.getBatchQueueResourcePolicies().stream() + batchQueueResourcePolicyId2 = getGroupResourceProfile.getBatchQueueResourcePoliciesList().stream() .filter(bqrp -> bqrp.getComputeResourceId().equals(resourceId2)) .map(bqrp -> bqrp.getResourcePolicyId()) .findFirst() @@ -239,7 +246,7 @@ public class GroupResourceProfileRepositoryTest extends TestBase { ComputeResourcePolicy getComputeResourcePolicy = groupResourceProfileRepository.getComputeResourcePolicy(computeResourcePolicyId1); - assertTrue(getComputeResourcePolicy.getAllowedBatchQueues().get(0).equals("queue1")); + assertTrue(getComputeResourcePolicy.getAllowedBatchQueuesList().get(0).equals("queue1")); BatchQueueResourcePolicy getBatchQueuePolicy = groupResourceProfileRepository.getBatchQueueResourcePolicy(batchQueueResourcePolicyId2); @@ -272,63 +279,76 @@ public class GroupResourceProfileRepositoryTest extends TestBase { GroupResourceProfile retrievedGroupResourceProfile = groupResourceProfileRepository.getGroupResourceProfile(groupResourceProfileId); GroupComputeResourcePreference retrievedGroupComputeResourcePreference = - retrievedGroupResourceProfile.getComputePreferences().stream() + retrievedGroupResourceProfile.getComputePreferencesList().stream() .filter(pref -> pref.getComputeResourceId().equals(resourceId1)) .findFirst() .get(); - assertNull(retrievedGroupComputeResourcePreference.getResourceSpecificCredentialStoreToken()); - retrievedGroupComputeResourcePreference.setResourceSpecificCredentialStoreToken("abc123"); + assertEquals("", retrievedGroupComputeResourcePreference.getResourceSpecificCredentialStoreToken()); + // Update the preference with a credential token + int prefIndex1 = retrievedGroupResourceProfile.getComputePreferencesList().indexOf(retrievedGroupComputeResourcePreference); + GroupResourceProfile.Builder profileBuilder1 = retrievedGroupResourceProfile.toBuilder(); + profileBuilder1.setComputePreferences(prefIndex1, + retrievedGroupComputeResourcePreference.toBuilder().setResourceSpecificCredentialStoreToken("abc123").build()); + retrievedGroupResourceProfile = profileBuilder1.build(); groupResourceProfileRepository.updateGroupResourceProfile(retrievedGroupResourceProfile); GroupResourceProfile retrievedGroupResourceProfile2 = groupResourceProfileRepository.getGroupResourceProfile(groupResourceProfileId); GroupComputeResourcePreference retrievedGroupComputeResourcePreference2 = - retrievedGroupResourceProfile2.getComputePreferences().stream() + retrievedGroupResourceProfile2.getComputePreferencesList().stream() .filter(pref -> pref.getComputeResourceId().equals(resourceId1)) .findFirst() .get(); assertEquals("abc123", retrievedGroupComputeResourcePreference2.getResourceSpecificCredentialStoreToken()); - retrievedGroupComputeResourcePreference2.setResourceSpecificCredentialStoreToken(null); - assertNull(retrievedGroupComputeResourcePreference2.getResourceSpecificCredentialStoreToken()); + // Clear the credential token + int prefIndex2 = retrievedGroupResourceProfile2.getComputePreferencesList().indexOf(retrievedGroupComputeResourcePreference2); + GroupResourceProfile.Builder profileBuilder2 = retrievedGroupResourceProfile2.toBuilder(); + profileBuilder2.setComputePreferences(prefIndex2, + retrievedGroupComputeResourcePreference2.toBuilder().clearResourceSpecificCredentialStoreToken().build()); + retrievedGroupResourceProfile2 = profileBuilder2.build(); + assertEquals("", retrievedGroupResourceProfile2.getComputePreferencesList().get(prefIndex2).getResourceSpecificCredentialStoreToken()); groupResourceProfileRepository.updateGroupResourceProfile(retrievedGroupResourceProfile2); GroupResourceProfile retrievedGroupResourceProfile3 = groupResourceProfileRepository.getGroupResourceProfile(groupResourceProfileId); GroupComputeResourcePreference retrievedGroupComputeResourcePreference3 = - retrievedGroupResourceProfile3.getComputePreferences().stream() + retrievedGroupResourceProfile3.getComputePreferencesList().stream() .filter(pref -> pref.getComputeResourceId().equals(resourceId1)) .findFirst() .get(); - assertNull(retrievedGroupComputeResourcePreference3.getResourceSpecificCredentialStoreToken()); + assertEquals("", retrievedGroupComputeResourcePreference3.getResourceSpecificCredentialStoreToken()); // Orphan removal test - assertEquals(2, retrievedGroupResourceProfile3.getComputePreferencesSize()); - retrievedGroupResourceProfile3.setComputePreferences( - retrievedGroupResourceProfile3.getComputePreferences().subList(0, 1)); - groupResourceProfileRepository.updateGroupResourceProfile(retrievedGroupResourceProfile3); + assertEquals(2, retrievedGroupResourceProfile3.getComputePreferencesCount()); + GroupResourceProfile updatedProfile3 = retrievedGroupResourceProfile3.toBuilder() + .clearComputePreferences() + .addAllComputePreferences(retrievedGroupResourceProfile3.getComputePreferencesList().subList(0, 1)) + .build(); + groupResourceProfileRepository.updateGroupResourceProfile(updatedProfile3); GroupResourceProfile retrievedGroupResourceProfile4 = groupResourceProfileRepository.getGroupResourceProfile(groupResourceProfileId); - assertEquals(1, retrievedGroupResourceProfile4.getComputePreferencesSize()); + assertEquals(1, retrievedGroupResourceProfile4.getComputePreferencesCount()); groupResourceProfileRepository.removeGroupResourceProfile(groupResourceProfileId); } @Test public void testUpdatingGroupResourceProfileWithoutCreationTime() throws AppCatalogException { - GroupResourceProfile groupResourceProfile = new GroupResourceProfile(); - groupResourceProfile.setGatewayId(gatewayId); - groupResourceProfile.setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME"); - groupResourceProfile.setDefaultCredentialStoreToken("test-cred-store-token"); + GroupResourceProfile groupResourceProfile = GroupResourceProfile.newBuilder() + .setGatewayId(gatewayId) + .setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME") + .setDefaultCredentialStoreToken("test-cred-store-token") + .build(); // Simulate what is like for a client that only gets back the id from // the create operation but not any fields, like creation time, that are // populated by the create operation - GroupResourceProfile cloneGroupResourceProfile = groupResourceProfile.deepCopy(); + GroupResourceProfile cloneGroupResourceProfile = groupResourceProfile.toBuilder().build(); String groupResourceProfileId = groupResourceProfileRepository.addGroupResourceProfile(groupResourceProfile); long creationTime = groupResourceProfileRepository .getGroupResourceProfile(groupResourceProfileId) .getCreationTime(); - cloneGroupResourceProfile.setGroupResourceProfileId(groupResourceProfileId); + cloneGroupResourceProfile = cloneGroupResourceProfile.toBuilder().setGroupResourceProfileId(groupResourceProfileId).build(); groupResourceProfileRepository.updateGroupResourceProfile(cloneGroupResourceProfile); long creationTimeAfterUpdate = groupResourceProfileRepository .getGroupResourceProfile(groupResourceProfileId) @@ -340,29 +360,32 @@ public class GroupResourceProfileRepositoryTest extends TestBase { @Test public void testRemovingReservation() throws AppCatalogException { - GroupResourceProfile groupResourceProfile = new GroupResourceProfile(); - groupResourceProfile.setGatewayId(gatewayId); - groupResourceProfile.setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME"); - - ComputeResourceReservation reservation1 = new ComputeResourceReservation(); - reservation1.setReservationName("test-reservation1"); - reservation1.setStartTime(AiravataUtils.getCurrentTimestamp().getTime()); - reservation1.setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 100000); - reservation1.addToQueueNames(QUEUE1_NAME); - reservation1.addToQueueNames(QUEUE2_NAME); - - ComputeResourceReservation reservation2 = new ComputeResourceReservation(); - reservation2.setReservationName("test-reservation2"); - reservation2.setStartTime(AiravataUtils.getCurrentTimestamp().getTime() + 200000); - reservation2.setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 300000); - reservation2.addToQueueNames(QUEUE1_NAME); - - GroupComputeResourcePreference groupComputeResourcePreference1 = new GroupComputeResourcePreference(); - groupComputeResourcePreference1.setComputeResourceId(resourceId1); + ComputeResourceReservation reservation1 = ComputeResourceReservation.newBuilder() + .setReservationName("test-reservation1") + .setStartTime(AiravataUtils.getCurrentTimestamp().getTime()) + .setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 100000) + .addQueueNames(QUEUE1_NAME) + .addQueueNames(QUEUE2_NAME) + .build(); + + ComputeResourceReservation reservation2 = ComputeResourceReservation.newBuilder() + .setReservationName("test-reservation2") + .setStartTime(AiravataUtils.getCurrentTimestamp().getTime() + 200000) + .setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 300000) + .addQueueNames(QUEUE1_NAME) + .build(); + + GroupComputeResourcePreference groupComputeResourcePreference1 = GroupComputeResourcePreference.newBuilder() + .setComputeResourceId(resourceId1) + .build(); // groupComputeResourcePreference1.addToReservations(reservation1); // groupComputeResourcePreference1.addToReservations(reservation2); - groupResourceProfile.addToComputePreferences(groupComputeResourcePreference1); + GroupResourceProfile groupResourceProfile = GroupResourceProfile.newBuilder() + .setGatewayId(gatewayId) + .setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME") + .addComputePreferences(groupComputeResourcePreference1) + .build(); String groupResourceProfileId = groupResourceProfileRepository.addGroupResourceProfile(groupResourceProfile); @@ -394,29 +417,32 @@ public class GroupResourceProfileRepositoryTest extends TestBase { @Test public void testUpdatingReservation() throws AppCatalogException { - GroupResourceProfile groupResourceProfile = new GroupResourceProfile(); - groupResourceProfile.setGatewayId(gatewayId); - groupResourceProfile.setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME"); - - ComputeResourceReservation reservation1 = new ComputeResourceReservation(); - reservation1.setReservationName("test-reservation1"); - reservation1.setStartTime(AiravataUtils.getCurrentTimestamp().getTime()); - reservation1.setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 100000); - reservation1.addToQueueNames(QUEUE1_NAME); - reservation1.addToQueueNames(QUEUE2_NAME); - - ComputeResourceReservation reservation2 = new ComputeResourceReservation(); - reservation2.setReservationName("test-reservation2"); - reservation2.setStartTime(AiravataUtils.getCurrentTimestamp().getTime() + 200000); - reservation2.setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 300000); - reservation2.addToQueueNames(QUEUE1_NAME); - - GroupComputeResourcePreference groupComputeResourcePreference1 = new GroupComputeResourcePreference(); - groupComputeResourcePreference1.setComputeResourceId(resourceId1); + ComputeResourceReservation reservation1 = ComputeResourceReservation.newBuilder() + .setReservationName("test-reservation1") + .setStartTime(AiravataUtils.getCurrentTimestamp().getTime()) + .setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 100000) + .addQueueNames(QUEUE1_NAME) + .addQueueNames(QUEUE2_NAME) + .build(); + + ComputeResourceReservation reservation2 = ComputeResourceReservation.newBuilder() + .setReservationName("test-reservation2") + .setStartTime(AiravataUtils.getCurrentTimestamp().getTime() + 200000) + .setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 300000) + .addQueueNames(QUEUE1_NAME) + .build(); + + GroupComputeResourcePreference groupComputeResourcePreference1 = GroupComputeResourcePreference.newBuilder() + .setComputeResourceId(resourceId1) + .build(); // groupComputeResourcePreference1.addToReservations(reservation1); // groupComputeResourcePreference1.addToReservations(reservation2); - groupResourceProfile.addToComputePreferences(groupComputeResourcePreference1); + GroupResourceProfile groupResourceProfile = GroupResourceProfile.newBuilder() + .setGatewayId(gatewayId) + .setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME") + .addComputePreferences(groupComputeResourcePreference1) + .build(); String groupResourceProfileId = groupResourceProfileRepository.addGroupResourceProfile(groupResourceProfile); @@ -454,21 +480,23 @@ public class GroupResourceProfileRepositoryTest extends TestBase { @Test public void testAddingQueueToReservation() throws AppCatalogException { - GroupResourceProfile groupResourceProfile = new GroupResourceProfile(); - groupResourceProfile.setGatewayId(gatewayId); - groupResourceProfile.setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME"); - - ComputeResourceReservation reservation1 = new ComputeResourceReservation(); - reservation1.setReservationName("test-reservation1"); - reservation1.setStartTime(AiravataUtils.getCurrentTimestamp().getTime()); - reservation1.setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 100000); - reservation1.addToQueueNames(QUEUE1_NAME); + ComputeResourceReservation reservation1 = ComputeResourceReservation.newBuilder() + .setReservationName("test-reservation1") + .setStartTime(AiravataUtils.getCurrentTimestamp().getTime()) + .setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 100000) + .addQueueNames(QUEUE1_NAME) + .build(); - GroupComputeResourcePreference groupComputeResourcePreference1 = new GroupComputeResourcePreference(); - groupComputeResourcePreference1.setComputeResourceId(resourceId1); + GroupComputeResourcePreference groupComputeResourcePreference1 = GroupComputeResourcePreference.newBuilder() + .setComputeResourceId(resourceId1) + .build(); // groupComputeResourcePreference1.addToReservations(reservation1); - groupResourceProfile.addToComputePreferences(groupComputeResourcePreference1); + GroupResourceProfile groupResourceProfile = GroupResourceProfile.newBuilder() + .setGatewayId(gatewayId) + .setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME") + .addComputePreferences(groupComputeResourcePreference1) + .build(); String groupResourceProfileId = groupResourceProfileRepository.addGroupResourceProfile(groupResourceProfile); @@ -503,22 +531,24 @@ public class GroupResourceProfileRepositoryTest extends TestBase { @Test public void testRemovingQueueFromReservation() throws AppCatalogException { - GroupResourceProfile groupResourceProfile = new GroupResourceProfile(); - groupResourceProfile.setGatewayId(gatewayId); - groupResourceProfile.setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME"); - - ComputeResourceReservation reservation1 = new ComputeResourceReservation(); - reservation1.setReservationName("test-reservation1"); - reservation1.setStartTime(AiravataUtils.getCurrentTimestamp().getTime()); - reservation1.setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 100000); - reservation1.addToQueueNames(QUEUE1_NAME); - reservation1.addToQueueNames(QUEUE2_NAME); - - GroupComputeResourcePreference groupComputeResourcePreference1 = new GroupComputeResourcePreference(); - groupComputeResourcePreference1.setComputeResourceId(resourceId1); + ComputeResourceReservation reservation1 = ComputeResourceReservation.newBuilder() + .setReservationName("test-reservation1") + .setStartTime(AiravataUtils.getCurrentTimestamp().getTime()) + .setEndTime(AiravataUtils.getCurrentTimestamp().getTime() + 100000) + .addQueueNames(QUEUE1_NAME) + .addQueueNames(QUEUE2_NAME) + .build(); + + GroupComputeResourcePreference groupComputeResourcePreference1 = GroupComputeResourcePreference.newBuilder() + .setComputeResourceId(resourceId1) + .build(); // groupComputeResourcePreference1.addToReservations(reservation1); - groupResourceProfile.addToComputePreferences(groupComputeResourcePreference1); + GroupResourceProfile groupResourceProfile = GroupResourceProfile.newBuilder() + .setGatewayId(gatewayId) + .setGroupResourceProfileName("TEST_GROUP_PROFILE_NAME") + .addComputePreferences(groupComputeResourcePreference1) + .build(); String groupResourceProfileId = groupResourceProfileRepository.addGroupResourceProfile(groupResourceProfile);
