perfsonar-dev - perfsonar: r4330 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: config ls plugins test/ls
Subject: perfsonar development work
List archive
perfsonar: r4330 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: config ls plugins test/ls
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4330 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: config ls plugins test/ls
- Date: Mon, 4 Aug 2008 06:35:13 -0400
Author: nina
Date: 2008-08-04 06:35:12 -0400 (Mon, 04 Aug 2008)
New Revision: 4330
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/IpSubnetTester.java
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSDiscoveryQuery.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/GlobalLSTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSDiscoveryTest.java
Log:
final updates for supporting IP subnets
Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
2008-08-04 08:48:46 UTC (rev 4329)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
2008-08-04 10:35:12 UTC (rev 4330)
@@ -1,15 +1,17 @@
-GEANT2,http://stats.geant2.net/perfsonar/RRDMA-access/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
+GEANT2,http://62.40.123.162:8080/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
CARNet,http://perfsonar.CARNet.hr:8080/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
;Cesnet,http://perfmonc.cesnet.cz:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
Cynet,http://leonidas.cynet.ac.cy:8080/perfSONAR-RRD-MA-2.0/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
+FCCN,http://mdm01.fccn.pt:8080/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
GARR,http://srv4.dir.garr.it:8080/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
GRNET,http://gridmachine.admin.grnet.gr:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
INTERNET2,http://rrdma.net.internet2.edu:8080/perfSONAR_PS/services/snmpMA,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
-ISTF-3.0,http://uran.acad.bg:8080/geant2_java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
ISTF-J,http://selena.acad.bg:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
+BREN,http://uran.acad.bg:8180/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
;ISTF-P,http://selena.acad.bg:8090,NMWG2v2_netutil,"",utilization,utilization
MREN,http://perfsonar.cg.ac.yu:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
PIONIER-RRD,http://rrdma.perfsonar.pionier.net.pl:8080/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,,http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
+PIONIER-RRD-Test,http://loco4.man.poznan.pl:8080/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,,http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
RENATER,http://perfsonar.renater.fr:8080/perfSONAR-RRD-MA-2.2/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
SEEREN,http://admin.seeren.org:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
;SURFnet,http://sonar1.amsterdam.surfnet.nl:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
@@ -19,7 +21,6 @@
Fermilab,http://lhcopnmon1-mgm.fnal.gov:8091/perfSONAR_PS/services/snmpMA,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
RedCLARA,http://server2-saopaulo.lan.redclara.net:8085/perfsonar-RRDMA/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
RNP,http://rnp-rrd-ma.gt-med.ufsc.br:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
-APAN-JP,http://nms2.jp.apan.net:8080/perfSONAR_PS/services/snmpMA,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
GEANT,http://radagast.x-win.dfn.de:8090/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated
;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
@@ -39,10 +40,15 @@
;SURFNet_Amsterdam_JRA1,http://192.87.102.210:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
;PSNC_Poznan_JRA1,http://212.191.227.58:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
;UNINet_Tromsoe_JRA1,http://129.242.2.142:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-PIONIER-LS,http://ls.perfsonar.pionier.net.pl:8080/xml-ls/services/LookupService,ls,"",ls,ls
-BREN-LS,http://uran.acad.bg:8080/XML-LS/services/LookupService,ls,"",ls,ls
-GARR-LS,http://perfsonar1.dir.garr.it:8080/xml-ls/,ls,"",ls,ls
-SWITCH-LS,http://ls.sonar.net.switch.ch:8080/xml-ls/services/LookupService,ls,"",ls,ls
+BREN-homeLS,http://uran.acad.bg:8180/xml-ls-home/services/LookupService,hls,"",ls,ls
;REDIRIS-Test-AS,http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService,as,"",as,as
;Telnet-SSH,http://mdm-1.par.fr.geant2.net:8090/geant2-java-sshtelnet-mp/services/TelnetSSH,lg,",lg,lg
-PIONIER-globalLS,http://loco4.man.poznan.pl:8080/xml-ls-global/services/LookupService,gls,"",ls,ls
\ No newline at end of file
+SURFnet core
routers,http://sonar1.amsterdam.surfnet.nl:8080/surfnet_java-flowsa-ma/services/FlowsaMeasurementArchiveService,flowsa,flowsa,flowsa
+GARR-LS,http://perfsonar1.dir.garr.it:8080/xml-ls/,ls,"",ls,ls
+SWITCH-LS,http://ls.sonar.net.switch.ch:8080/xml-ls/services/LookupService,ls,"",ls,ls
+FCCN-LS,http://mdm01.fccn.pt:8080/XML-LS-1.1.1/services/LookupService,ls,"",ls,ls
+PIONIER-LS,http://ls.perfsonar.pionier.net.pl:8080/XML-LS-1.1.1/services/LookupService,ls,"",ls,ls
+PIONIER-homeLS,http://ls.perfsonar.pionier.net.pl:8080/xml-ls/services/LookupService,hls,"",ls,ls
+PIONIER-globalLS,http://loco4.man.poznan.pl:8180/gls/services/LookupService,gls,"",ls,ls
+;SURFNET-homeLS,http://sonar1.amsterdam.surfnet.nl:8080/xml-ls-home/services/LookupService,hls,"",ls,ls
+GN2-homeLS,http://loco4.man.poznan.pl:8180/xml-ls-gn2/services/LookupService,hls,"",ls,ls
\ No newline at end of file
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/IpSubnetTester.java
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSDiscoveryQuery.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSDiscoveryQuery.java
2008-08-04 08:48:46 UTC (rev 4329)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSDiscoveryQuery.java
2008-08-04 10:35:12 UTC (rev 4330)
@@ -103,9 +103,11 @@
"};\n"
};
- protected static String[]xtop = {
+ protected static String[]xtop_namespace = {
"declare namespace
summary=\"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/summarization/2.0/\";\n";,
"declare namespace
nmtl3=\"http://ogf.org/schema/network/topology/l3/20070828/\";\n";,
+ };
+ protected static String[]xtop = {
"<psui:lookupInformation>\n",
"{\n",
"for $m in
/nmwg:store[@type='LSStore']/nmwg:metadata\n",
@@ -143,7 +145,10 @@
public static String getIP(List<String> ip) {
StringBuilder b = new StringBuilder();
- b.append(XPATH_NAMESPACE_DECLARATIONS);
+ b.append(XPATH_NAMESPACE_DECLARATIONS);
+ for (String s :xtop_namespace) b.append(s);
+ for (String s :netmask_func) b.append(s);
+
for (String s :xtop) b.append(s);
if ((ip != null) && (ip.size()>0)) {
@@ -201,8 +206,16 @@
if (data != null) {
boolean found = false;
for (int j=0; j <
topoelements.size();j++)
+ if
(IpSubnetTester.testSubnet(
+
topoelements.get(j).getQuery(IUserData.C_IFADDRESS),
+
data.getResponse(IUserData.C_SUBNETIFADDRESS),
+
data.getResponse(IUserData.C_SUBNETMASK))) {
+ /*
if
(data.getResponse(IUserData.C_IFADDRESS).equals(
topoelements.get(j).getQuery(IUserData.C_IFADDRESS))) {
+
*/
+
data.setQuery(IUserData.C_IFADDRESS,topoelements.get(j).getQuery(IUserData.C_IFADDRESS));
+
data.setResponse(IUserData.C_IFADDRESS,topoelements.get(j).getResponse(IUserData.C_IFADDRESS));
topoelements.get(j).assign(data);
topoelements.get(j).setEndpoint(endpoint);
found
= true;
@@ -234,14 +247,14 @@
String ipaddress =
XML.getTextFrom(address.item(i));
if (data == null) data = new
AbstractUserData();
-
data.setResponse(IUserData.C_IFADDRESS, ipaddress);
+
data.setResponse(IUserData.C_SUBNETIFADDRESS, ipaddress);
//TODO IP version (address
type)
}
if (data != null) {
- NodeList nmask =
((Element)subnet.item(k)).getElementsByTagNameNS(NMTL3_namespace,"netmask");
+ NodeList nmask =
((Element)subnet.item(k)).getElementsByTagNameNS(NMTL3_namespace,IUserData.C_SUBNETMASK);
for (int i=0; i < nmask.getLength();
i++)
if
(nmask.item(i).getNodeType() == Node.ELEMENT_NODE) {
-
data.setResponse("netmask", XML.getTextFrom(nmask.item(i)));
+
data.setResponse(IUserData.C_SUBNETMASK, XML.getTextFrom(nmask.item(i)));
//TODO define
constant for netmask
}
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java
2008-08-04 08:48:46 UTC (rev 4329)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java
2008-08-04 10:35:12 UTC (rev 4330)
@@ -33,6 +33,8 @@
public final static String C_HOSTNAME="hostName";
public final static String C_IFNAME = "ifName";
public final static String C_IFADDRESS = "ifAddress";
+ public final static String C_SUBNETIFADDRESS = "subnetIfAddress";
+ public final static String C_SUBNETMASK = "netmask";
public final static String C_KEY="key";
public final static String C_DATAID="id";
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/GlobalLSTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/GlobalLSTest.java
2008-08-04 08:48:46 UTC (rev 4329)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/GlobalLSTest.java
2008-08-04 10:35:12 UTC (rev 4330)
@@ -14,7 +14,7 @@
*/
public class GlobalLSTest extends LSTest<LSQueryRaw> {
protected void setUp() throws Exception {
- testLS =
"http://loco4.man.poznan.pl:8080/xml-ls-global/services/LookupService";;
+ testLS =
"http://loco4.man.poznan.pl:8080/gls/services/LookupService";;
//testLS =
"http://sonar1.amsterdam.surfnet.nl:8080/xml-ls-home/services/LookupService";;
super.setUp();
};
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSDiscoveryTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSDiscoveryTest.java
2008-08-04 08:48:46 UTC (rev 4329)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSDiscoveryTest.java
2008-08-04 10:35:12 UTC (rev 4330)
@@ -14,7 +14,7 @@
public class LSDiscoveryTest extends LSTest<LSDiscoveryQuery> {
@Override
protected void setUp() throws Exception {
- testLS =
"http://loco4.man.poznan.pl:8080/xml-ls-global/services/LookupService";;
+ testLS =
"http://loco4.man.poznan.pl:8080/gls/services/LookupService";;
super.setUp();
}
@Override
- perfsonar: r4330 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: config ls plugins test/ls, svnlog, 08/04/2008
Archive powered by MHonArc 2.6.16.