[Swift-commit] r3560 - in usertools/swift/swiftconfig: bin docs etc/apps etc/sites/local-pbs etc/sites/local-pbs-coasters etc/sites/pads-local-pbs etc/sites/pads-remote-pbs-coasters-ssh etc/sites/pads-remote-ssh etc/sites/ssh etc/sites/teraport-local-pbs etc/sites/teraport-local-pbs-coasters etc/sites/teraport-remote-pbs-coasters-ssh etc/sites/teraport-remote-ssh lib/perl
noreply at svn.ci.uchicago.edu
noreply at svn.ci.uchicago.edu
Sat Aug 21 22:35:05 CDT 2010
Author: davidk
Date: 2010-08-21 22:35:05 -0500 (Sat, 21 Aug 2010)
New Revision: 3560
Modified:
usertools/swift/swiftconfig/bin/swiftconfig
usertools/swift/swiftconfig/docs/tutorial.odt
usertools/swift/swiftconfig/docs/tutorial.pdf
usertools/swift/swiftconfig/etc/apps/linux.apps
usertools/swift/swiftconfig/etc/sites/local-pbs-coasters/sites.xml
usertools/swift/swiftconfig/etc/sites/local-pbs/sites.xml
usertools/swift/swiftconfig/etc/sites/pads-local-pbs/sites.xml
usertools/swift/swiftconfig/etc/sites/pads-remote-pbs-coasters-ssh/sites.xml
usertools/swift/swiftconfig/etc/sites/pads-remote-ssh/sites.xml
usertools/swift/swiftconfig/etc/sites/ssh/sites.xml
usertools/swift/swiftconfig/etc/sites/teraport-local-pbs-coasters/sites.xml
usertools/swift/swiftconfig/etc/sites/teraport-local-pbs/sites.xml
usertools/swift/swiftconfig/etc/sites/teraport-remote-pbs-coasters-ssh/sites.xml
usertools/swift/swiftconfig/etc/sites/teraport-remote-ssh/sites.xml
usertools/swift/swiftconfig/lib/perl/SwiftConfig.pm
Log:
Corrected formatting of standard templates
Fixed bug where -copy would still look for a tc file
Confirmation when adding configurations
Modified: usertools/swift/swiftconfig/bin/swiftconfig
===================================================================
--- usertools/swift/swiftconfig/bin/swiftconfig 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/bin/swiftconfig 2010-08-22 03:35:05 UTC (rev 3560)
@@ -101,6 +101,8 @@
if ( $xml_ref->{execution}{provider} eq 'ssh' ) {
add_ssh( $new_sitename, $xml_ref->{execution}{url} );
}
+
+ print "Successfully added $option_template\n";
}
# Remove an entry
@@ -197,10 +199,6 @@
write_file( "$output_directory/sites.xml", $xml_out_ref );
- # Update tc
- my $tc_filename = "$output_directory/tc.data";
- update_tc_hostname( "$tc_filename", $new_config_name );
-
# Add ssh entries as needed
if ( $xml_ref->{execution}{provider} eq 'ssh' ) {
add_ssh( $xml_ref->{handle}, $xml_ref->{execution}{url} );
@@ -224,7 +222,7 @@
my $now = time();
if(-e "$dotswift_directory/apps/$application_set.apps") {
print "Set named $application_set already exists\n";
- return;
+ exit;
}
open(APPFILE, ">$dotswift_directory/apps/$application_set.apps")
|| die "Unable to create file $dotswift_directory/apps/$application_set.apps";
@@ -325,19 +323,18 @@
General operations:
-template sitename Add a configuration based on a template
-remove site Removes a site configuration
- -templates Display all available templates
-edit site Specifies the name of a configuration to edit
-copy site Copies a configuration
- -default Do not prompt for values, always use defaults
+ -defaults Do not prompt for values, always use defaults
-full Edit every available configuration option
-import Import a sites.xml file into swiftconfig
-list Options: templates, configs, or a config
- -apps Edit or create application sets
+ -apps Edit or create application sets
=head1 EXAMPLES
List all templates available for adding
- swiftconfig -templates
+ swiftconfig -list templates
Add a site from template into a working configuration
swiftconfig -template ssh
@@ -351,9 +348,6 @@
Edit application sets
swiftconfig -apps
-List available templates
- swiftconfig -list templates
-
List all configurations
swiftconfig -list configs
Modified: usertools/swift/swiftconfig/docs/tutorial.odt
===================================================================
(Binary files differ)
Modified: usertools/swift/swiftconfig/docs/tutorial.pdf
===================================================================
(Binary files differ)
Modified: usertools/swift/swiftconfig/etc/apps/linux.apps
===================================================================
--- usertools/swift/swiftconfig/etc/apps/linux.apps 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/apps/linux.apps 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,7 +1,7 @@
-SWIFTCONFIGURATION echo /bin/echo INSTALLED INTEL32::LINUX null
-SWIFTCONFIGURATION cat /bin/cat INSTALLED INTEL32::LINUX null
-SWIFTCONFIGURATION ls /bin/ls INSTALLED INTEL32::LINUX null
-SWIFTCONFIGURATION grep /bin/grep INSTALLED INTEL32::LINUX null
-SWIFTCONFIGURATION sort /bin/sort INSTALLED INTEL32::LINUX null
-SWIFTCONFIGURATION paste /bin/paste INSTALLED INTEL32::LINUX null
-SWIFTCONFIGURATION wc /usr/bin/wc INSTALLED INTEL32::LINUX null
+SWIFTCONFIGURATION echo /bin/echo INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="00:05:00"
+SWIFTCONFIGURATION cat /bin/cat INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="00:05:00"
+SWIFTCONFIGURATION ls /bin/ls INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="00:05:00"
+SWIFTCONFIGURATION grep /bin/grep INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="00:05:00"
+SWIFTCONFIGURATION sort /bin/sort INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="00:05:00"
+SWIFTCONFIGURATION paste /bin/paste INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="00:05:00"
+SWIFTCONFIGURATION wc /usr/bin/wc INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="00:05:00"
Modified: usertools/swift/swiftconfig/etc/sites/local-pbs/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/local-pbs/sites.xml 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/sites/local-pbs/sites.xml 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,6 +1,6 @@
- <pool handle="local-pbs">
+<pool handle="local-pbs">
<filesystem provider="local" url="none" />
<execution provider="local" url="none" jobmanager="local:pbs" />
<workdirectory>$HOME/swiftwork</workdirectory>
<profile namespace="karajan" key="jobThrottle">0</profile>
- </pool>
+</pool>
Modified: usertools/swift/swiftconfig/etc/sites/local-pbs-coasters/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/local-pbs-coasters/sites.xml 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/sites/local-pbs-coasters/sites.xml 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,4 +1,4 @@
- <pool handle="local-pbs-coasters">
+<pool handle="local-pbs-coasters">
<filesystem provider="local" url="none" />
<execution provider="coaster" url="none" jobmanager="local:pbs" />
<workdirectory>$HOME/swiftwork</workdirectory>
@@ -10,4 +10,4 @@
<profile namespace="globus" key="queue">short</profile>
<profile namespace="karajan" key="jobThrottle">0.5</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
- </pool>
+</pool>
Modified: usertools/swift/swiftconfig/etc/sites/pads-local-pbs/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/pads-local-pbs/sites.xml 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/sites/pads-local-pbs/sites.xml 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,6 +1,6 @@
- <pool handle="pads-local-pbs">
+<pool handle="pads-local-pbs">
<filesystem provider="local" url="none" />
<execution provider="local" url="none" jobmanager="local:pbs" />
<workdirectory>$HOME/swiftwork</workdirectory>
<profile namespace="karajan" key="jobThrottle">0</profile>
- </pool>
+</pool>
Modified: usertools/swift/swiftconfig/etc/sites/pads-remote-pbs-coasters-ssh/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/pads-remote-pbs-coasters-ssh/sites.xml 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/sites/pads-remote-pbs-coasters-ssh/sites.xml 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,4 +1,4 @@
- <pool handle="pads-remote-pbs-coasters-ssh">
+<pool handle="pads-remote-pbs-coasters-ssh">
<execution provider="coaster" url="login1.pads.ci.uchicago.edu" jobmanager="ssh:pbs" />
<profile namespace="globus" key="maxtime">3000</profile>
<profile namespace="globus" key="workersPerNode">8</profile>
@@ -10,4 +10,4 @@
<profile namespace="karajan" key="initialScore">10000</profile>
<filesystem provider="ssh" url="login1.pads.ci.uchicago.edu"/>
<workdirectory>$HOME/swiftwork</workdirectory>
- </pool>
+</pool>
Modified: usertools/swift/swiftconfig/etc/sites/pads-remote-ssh/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/pads-remote-ssh/sites.xml 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/sites/pads-remote-ssh/sites.xml 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,6 +1,6 @@
- <pool handle="pads-remote-ssh">
+<pool handle="pads-remote-ssh">
<filesystem url="login1.pads.ci.uchicago.edu" provider="ssh"/>
<execution url="login1.pads.ci.uchicago.edu" provider="ssh"/>
<workdirectory >$HOME/swiftwork</workdirectory>
<profile namespace="karajan" key="jobThrottle">0</profile>
- </pool>
+</pool>
Modified: usertools/swift/swiftconfig/etc/sites/ssh/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/ssh/sites.xml 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/sites/ssh/sites.xml 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,6 +1,6 @@
- <pool handle="ssh">
+<pool handle="ssh">
<filesystem provider="ssh" url="login1.pads.ci.uchicago.edu" />
<execution provider="ssh" url="login1.pads.ci.uchicago.edu" />
<workdirectory>$HOME/swiftwork</workdirectory>
<profile namespace="karajan" key="jobThrottle">0</profile>
- </pool>
+</pool>
Modified: usertools/swift/swiftconfig/etc/sites/teraport-local-pbs/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/teraport-local-pbs/sites.xml 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/sites/teraport-local-pbs/sites.xml 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,7 +1,6 @@
- <pool handle="teraport-local-pbs">
+<pool handle="teraport-local-pbs">
<filesystem provider="local" url="none" />
<execution provider="local" url="none" jobmanager="local:pbs" />
<workdirectory>$HOME/swiftwork</workdirectory>
<profile namespace="karajan" key="jobThrottle">0</profile>
- </pool>
-
+</pool>
Modified: usertools/swift/swiftconfig/etc/sites/teraport-local-pbs-coasters/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/teraport-local-pbs-coasters/sites.xml 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/sites/teraport-local-pbs-coasters/sites.xml 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,4 +1,4 @@
- <pool handle="teraport-local-pbs-coasters">
+<pool handle="teraport-local-pbs-coasters">
<filesystem provider="local" url="none" />
<execution provider="coaster" url="none" jobmanager="local:pbs" />
<workdirectory>$HOME/swiftwork</workdirectory>
@@ -10,5 +10,4 @@
<profile namespace="globus" key="queue">short</profile>
<profile namespace="karajan" key="jobThrottle">0.5</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
- </pool>
-
+</pool>
Modified: usertools/swift/swiftconfig/etc/sites/teraport-remote-pbs-coasters-ssh/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/teraport-remote-pbs-coasters-ssh/sites.xml 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/sites/teraport-remote-pbs-coasters-ssh/sites.xml 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,4 +1,4 @@
- <pool handle="teraport-remote-pbs-coasters-ssh">
+<pool handle="teraport-remote-pbs-coasters-ssh">
<execution provider="coaster" url="tp-login2.ci.uchicago.edu" jobmanager="ssh:pbs" />
<profile namespace="globus" key="maxtime">3000</profile>
<profile namespace="globus" key="workersPerNode">8</profile>
@@ -10,4 +10,4 @@
<profile namespace="karajan" key="initialScore">10000</profile>
<filesystem provider="ssh" url="tp-login2.ci.uchicago.edu"/>
<workdirectory>$HOME/swiftwork</workdirectory>
- </pool>
+</pool>
Modified: usertools/swift/swiftconfig/etc/sites/teraport-remote-ssh/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/teraport-remote-ssh/sites.xml 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/etc/sites/teraport-remote-ssh/sites.xml 2010-08-22 03:35:05 UTC (rev 3560)
@@ -1,7 +1,7 @@
- <pool handle="teraport-remote-ssh">
+<pool handle="teraport-remote-ssh">
<filesystem url="tp-login2.ci.uchicago.edu" provider="ssh"/>
<execution url="tp-login2.ci.uchicago.edu" provider="ssh"/>
<workdirectory >$HOME/swiftwork</workdirectory>
<profile namespace="karajan" key="jobThrottle">0</profile>
- </pool>
+</pool>
Modified: usertools/swift/swiftconfig/lib/perl/SwiftConfig.pm
===================================================================
--- usertools/swift/swiftconfig/lib/perl/SwiftConfig.pm 2010-08-21 18:30:42 UTC (rev 3559)
+++ usertools/swift/swiftconfig/lib/perl/SwiftConfig.pm 2010-08-22 03:35:05 UTC (rev 3560)
@@ -460,6 +460,9 @@
close(APPFILE);
my ($site, $name, $path, $status, $platform, $profile);
my $counter=0;
+ my $header = sprintf("\n%-15s %-30s %-35s\n", 'Command Name', 'Path', 'Profile');
+ $header .= sprintf("%-15s %-30s %-35s\n", '------------', '----', '-------');
+ print $header;
foreach(@app_data) {
($site, $name, $path, $status, $platform, $profile) = split(/\s+/);
if($name) {
More information about the Swift-commit
mailing list