Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4689 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui/config org/perfsonar/perfsonarui/ippm org/perfsonar/perfsonarui/ippm/ui/panels org/perfsonar/perfsonarui/test/ippm

Subject: perfsonar development work

List archive

perfsonar: r4689 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui/config org/perfsonar/perfsonarui/ippm org/perfsonar/perfsonarui/ippm/ui/panels org/perfsonar/perfsonarui/test/ippm


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4689 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui/config org/perfsonar/perfsonarui/ippm org/perfsonar/perfsonarui/ippm/ui/panels org/perfsonar/perfsonarui/test/ippm
  • Date: Thu, 6 Nov 2008 08:38:12 -0500
Author: nina
Date: 2008-11-06 08:38:12 -0500 (Thu, 06 Nov 2008)
New Revision: 4689

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/Hoplist-request.xml
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/HoplistPath.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/HoplistRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/PSHoplistDatum.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ippm/HopListRequestTest.java
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf

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
branches/perfsonarui/src/resources.files
Log:
Basis functionality for handling Hades traceroute (Feature 12 from
http://wiki.perfsonar.net/jra1-wiki/index.php/PerfsonarUI_-_New_feature_-_Discuss
). Based on Nemanja Zutic HoplistRequest.java

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
2008-11-05 12:51:54 UTC (rev 4688)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
2008-11-06 13:38:12 UTC (rev 4689)
@@ -25,6 +25,7 @@

;RIPE,http://gandalf.rrze.uni-erlangen.de:8090/gandalf/Hades/perfSONAR/MA,ippm,,ripe,ripe

;MDM,http://radagast.x-win.dfn.de:8090/services/MA/HADES/MDM,ippm,,ippm_aggregated,ippm_aggregated
;RIPE,http://radagast.x-win.dfn.de:8090/services/MA/RIPE,ippm,,ripe,ripe
+GEANT-STATUS,http://radagast.rrze.uni-erlangen.de:3070/services/MA/HADES/STATUS,ippmstatus,,http://ggf.org/ns/nmwg/tools/hades/traceroute/aggregated/2.0,http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0

;ARNES_Ljubljana_JRA1,http://193.2.63.2:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl

;BELNET_Gent_JRA1,http://193.191.172.162:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl

