perfsonar development work

Author: nina
Date: 2008-05-31 08:19:14 -0400 (Sat, 31 May 2008)
New Revision: 3932

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSTest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
Log:
Introduced a new command line option

 -m,--mds <URL>                        URL of Metadata Service, used to
                                       retrieve the list of Identity 
Providers, default http://mds.rediris.es:8080
in relation to Bug 461
https://bugzilla.perfsonar.net/show_bug.cgi?id=461



Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java 
      2008-05-31 06:42:00 UTC (rev 3931)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java 
      2008-05-31 12:19:14 UTC (rev 3932)
@@ -52,7 +52,7 @@
        private static final String 
elementOrganizationURL="md:OrganizationURL";
        */
        
-       protected String mds_url="http://mds.rediris.es:8080";;
+       protected String mds_url=null;
        protected boolean aa_enabled = false;
        protected ICredentialsListener credentialsListener = null;
        public AAPerfsonarRequest() {
@@ -61,6 +61,7 @@
        }
        @Override
        public SOAPEnvelope prepareEnvelope(SOAPBodyElement soapbodyelement) 
throws PSException {
+               MAEndpoint mds = new 
MAEndpoint("MDS,"+mds_url+",,,,mds,mds");          
                try {
                        if (!isAAEnabled()) return null;
                        
@@ -68,7 +69,7 @@
                                credentialsListener = new 
SwingCredentialListener();
                        }
                        
-                       MAEndpoint mds = new 
MAEndpoint("MDS,"+mds_url+",,,,mds,mds");
+
                        List<CAInterface> idproviders = 
queryMDS(mds.getEndpoint());
                        if (idproviders.size() == 0) throw new 
PSException(mds,"No CA online");
                        
@@ -100,7 +101,7 @@
                                return envelope;
                        } else return null;
                } catch (Exception x) {
-                       throw new PSException(null,x);
+                       throw new PSException(mds,x);
                }
        }
        public SASLCAClient querySASL(String username, String userpass, 
String saslhost, int saslport) throws PerfSONARException {      

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSTest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSTest.java    
  2008-05-31 06:42:00 UTC (rev 3931)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSTest.java    
  2008-05-31 12:19:14 UTC (rev 3932)
@@ -6,9 +6,9 @@
 
 public abstract class LSTest<Q extends LSXQuery> extends TestCase {
        //protected String testLS = 
"http://sonar1.amsterdam.surfnet.nl:8080/xml-ls/services/LookupService";; 
-       //protected String testLS = 
"PIONIER-LS,http://ls.perfsonar.pionier.net.pl:8080/xml-ls/services/LookupService,ls,,ls,ls";;
+       protected String testLS = 
"PIONIER-LS,http://ls.perfsonar.pionier.net.pl:8080/xml-ls/services/LookupService,ls,,ls,ls";;
        
//http://sonar1.amsterdam.surfnet.nl:8080/xml-ls/services/LookupService
-       protected String testLS = 
"BREN-LS,http://uran.acad.bg:8080/XML-LS/services/LookupService,ls,,ls,ls";;
+       //protected String testLS = 
"BREN-LS,http://uran.acad.bg:8080/XML-LS/services/LookupService,ls,,ls,ls";;
        //protected String testLS = 
"ISTF-LS,http://selena.acad.bg:8070/axis/services/LookupService,ls,,ls,ls";;
        protected Q query;
        @Override

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2008-05-31 06:42:00 UTC (rev 3931)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2008-05-31 12:19:14 UTC (rev 3932)
@@ -47,6 +47,7 @@
 import org.perfsonar.perfsonarui.PSLogger;
 import org.perfsonar.perfsonarui.ResponseData;
 import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.aa.IAACapable;
 import org.perfsonar.perfsonarui.ls.LSManager;
 import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
@@ -408,6 +409,12 @@
                             .withDescription("URL for MA.conf, default 
http://http://perfsonar.acad.bg/MA.conf";)
                                                .create( "e" );
         
+       Option mds   = OptionBuilder.withLongOpt("mds")
+        .hasArg()
+        .withArgName("URL")
+        .withDescription("URL of Metadata Service, used to retrieve the list 
of Identity Providers, default  http://mds.rediris.es:8080";)
+        .create( "m" );
+       
        Option aggregate   = OptionBuilder.withLongOpt("aggregate")
         .hasArg()
         .withArgName("number_of_requests")
@@ -449,6 +456,7 @@
         .create( "h" );        
        
        options.addOption(endpoints);
+       options.addOption(mds);
        options.addOption(aggregate);
        options.addOption(parallel);
        options.addOption(timeout);
@@ -537,6 +545,12 @@
            } catch (Exception x) {
                logger.error(x);
            }
+           String mds = "http://mds.rediris.es:8080";;
+           if( line.hasOption( 'm' ) ) {
+               mds = line.getOptionValue( 'm' );
+           }
+       if (getRequest() instanceof IAACapable)
+               ((IAACapable) getRequest()).setMDS(mds);
            
            int maxDataEntries = 8;
            if( line.hasOption( "a" ) ) {