Added more environment{srvclass}

test/tapegateway_release_tests/CastorTapeTests.pm

@@ -394,7 +394,7 @@ sub cleanup_migrated ()
     for ( my $i =0; $i < scalar (@remote_files); $i++ ) {
 	my %f = %{$remote_files[$i]};
 	if ( $f{type} eq "file" && $f{status} eq "migrated" ) {
-	    `su $environment{username} -c \"STAGE_SVCCLASS=dev stager_rm -M $f{name}\"`;
+	    `su $environment{username} -c \"STAGE_SVCCLASS=$environment{svcclass} stager_rm -M $f{name}\"`;
 	    $remote_files[$i]->{status} = "invalidation requested";
 	    print "t=".elapsed_time()."s. Removed $f{name} (was migrated) from stager.\n";
 	}
@@ -1348,7 +1348,7 @@ sub reinstall_stager_db()
     `nslistclass | grep NAME | awk '{print \$2}' | xargs -i enterFileClass --Name {} --GetFromCns`;
     
     `enterSvcClass --Name default --DiskPools default --DefaultFileSize 10485760 --FailJobsWhenNoSpace yes --NbDrives 1 --TapePool stager_dev03 --MigratorPolicy defaultMigrationPolicy --StreamPolicy streamPolicyAlwaysReturning1`;
-    `enterSvcClass --Name dev --DiskPools extra --DefaultFileSize 10485760 --FailJobsWhenNoSpace yes`;
+    `enterSvcClass --Name $environment{svcclass} --DiskPools extra --DefaultFileSize 10485760 --FailJobsWhenNoSpace yes`;
     `enterSvcClass --Name diskonly --DiskPools extra --ForcedFileClass temp --DefaultFileSize 10485760 --Disk1Behavior yes --FailJobsWhenNoSpace yes`;
     
     `moveDiskServer default $diskServers[0]`;
@@ -1356,13 +1356,13 @@ sub reinstall_stager_db()
     `rmAdminNode -r -R -n $diskServers[0]`;
     `rmAdminNode -r -R -n $diskServers[1]`;
     
-    # Add a tape-pool to dev service-class
+    # Add a tape-pool to $environment{svcclass} service-class
     my $tapePool = get_environment('tapepool');
-    `modifySvcClass --Name dev --AddTapePool $tapePool --MigratorPolicy defaultMigrationPolicy --StreamPolicy streamPolicyAlwaysReturning1`;
+    `modifySvcClass --Name $environment{svcclass} --AddTapePool $tapePool --MigratorPolicy defaultMigrationPolicy --StreamPolicy streamPolicyAlwaysReturning1`;
     
-    # Set the number of drives on the default and dev service-classes to desired number for each
+    # Set the number of drives on the default and $environment{svcclass} service-classes to desired number for each
     `modifySvcClass --Name default --NbDrives 1`;
-    `modifySvcClass --Name dev     --NbDrives 2`;
+    `modifySvcClass --Name $environment{svcclass}     --NbDrives 2`;
 }