;CARNET_Zagreb_JRA1,http://193.198.229.166:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/Hoplist-request.xml

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/HoplistPath.java

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/HoplistRequest.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
2008-11-05 12:51:54 UTC (rev 4688)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
2008-11-06 13:38:12 UTC (rev 4689)
@@ -63,6 +63,12 @@
*
*/
public class IPPMPerfsonarModel extends PerfsonarModel {
+ protected MAEndpointList hopsEndpoint = null;
+
+ public MAEndpoint getHopsEndpoint() {
+ return hopsEndpoint.get(0);
+ }
+
ITimeSetAction timeAction = null;
public static long timeIntervals[] = { //seconds
24*60*60, //24 hour
@@ -81,6 +87,7 @@
}
public IPPMPerfsonarModel(MAEndpointList endpoints) {
super(endpoints);
+ hopsEndpoint = createHoplistEndpoints();
int enabledEndpoint = -1;
endpointList.setMultipleEndpoints(false);
for (int i=0; i < endpointList.size(); i++) {
@@ -186,6 +193,7 @@
public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) {
IPerfsonarSchema schema =
endpoint.getSchema();
if (schema.equals(IPPMRequest.requestType))
return new IPPMRequest();
+ if
(schema.equals("http://ggf.org/ns/nmwg/tools/hades/traceroute";)) return new
HoplistRequest();
else return null;
}
};
@@ -206,6 +214,26 @@

return ifDataset;
}
+
+ /**
+ * This is a bit of hack; have to be changed when we start using
Lookup Service...
+ * Also , it will not reflect changing the endpoints via the UI.
+ * @return
+ */
+ public MAEndpointList createHoplistEndpoints() {
+
+ ArrayList<IPerfsonarSchema> supported = new
ArrayList<IPerfsonarSchema>();
+
supported.add(PerfsonarSchema.getInstance("http://ggf.org/ns/nmwg/tools/hades/traceroute";));
+
+ MAEndpointList endpoints = new MAEndpointList(new
File("MA.conf"),supported);
+ if (endpoints.size() == 0) {
+ 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";);
+ endpoints.add(hopsEndpoint);
+ }
+ return endpoints;
+ }
+
+
public MAEndpointList createEndpoints() {
MAEndpointList endpoints = new MAEndpointList(new
File("MA.conf"),getSupportedRequests());
if (endpoints.size() == 0) {

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/PSHoplistDatum.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
2008-11-05 12:51:54 UTC (rev 4688)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
2008-11-06 13:38:12 UTC (rev 4689)
@@ -50,6 +50,7 @@
import org.perfsonar.perfsonarui.ippm.IPPMPairsTableModel;
import org.perfsonar.perfsonarui.ippm.IPPMUserData;
import org.perfsonar.perfsonarui.plugins.IUserData;
+import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.ui.actions.ITimeSet;
import org.perfsonar.perfsonarui.ui.actions.ITimeSetAction;
import org.perfsonar.perfsonarui.ui.actions.SetupDataRequestAction;
@@ -71,9 +72,11 @@
protected IPPMUserData query;
protected int cellSize = 16;
protected ITimeSetAction timeAction = null;
+ protected MAEndpoint hopsEndpoint;

- public IPPMPairsTablePanel(IPPMMetaDataList mpoints, IPPMUserData
query, ITimeSetAction action) {
+ public IPPMPairsTablePanel(IPPMMetaDataList mpoints, IPPMUserData
query, ITimeSetAction action, MAEndpoint hopsEndpoint) {
super(new BorderLayout());
+ this.hopsEndpoint = hopsEndpoint;
this.query = query;
mpoints.addObserver(this);
model = new IPPMPairsTableModel(mpoints,query);
@@ -169,7 +172,12 @@
query.setQuery(IPPMUserData.IFNAME_DST,
pair.getResponse(IPPMUserData.IFNAME_DST));
if (timeAction != null) {
pair.makeQueryFromResponse();
- pair.setEndpoint(query.getFirstEndpoint());
+ pair.setEndpoint(null);
+ for (MAEndpoint endpoint:query.getEndpoints())
+ pair.addEndpoint(endpoint);
+
+ pair.addEndpoint(hopsEndpoint);
+
((SetupDataRequestAction)timeAction).setUserData(pair);
timeAction.actionPerformed(null);


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
2008-11-05 12:51:54 UTC (rev 4688)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
2008-11-06 13:38:12 UTC (rev 4689)
@@ -32,6 +32,7 @@
import org.perfsonar.perfsonarui.ippm.IPPMPerfsonarModel;
import org.perfsonar.perfsonarui.ippm.IPPMUserData;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
+import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.ui.PerfsonarModel;
import org.perfsonar.perfsonarui.ui.PluginMainPanel;
import org.perfsonar.perfsonarui.ui.actions.ITimeSet;
@@ -89,9 +90,13 @@
leftP.add(scrollPaneQuery,BorderLayout.SOUTH);
topPanel.add(leftP,BorderLayout.WEST);

+ // 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(),
(IPPMUserData)psModel.getUserData(),
-
(ITimeSetAction)psModel.getDataRequestAction()),BorderLayout.CENTER);
+
(ITimeSetAction)psModel.getDataRequestAction(),
+ psModel.getHopsEndpoint()
+ ),BorderLayout.CENTER);
topPanel.setPreferredSize(new Dimension(600,300));

psModel.getRequest().addPropertyChangeListener(responsePanel);

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ippm/HopListRequestTest.java

Modified: branches/perfsonarui/src/resources.files
===================================================================
--- branches/perfsonarui/src/resources.files 2008-11-05 12:51:54 UTC (rev
4688)
+++ branches/perfsonarui/src/resources.files 2008-11-06 13:38:12 UTC (rev
4689)
@@ -17,6 +17,7 @@
org/perfsonar/perfsonarui/ippm/SetupGeant-template.xml
org/perfsonar/perfsonarui/ippm/SetupGeant-template-mid.xml
org/perfsonar/perfsonarui/ippm/SetupGeant-template-noparams.xml
+org/perfsonar/perfsonarui/ippm/Hoplist-request.xml
org/perfsonar/perfsonarui/ippm/KeyRequestEmpty.xml
org/perfsonar/perfsonarui/flowsa/raw.xml
org/perfsonar/perfsonarui/flowsa/stat.xml


  • perfsonar: r4689 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui/config org/perfsonar/perfsonarui/ippm org/perfsonar/perfsonarui/ippm/ui/panels org/perfsonar/perfsonarui/test/ippm, svnlog, 11/06/2008

Archive powered by MHonArc 2.6.16.

Top of Page