perfsonar development work

Author: nemanja.zutic
Date: 2008-12-11 05:44:35 -0500 (Thu, 11 Dec 2008)
New Revision: 4775

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/HoplistRequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
Log:
changes to the circuits tab traceroute requests
now more service endpoints can be used for traceroute

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/HoplistRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/HoplistRequest.java 
2008-12-10 13:28:00 UTC (rev 4774)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/HoplistRequest.java 
2008-12-11 10:44:35 UTC (rev 4775)
@@ -154,6 +154,21 @@
        }
        public void process(IUserData udata, Document response,
                IPerfsonarResponse listener) throws Exception {
+
+//             If you wish to display response in the console uncheck this   
          
+               
+//             Transformer transformer = 
TransformerFactory.newInstance().newTransformer();
+//             transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+//
+//             StreamResult result = new StreamResult(new StringWriter());
+//             DOMSource source = new DOMSource(response);
+//             transformer.transform(source, result);
+//
+//             String xmlString = result.getWriter().toString();
+//             System.out.println(xmlString);
+
+               
+               
                NodeList data;
                Element singleData;
                NodeList commonTimes;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
     2008-12-10 13:28:00 UTC (rev 4774)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
     2008-12-11 10:44:35 UTC (rev 4775)
@@ -23,6 +23,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -35,6 +36,7 @@
 import org.perfsonar.perfsonarui.PerfsonarSchema;
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.ippm.ui.actions.IPPMMetadataKeyRequest;
+import org.perfsonar.perfsonarui.ippm.ui.panels.IPPMPairsTablePanel;
 import org.perfsonar.perfsonarui.ippm.ui.panels.MainPanelIPPM;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
@@ -66,9 +68,12 @@
  */
 public class IPPMPerfsonarModel extends PerfsonarModel {
        protected MAEndpointList hopsEndpoint = null;
+       protected IPPMPairsTablePanel pairsPanel = null;
        
        public MAEndpoint getHopsEndpoint() {
-               return hopsEndpoint.get(0);
+               MAEndpoint hops = hopsEndpoint.get(0);
+               System.out.println("getHopsEndpoint() "+hops.getEndpoint());
+               return hops;
        }
 
        ITimeSetAction timeAction = null;
@@ -141,8 +146,22 @@
 
        @Override
        public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList endpointList) {
-               return new SelectOneEndpointAction(eventTypes, endpointList);
+               return new SelectOneEndpointAction(eventTypes, endpointList){
+                       protected void postAction(){
+                               super.postAction();
+                               List<MAEndpoint> selected = 
(List<MAEndpoint>) getSelectedEndpoints();
+                               Iterator<MAEndpoint> endpoint = 
selected.iterator();
+                               while(endpoint.hasNext()) 
setHoplistService(endpoint.next().getEndpoint());
+                       }
+               };
        }
+       
+       protected void setHoplistService(String ippmService){
+               String parameter = 
"STATUS,"+ippmService+"/STATUS,http://ggf.org/ns/nmwg/tools/hades/traceroute,,http://ggf.org/ns/nmwg/tools/hades/traceroute/aggregated/2.0,http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0";;
+//             System.out.println("Seting hoplist MAEndpoint with parameter 
"+parameter);
+       pairsPanel.setHoplistEndpoint(new MAEndpoint(parameter));
+       }
+       
        @Override
        protected PerfsonarRequestAction createMetadataRequestAction() {
                PerfsonarRequestAction action =  new 
IPPMMetadataKeyRequest(request,(IUserData)userData,
@@ -326,4 +345,8 @@
                
eventTypes.add("http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0";);
                return Collections.umodifiableCopy(eventTypes);
        }
+       
+       public void setPairsPanel(IPPMPairsTablePanel pairsPanel){
+               this.pairsPanel = pairsPanel;
+       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
  2008-12-10 13:28:00 UTC (rev 4774)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
  2008-12-11 10:44:35 UTC (rev 4775)
@@ -166,6 +166,10 @@
                
        }
 
+       public void setHoplistEndpoint(MAEndpoint endpoint){
+               hopsEndpoint = endpoint;
+       }
+       
        protected void setQuery(IUserData pair) {
                model.setSelectedItem(pair);
                query.setQuery(IPPMUserData.IFNAME_SRC, 
pair.getResponse(IPPMUserData.IFNAME_SRC));

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
        2008-12-10 13:28:00 UTC (rev 4774)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
        2008-12-11 10:44:35 UTC (rev 4775)
@@ -91,13 +91,18 @@
 
                //                              MAEndpoint hopsEndpoint = new 
MAEndpoint("GEANT-STATUS,http://radagast.rrze.uni-erlangen.de:3070/services/MA/HADES/STATUS,http://ggf.org/ns/nmwg/tools/hades/traceroute,,http://ggf.org/ns/nmwg/tools/hades/traceroute/aggregated/2.0,http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0";);
 
-               topPanel.add(new 
IPPMPairsTablePanel((IPPMMetaDataList)psModel.getDataList(),
+               IPPMPairsTablePanel pairsPanel = new 
IPPMPairsTablePanel((IPPMMetaDataList)psModel.getDataList(),
                                (IPPMUserData)psModel.getUserData(),
                                
(ITimeSetAction)psModel.getDataRequestAction(),
                                psModel.getHopsEndpoint()
-                               ),BorderLayout.CENTER);
+                               );
+               
+               topPanel.add(pairsPanel,BorderLayout.CENTER);
                topPanel.setPreferredSize(new Dimension(600,300));
                
+               //assigning the pairs panel to model (for changing of the 
hoplist service @ runtime)
+               ((IPPMPerfsonarModel)model).setPairsPanel(pairsPanel);
+               
                psModel.getRequest().addPropertyChangeListener(responsePanel);
                
PSLogger.configureLog4j("/org/perfsonar/perfsonarui/log4.properties");