Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3033 - in branches/new-structure/trunk/geant2_java-sshtelnet-mp: . ant conf lib/misc samples src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/telnet

Subject: perfsonar development work

List archive

perfsonar: r3033 - in branches/new-structure/trunk/geant2_java-sshtelnet-mp: . ant conf lib/misc samples src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/telnet


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3033 - in branches/new-structure/trunk/geant2_java-sshtelnet-mp: . ant conf lib/misc samples src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/telnet
  • Date: Mon, 12 Nov 2007 05:44:46 -0500
Author: melis
Date: 2007-11-12 05:44:45 -0500 (Mon, 12 Nov 2007)
New Revision: 3033

Added:

branches/new-structure/trunk/geant2_java-sshtelnet-mp/lib/misc/perfsonar-base-ant-1.0.20071008.jar
branches/new-structure/trunk/geant2_java-sshtelnet-mp/samples/
branches/new-structure/trunk/geant2_java-sshtelnet-mp/samples/requests/
Modified:

branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml

branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/const.properties

branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/const.properties.template

branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml

branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/release-targets.xml

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscostatuscommands.txt

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/components.properties

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/components.properties.template

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperbgpcommands.txt

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/service.properties

branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/service.properties.template

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands/ParameterChecker.java

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java

branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
Log:
Updated the SSHTELNET MP to include AuthN, as well as the latest bugfixes
(VTY problem, and Regular Expressions bug)

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
2007-11-12 10:44:45 UTC (rev 3033)
@@ -49,8 +49,8 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20070814/nmwg-1.0.20070814.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20070823/perfsonar-base-1.0.20070823.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20071107/perfsonar-base-1.0.20071107.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

<copy file="${basedir}/conf/eventType-map.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
<copy file="${basedir}/conf/eventType-rules.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml
2007-11-12 10:44:45 UTC (rev 3033)
@@ -29,11 +29,14 @@
<equals arg1="${functionality.register}" arg2="y" />
<antcontrib:then>

- <propertyfile file="${basedir}/conf/service.properties">
+ <propertyfile file="${basedir}/conf/service.properties">
<entry key="service.r.service_type"
value="MP"/>
<entry key="component.registrator.scheduler_component"
value="scheduler"/>
- </propertyfile>
+ <entry key="service.mp.class_name"

value="org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter"/>
+ </propertyfile>
+

+
<replace file="${basedir}/conf/components.properties"

token="#scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"

value="scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
@@ -49,33 +52,39 @@


<target name="set-service-properties">
- <propertyfile file="ant/const.properties">
-
- <entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
- <entry key="service.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
-
- <!-- for LookupInfoRequest message -->
- <entry key="service.r.service_type" value="mp"/>
- <entry key="service.r.service_name" value="${service.name}"/>
- <entry key="service.r.service_version" value="${version}"/>
-
- </propertyfile>
-
<javac srcdir="src" destdir="src" deprecation="yes">
<include
name="org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java"
/>
<classpath refid="classpath"/>
</javac>

- <java
classname="org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator">
- <classpath>
- <pathelement location="conf"/>
- <pathelement path="${java.class.path}"/>
- </classpath>
- <arg value="../conf/service.properties"/>
- </java>
- </target>
+ <java
classname="org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator">
+ <classpath>
+ <pathelement location="conf"/>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
+ <arg value="../conf/service.properties"/>
+ </java>

+ <propertyfile file="${basedir}/conf/service.properties">

+ <entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
+ <entry key="service.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
+
+ <!-- for LookupInfoRequest message -->
+ <entry key="service.r.service_type" value="mp"/>
+ <entry key="service.r.service_name"
value="${service.name}"/>
+ <entry key="service.r.service_version"
value="${version}"/>
+
+ <entry key="service.as.authn_active"
value="on"/>
+ <entry key="service.as.authn_for_msg_types"
value="SetupDataRequest,MetadataKeyRequest"/>
+ <entry key="service.as.point"

value="http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService"/>
+
+ <entry key="service.mp.class_name"
value="org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter"/>
+ </propertyfile>
+
+ </target>
+
+
<!--
===================================================================================
-->
<!-- main target -->


Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/const.properties
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/const.properties
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/const.properties
2007-11-12 10:44:45 UTC (rev 3033)
@@ -1,25 +1,28 @@
-#Wed Sep 05 14:00:19 CEST 2007
-service.r.service_type=mp
-exist.war.file=exist-1.0.1.war
-jarfilename=perfsonar-sshtelnet-mp
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20070814.jar
-service.home=/20070904_NEW/20070904_NEW/webapps
-target.port=8080
-api.windowtitle=perfSONAR
-version=1.2-dev
-deploy.root=JAVA-SSHTELNET-MP-1.2-1.2-dev
-service.log.log4j.config=/20070904_NEW/20070904_NEW/webapps/JAVA-SSHTELNET-MP-1.2-1.2-dev/WEB-INF/classes/perfsonar/conf/log4j.properties
-service.name=JAVA-SSHTELNET-MP-1.2-1.2-dev
-api.bottom=perfSONAR
-exist.war.download.url=http\://www.perfsonar.net/download/dependencies/preinstall_download.php?product\=exist-war&amp;version\=1.0.1
-build=build
-service.sax_parser.config=/20070904_NEW/20070904_NEW/webapps/JAVA-SSHTELNET-MP-1.2-1.2-dev/WEB-INF/classes/perfsonar/conf/objects.config
-api.title=perfSONAR
-tomcat.home=/20070904_NEW/20070904_NEW/apache-tomcat-6.0.7
-api.location=doc/api
-wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
-service.r.service_version=1.2-dev
-service.r.service_name=JAVA-SSHTELNET-MP-1.2
-antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-target.server=127.0.0.1
-wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd
+# $Id$
+# project: perfSONAR
+# author: romradw
+# author: svrstich
+# author: smelis
+
+build=build
+
+target.server=127.0.0.1
+
+service.name=JAVA-SSHTELNET-MP
+
+jarfilename=perfsonar-sshtelnet-mp
+version=1.2.1
+
+exist.war.file=exist-1.0.1.war
+exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1
+
+wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd
+wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
+
+antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20071008.jar
+
+api.location=doc/api
+api.title=perfSONAR
+api.windowtitle=perfSONAR
+api.bottom=perfSONAR
\ No newline at end of file

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2007-11-12 10:44:45 UTC (rev 3033)
@@ -8,10 +8,10 @@

target.server=127.0.0.1

-service.name=JAVA-SSHTELNET-MP-1.2
+service.name=JAVA-SSHTELNET-MP

jarfilename=perfsonar-sshtelnet-mp
-version=1.2-dev
+version=1.2.1

exist.war.file=exist-1.0.1.war

exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1
@@ -20,7 +20,7 @@
wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd

antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20070814.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20071008.jar

api.location=doc/api
api.title=perfSONAR

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
2007-11-12 10:44:45 UTC (rev 3033)
@@ -60,8 +60,8 @@
<artifact:dependencies>

<dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20070823"/>
- <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20070814"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20071107"/>
+ <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>

<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/release-targets.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/release-targets.xml
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/ant/release-targets.xml
2007-11-12 10:44:45 UTC (rev 3033)
@@ -31,7 +31,7 @@


<target name="release"
- depends="release-init,jar">
+ depends="lib,release-init,jar">

<delete dir="tmp"/>
<mkdir dir="tmp/${service.name}-${version}"/>

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt
2007-11-12 10:44:45 UTC (rev 3033)
@@ -1,7 +1,7 @@
-BGP_ROUTE_IPv4@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing table@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+BGP_ROUTE_IPv4@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing table@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
BGP_SUMMARY@@@show ip bgp summary@@@0@@@0@@@cache@@@show status of all BGP
connections@@@---@@@---
BGP_DAMPENED_PATHS@@@show ip bgp dampening
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
-BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbour@@@2@@@2@@@cache@@@show
advertised prefixes from <ip address>@@@<ip address>
advertised-routes@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?
advertised-routes$
-BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbour@@@2@@@2@@@cache@@@show
received prefixes from <ip address>@@@<ip address>
received-routes@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?
received-routes$
+BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbour@@@2@@@2@@@cache@@@show
advertised prefixes from <ip address>@@@<ip address>
advertised-routes@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
advertised-routes$
+BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbour@@@2@@@2@@@cache@@@show
received prefixes from <ip address>@@@<ip address>
received-routes@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
received-routes$
BGP_DAMPENING_FLAP-STATISTICS@@@show ip bgp dampening
flap-statistics@@@0@@@0@@@cache@@@display information about all currently
flapping BGP routes@@@---@@@---
-BGP_MULTICAST_TABLE_IPv4@@@show ip bgp ipv4
multicast@@@1@@@1@@@cache@@@display ipv4 multicast table@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
\ No newline at end of file
+BGP_MULTICAST_TABLE_IPv4@@@show ip bgp ipv4
multicast@@@1@@@1@@@cache@@@display ipv4 multicast table@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
\ No newline at end of file

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt
2007-11-12 10:44:45 UTC (rev 3033)
@@ -1,21 +1,21 @@
IP_ACCESS_LIST@@@show ip access-lists@@@0@@@0@@@cache@@@display ip access
lists@@@---@@@---
IP_INTERFACE@@@show ip interface@@@1@@@1@@@cache@@@display information about
interfaces running IP@@@<interface>@@@---
-IP_MULTICAST_ROUTE@@@show ip mroute@@@1@@@1@@@cache@@@display multicast
forwarding state@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+IP_MULTICAST_ROUTE@@@show ip mroute@@@1@@@1@@@cache@@@display multicast
forwarding state@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
IP_MULTICAST_SDP_SA-CACHE@@@show ip msdp sa-cache@@@1@@@1@@@cache@@@display
(S,G) state learned from MSDP peers@@@<as number>@@@[0-9]*
IP_MULTICAST_SDP_SUM@@@show ip msdp sum@@@0@@@0@@@cache@@@display MSDP peer
status@@@---@@@---
IP_MULTICAST_SDP_COUNT@@@show ip msdp count@@@0@@@0@@@cache@@@display MSDP
counters@@@---@@@---
-IP_MULTICAST_SDP_PEER@@@show ip msdp peer@@@1@@@1@@@cache@@@display detailed
information about an MSDP peer@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_OSPF_DB@@@show ip ospf database external@@@1@@@1@@@cache@@@display the
OSPF database external LSA for <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+IP_MULTICAST_SDP_PEER@@@show ip msdp peer@@@1@@@1@@@cache@@@display detailed
information about an MSDP peer@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_OSPF_DB@@@show ip ospf database external@@@1@@@1@@@cache@@@display the
OSPF database external LSA for <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
IP_PROTOCOLS@@@show ip protocols@@@0@@@0@@@cache@@@display detailed
information about IP protocols currently configured on the router@@@---@@@---
-IP_SHOW_ROUTE@@@show ip route@@@1@@@1@@@cache@@@show the current IP routing
table for <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+IP_SHOW_ROUTE@@@show ip route@@@1@@@1@@@cache@@@show the current IP routing
table for <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
IP_RPF@@@show ip rpf@@@0@@@0@@@cache@@@display RPF information for <ip
address>@@@---@@@---
IP_SAP@@@show ip sap@@@0@@@0@@@cache@@@display the SAP cache@@@---@@@---
IP_SAP_DETAIL@@@show ip sap detail@@@0@@@0@@@cache@@@display the SAP cache
details@@@---@@@---
-IP_PING@@@ping@@@1@@@1@@@cache@@@ping an <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IPv4 path to <ip
address>@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_MULTICAST_TRACEROUTE@@@mtrace@@@1@@@1@@@cache@@@trace the path of a
packet from the specified source interface to the receivers of the multicast
traffics@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+IP_PING@@@ping@@@1@@@1@@@cache@@@ping an <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IPv4 path to <ip
address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_MULTICAST_TRACEROUTE@@@mtrace@@@1@@@1@@@cache@@@trace the path of a
packet from the specified source interface to the receivers of the multicast
traffics@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
IP_SHOW_VRF@@@show ip vrf@@@0@@@0@@@cache@@@display VPN Routing/Forwarding
instance information@@@---@@@---
IP_SHOW_VRF_DETAIL@@@show ip vrf detail@@@0@@@0@@@cache@@@display detailled
VPN Routing/Forwarding instance information@@@---@@@---
IP_SHOW_ROUTE_VRF@@@show ip route vrf@@@1@@@1@@@cache@@@display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)@@@<VPN name>@@@---
-IP_PING_VRF@@@ping vrf@@@1@@@1@@@cache@@@pings an <ip address> that has a
specific VRF@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_TRACEROUTE_VRF@@@trace vrf@@@1@@@1@@@cache@@@displays the path to <ip
address> that has a specific VRF@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
\ No newline at end of file
+IP_PING_VRF@@@ping vrf@@@1@@@1@@@cache@@@pings an <ip address> that has a
specific VRF@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_TRACEROUTE_VRF@@@trace vrf@@@1@@@1@@@cache@@@displays the path to <ip
address> that has a specific VRF@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
\ No newline at end of file

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt
2007-11-12 10:44:45 UTC (rev 3033)
@@ -1,15 +1,15 @@
STATUS_SHOW_ENVIRONMENT@@@show environment@@@0@@@0@@@cache@@@show chassis
environment@@@---@@@---
STATUS_INTERFACE_STATS@@@show interface@@@1@@@1@@@cache@@@show interface
statistics@@@<interface>@@@---
-BGP_ROUTE_IPv4@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing table@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_SHOW_ROUTE@@@show ip route@@@1@@@1@@@cache@@@show the current IP routing
table for <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-STATUS_SHOW_INTERFACE_CONFIGURATION@@@show running
interface@@@1@@@1@@@cache@@@display the interface configuration for
<interface>@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_PING@@@ping@@@1@@@1@@@cache@@@ping an <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IPv4 path to <ip
address>@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+BGP_ROUTE_IPv4@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing table@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_SHOW_ROUTE@@@show ip route@@@1@@@1@@@cache@@@show the current IP routing
table for <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+STATUS_SHOW_INTERFACE_CONFIGURATION@@@show running
interface@@@1@@@1@@@cache@@@display the interface configuration for
<interface>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_PING@@@ping@@@1@@@1@@@cache@@@ping an <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IPv4 path to <ip
address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
IPv6_SHOW_ROUTE@@@show ipv6 route@@@1@@@1@@@cache@@@display IPv6 routing
table entry for <ipv6 address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
IPv6_BGP_TABLE@@@show bgp ipv6@@@1@@@1@@@cache@@@display current BGP table
routing entry for <IPv6 prefix>@@@<IPv6 prefix network/length>@@@---
IPv6_PING@@@ping ipv6@@@1@@@1@@@cache@@@ping an <ipv6 address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@trace ipv6@@@1@@@1@@@cache@@@trace the ipv6 path to <ipv6
address>@@@<ipv6 address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
STATUS_SHOW_MPLS_L2_VC_DETAIL@@@show mpls l2transport vc
detail@@@0@@@0@@@cache@@@display detailed information about Any Transport
over MPLS (AToM) virtual circuits (VCs)@@@---@@@---
IP_SHOW_ROUTE_VRF@@@show ip route vrf@@@1@@@1@@@cache@@@display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)@@@<VPN name>@@@---
-IP_PING_VRF@@@ping vrf@@@1@@@1@@@cache@@@pings an <ip address> that has a
specific VRF@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_TRACEROUTE_VRF@@@trace vrf@@@1@@@1@@@cache@@@displays the path to <ip
address> that has a specific VRF@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
\ No newline at end of file
+IP_PING_VRF@@@ping vrf@@@1@@@1@@@cache@@@pings an <ip address> that has a
specific VRF@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_TRACEROUTE_VRF@@@trace vrf@@@1@@@1@@@cache@@@displays the path to <ip
address> that has a specific VRF@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
\ No newline at end of file

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscostatuscommands.txt
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscostatuscommands.txt
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/ciscostatuscommands.txt
2007-11-12 10:44:45 UTC (rev 3033)
@@ -2,7 +2,7 @@
STATUS_INTERFACE_STATS@@@show interface@@@1@@@1@@@cache@@@show interface
statistics@@@<interface>@@@---
STATUS_INTERFACE_DESCRIPTION@@@show interface
description@@@0@@@0@@@cache@@@show interface descriptions@@@---@@@---
STATUS_SHOW_MODULE@@@show module@@@0@@@0@@@cache@@@display hardware module
status and information@@@---@@@---
-STATUS_SHOW_INTERFACE_CONFIGURATION@@@show running
interface@@@1@@@1@@@cache@@@display the interface configuration for
<interface>@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+STATUS_SHOW_INTERFACE_CONFIGURATION@@@show running
interface@@@1@@@1@@@cache@@@display the interface configuration for
<interface>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
STATUS_SOFTWARE_VERSION@@@show version@@@0@@@0@@@cache@@@show the current
router software version@@@---@@@---
STATUS_SHOW_MPLS_L2_VC@@@show mpls l2transport vc@@@0@@@0@@@cache@@@display
information about Any Transport over MPLS (AToM) virtual circuits
(VCs)@@@---@@@---
STATUS_SHOW_MPLS_L2_VC_DETAIL@@@show mpls l2transport vc
detail@@@0@@@0@@@cache@@@display detailed information about Any Transport
over MPLS (AToM) virtual circuits (VCs)@@@---@@@---

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/components.properties
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/components.properties
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/components.properties
2007-11-12 10:44:45 UTC (rev 3033)
@@ -9,13 +9,13 @@

logger=org.perfsonar.commons.auxiliary.components.logger.log4j.Log4jLoggerComponent

# Simple scheduler
-#scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler
+scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler

# Registration in LS
-#registrator=org.perfsonar.service.commons.registration.LSRegistrationComponent
+registrator=org.perfsonar.service.commons.registration.LSRegistrationComponent

# Authentication
-authn=org.perfsonar.commons.auxiliary.components.authn.wssec.WSSecAuthNComponent
+authn=org.perfsonar.base.auxiliary.components.authn.wssec.WSSecAuthNComponent

#Service specific components
#...

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/components.properties.template
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/components.properties.template
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/components.properties.template
2007-11-12 10:44:45 UTC (rev 3033)
@@ -15,7 +15,7 @@

#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent

# Authentication
-authn=org.perfsonar.commons.auxiliary.components.authn.wssec.WSSecAuthNComponent
+authn=org.perfsonar.base.auxiliary.components.authn.wssec.WSSecAuthNComponent

#Service specific components
#...

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperbgpcommands.txt
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperbgpcommands.txt
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperbgpcommands.txt
2007-11-12 10:44:45 UTC (rev 3033)
@@ -1,6 +1,6 @@
-BGP_ROUTE_IPv4@@@show route protocol bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+BGP_ROUTE_IPv4@@@show route protocol bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
BGP_SUMMARY@@@show bgp summary@@@0@@@0@@@cache@@@show status of all BGP
connections@@@---@@@---
BGP_DAMPENED_PATHS@@@show route protocol bgp damping decayed
detail@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
-BGP_NEIGHBOUR_ADVERTISED@@@show route advertising-protocol
bgp@@@1@@@1@@@cache@@@show advertised prefixes from <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-BGP_NEIGHBOUR_RECEIVED@@@show route receive-protocol
bgp@@@1@@@1@@@cache@@@show received prefixes from <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-BGP_MULTICAST_TABLE_IPv4@@@show route protocol bgp table
inet.2@@@1@@@1@@@cache@@@display ipv4 multicast table@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
\ No newline at end of file
+BGP_NEIGHBOUR_ADVERTISED@@@show route advertising-protocol
bgp@@@1@@@1@@@cache@@@show advertised prefixes from <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+BGP_NEIGHBOUR_RECEIVED@@@show route receive-protocol
bgp@@@1@@@1@@@cache@@@show received prefixes from <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+BGP_MULTICAST_TABLE_IPv4@@@show route protocol bgp table
inet.2@@@1@@@1@@@cache@@@display ipv4 multicast table@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
\ No newline at end of file

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt
2007-11-12 10:44:45 UTC (rev 3033)
@@ -1,19 +1,19 @@
IP_ACCESS_LIST@@@show interfaces filters@@@0@@@0@@@cache@@@display ip access
lists@@@---@@@---
-IP_MULTICAST_ROUTE@@@show multicast route@@@1@@@1@@@cache@@@display
multicast forwarding state@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_MULTICAST_SDP_SA-CACHE@@@show msdp source-active
peer@@@1@@@1@@@cache@@@display (S,G) state learned from MSDP peers@@@<peer ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+IP_MULTICAST_ROUTE@@@show multicast route@@@1@@@1@@@cache@@@display
multicast forwarding state@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_MULTICAST_SDP_SA-CACHE@@@show msdp source-active
peer@@@1@@@1@@@cache@@@display (S,G) state learned from MSDP peers@@@<peer ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
IP_MULTICAST_SDP_SUM@@@show msdp@@@0@@@0@@@cache@@@display MSDP peer
status@@@---@@@---
IP_MULTICAST_SDP_COUNT@@@show msdp statistics@@@0@@@0@@@cache@@@display MSDP
counters@@@---@@@---
-IP_MULTICAST_SDP_PEER@@@show msdp peer@@@2@@@2@@@cache@@@display detailed
information about an MSDP peer@@@<ip address>
detail@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})? detail$
-IP_OSPF_DB@@@show ospf database extern@@@1@@@1@@@cache@@@display the OSPF
database external LSA for <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_SHOW_ROUTE@@@show route@@@1@@@1@@@cache@@@show the current IP routing
table for <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_RPF@@@show multicast rpf@@@1@@@1@@@cache@@@display RPF information for
<ip address>@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+IP_MULTICAST_SDP_PEER@@@show msdp peer@@@2@@@2@@@cache@@@display detailed
information about an MSDP peer@@@<ip address>
detail@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
detail$
+IP_OSPF_DB@@@show ospf database extern@@@1@@@1@@@cache@@@display the OSPF
database external LSA for <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_SHOW_ROUTE@@@show route@@@1@@@1@@@cache@@@show the current IP routing
table for <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_RPF@@@show multicast rpf@@@1@@@1@@@cache@@@display RPF information for
<ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
IP_SAP@@@show multicast sessions@@@0@@@0@@@cache@@@display the SAP
cache@@@---@@@---
IP_SAP_DETAIL@@@show multicast sessions detail@@@0@@@0@@@cache@@@displays
the SAP cache details@@@---@@@---
-IP_PING@@@ping@@@1@@@1@@@cache@@@ping an <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv4 path to <ip
address>@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_TRACEROUTE_MULTICAST@@@mtrace@@@1@@@1@@@cache@@@trace the path of a
packet from the specified source interface to the receivers of the multicast
traffic@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+IP_PING@@@ping@@@4@@@4@@@cache@@@ping an <ip address>@@@<ip address> count 5
rapid@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
count 5 rapid$
+IP_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv4 path to <ip
address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_TRACEROUTE_MULTICAST@@@mtrace@@@1@@@1@@@cache@@@trace the path of a
packet from the specified source interface to the receivers of the multicast
traffic@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
IP_SHOW_VRF@@@show configuration routing-instance@@@1@@@1@@@cache@@@display
VPN Routing/Forwarding instance information@@@<routing-instance name>@@@---
IP_SHOW_VRF_DETAIL@@@show configuration
routing-instance@@@1@@@1@@@cache@@@display detailed VPN Routing/Forwarding
instance information@@@<routing-instance name>@@@---
IP_SHOW_ROUTE_VRF@@@show route table@@@1@@@1@@@cache@@@display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)@@@<routing-instance name>@@@---
-IP_PING_VRF@@@ping@@@3@@@3@@@cache@@@pings an <ip address> that has a
specific VRF@@@<ip address> routing-instance <routing-instance
name>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})? routing-instance .*$
-IP_TRACEROUTE_VRF@@@traceroute@@@3@@@3@@@cache@@@displays the path to <ip
address> that has a specific VRF@@@<ip address> routing-instance
<routing-instance name>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?
routing-instance .*$
\ No newline at end of file
+IP_PING_VRF@@@ping@@@3@@@3@@@cache@@@pings an <ip address> that has a
specific VRF@@@<ip address> routing-instance <routing-instance
name>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
routing-instance .*$
+IP_TRACEROUTE_VRF@@@traceroute@@@3@@@3@@@cache@@@displays the path to <ip
address> that has a specific VRF@@@<ip address> routing-instance
<routing-instance
name>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
routing-instance .*$
\ No newline at end of file

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
2007-11-12 10:44:45 UTC (rev 3033)
@@ -1,15 +1,15 @@
STATUS_INTERFACE_STATS@@@show interfaces@@@1@@@1@@@cache@@@show interface
statistics@@@<interface>@@@---
STATUS_INTERFACE_DESCRIPTION@@@show interfaces
descriptions@@@0@@@0@@@cache@@@show interfaces descriptions@@@---@@@---
-BGP_ROUTE_IPv4@@@show route protocol bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_SHOW_ROUTE@@@show route@@@1@@@1@@@cache@@@show the current IP routing
table for <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+BGP_ROUTE_IPv4@@@show route protocol bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+IP_SHOW_ROUTE@@@show route@@@1@@@1@@@cache@@@show the current IP routing
table for <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
STATUS_SHOW_INTERFACE_CONFIGURATION@@@show configuration
interfaces@@@1@@@1@@@cache@@@display the interface configuration for
<interface>@@@<interface>@@@---
-IP_PING@@@ping@@@1@@@1@@@cache@@@ping an <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-IP_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv4 path to <ip
address>@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+IP_PING@@@ping@@@4@@@4@@@cache@@@ping an <ip address>@@@<ip address> count 5
rapid@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
count 5 rapid$
+IP_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv4 path to <ip
address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
IPv6_SHOW_ROUTE@@@show route table inet6@@@1@@@1@@@cache@@@display IPv6
routing table entry for <ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@description@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
IPv6_PING@@@ping inet6@@@1@@@1@@@cache@@@ping an <ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@traceroute inet6@@@1@@@1@@@cache@@@trace the ipv6 path to
<ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
STATUS_MPLS_L2_VC_DETAIL@@@show l2circuit connections
extensive@@@0@@@0@@@cache@@@display detailled information about Any Transport
over MPLS (AToM) virtual circuits
(VCs)@@@---@---
IP_SHOW_ROUTE_VRF@@@show route table@@@1@@@1@@@cache@@@display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)@@@<routing-instance name>@@@---
-IP_PING_VRF@@@ping@@@3@@@3@@@cache@@@pings an <ip address> that has a
specific VRF@@@<ip address> routing-instance <routing-instance
name>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})? routing-instance .*$
-IP_TRACEROUTE_VRF@@@traceroute@@@3@@@3@@@cache@@@displays the path to <ip
address> that has a specific VRF@@@<ip address> routing-instance
<routing-instance name>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?
routing-instance .*$
\ No newline at end of file
+IP_PING_VRF@@@ping@@@3@@@3@@@cache@@@pings an <ip address> that has a
specific VRF@@@<ip address> routing-instance <routing-instance
name>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
routing-instance .*$
+IP_TRACEROUTE_VRF@@@traceroute@@@3@@@3@@@cache@@@displays the path to <ip
address> that has a specific VRF@@@<ip address> routing-instance
<routing-instance
name>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
routing-instance .*$
\ No newline at end of file

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/service.properties
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/service.properties
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/service.properties
2007-11-12 10:44:45 UTC (rev 3033)
@@ -1,124 +1,15 @@
-#Wed Sep 05 14:01:01 CEST 2007
-component.registrator.interval=30000
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF.description=display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)
-service.mp.cisco.commands.IPv6_TRACEROUTE.caching=10
-service.mp.cisco.commands.IPv6_PING.description=ping an <ipv6 address>
-service.mp.cisco.commands.IP_PING.caching=10
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION=show running
interface
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.regex=^[0-9]+.[0-9]+.[0-9]+.[0-9]+(/[0-9]{1,2})?$
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.minParamCount=1
-service.mp.cisco.commands.IPv6_TRACEROUTE.regex=^([A-Fa-f0-9]{1,4}\:){7}[A-Fa-f0-9](/[0-9]{1,3})?$
-service.mp.cisco.commands.STATUS_SHOW_ENVIRONMENT=show environment
-service.mp.cisco.commands.IP_PING_VRF=ping vrf
-service.r.mp.cisco.username=cisco
-service.r.mp.cisco.port=23
-service.r.mp.cisco.url=10.10.14.4
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.regex=^([A-Fa-f0-9]{1,4}\:){7}[A-Fa-f0-9](/[0-9]{1,3})?$
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.maxParamCount=1
-service.mp.cisco.commands.BGP_ROUTE_IPv4.regex=^[0-9]+.[0-9]+.[0-9]+.[0-9]+(/[0-9]{1,2})?$
-service.mp.cisco.commands.IP_PING_VRF.description=pings an <ip address> that
has a specific VRF
-service.r.organization_name=UGent
-service.mp.cisco.commands.IP_PING_VRF.regex=^[0-9]+.[0-9]+.[0-9]+.[0-9]+(/[0-9]{1,2})?$
-service.mp.cisco.commands.IPv6_TRACEROUTE=trace ipv6
-service.r.ls_url=
-service.mp.cisco.commands.IPv6_BGP_TABLE.syntax=<IPv6 prefix network/length>
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.description=display IPv6 routing
table entry for <ipv6 address>
-service.ls.registration_file=
-service.mp.cisco.commands.IPv6_PING.caching=10
-service.r.mp.cisco.prompt=Cisco2811_1\#
-service.mp.cisco.commands.IPv6_TRACEROUTE.minParamCount=1
-service.mp.cisco.commands.STATUS_INTERFACE_STATS.syntax=<interface>
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.syntax=<ipv6 address>
-service.mp.cisco.commands.IPv6_BGP_TABLE.maxParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.description=display
the interface configuration for <interface>
-service.r.service_description=perfSONAR service
-service.mp.cisco.commands.IPv6_TRACEROUTE.maxParamCount=1
-service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
-service.mp.cisco.commands.BGP_ROUTE_IPv4=show ip bgp
-service.r.service_type=SSH/Telnet MP
-service.mp.cisco.commands.IPv6_BGP_TABLE.minParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_ENVIRONMENT.minParamCount=0
-service.mp.cisco.commands.STATUS_INTERFACE_STATS.minParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_ENVIRONMENT.caching=10
-component.registrator.scheduler_component=scheduler
-service.mp.cisco.commands.BGP_ROUTE_IPv4.minParamCount=1
-service.mp.cisco.commands.IP_PING_VRF.minParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.syntax=<ip
address>
-service.mp.cisco.commands.IPv6_PING=ping ipv6
-service.mp.cisco.commands.IP_PING=ping
-service.r.mp.cisco.rate=1000
-service.mp.cisco.commands.IP_SHOW_ROUTE.caching=10
-service.mp.cisco.commands.STATUS_SHOW_ENVIRONMENT.maxParamCount=0
-service.mp.cisco.commands.STATUS_INTERFACE_STATS.maxParamCount=1
-service.r.service_name=Java SSH Telnet MP
-service.mp.cisco.commands.BGP_ROUTE_IPv4.maxParamCount=1
-service.mp.cisco.commands.IP_PING_VRF.maxParamCount=1
-service.mp.cisco.commands.IP_PING.minParamCount=1
-service.mp.cisco.commands.IP_TRACEROUTE.minParamCount=1
-service.mp.cisco.commands.IPv6_TRACEROUTE.description=trace the ipv6 path to
<ipv6 address>
-service.mp.cisco.commands.IP_SHOW_ROUTE.description=show the current IP
routing table for <ip address>
-service.mp.cisco.commands.IPv6_BGP_TABLE.description=display current BGP
table routing entry for <IPv6 prefix>
-service.mp.cisco.commands.IP_PING.maxParamCount=1
-service.mp.cisco.commands.IP_TRACEROUTE.maxParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_ENVIRONMENT.description=show chassis
environment
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF.syntax=<VPN name>
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF.caching=10
-service.mp.cisco.commands.STATUS_INTERFACE_STATS.description=show interface
statistics
-service.mp.cisco.commands.STATUS_SHOW_MPLS_L2_VC_DETAIL.caching=10
-service.mp.cisco.commands.IP_SHOW_ROUTE=show ip route
-service.mp.cisco.commands.IPv6_PING.regex=^([A-Fa-f0-9]{1,4}\:){7}[A-Fa-f0-9](/[0-9]{1,3})?$
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.caching=10
-service.log.log4j.config=D\:\\temp\\20070201/conf/log4j.properties
-service.mp.cisco.commands.IP_PING.syntax=<ip address>
-service.mp.cisco.commands.IP_PING_VRF.syntax=<ip address>
-service.r.access_point=http\://localhost\:8080/TelnetSSHMP/services/TelnetSSH
-service.mp.cisco.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.CiscoAdapter
-service.mp.cisco.commands.BGP_ROUTE_IPv4.caching=10
-service.mp.cisco.commands.IP_TRACEROUTE.description=trace the IPv4 path to
<ip address>
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.minParamCount=1
-service.mp.cisco.commands.IPv6_PING.syntax=<ipv6 address>
-service.mp.cisco.commands.STATUS_INTERFACE_STATS=show interface
-service.mp.cisco.commands.IP_TRACEROUTE=trace
-service.mp.cisco.commands.IPv6_BGP_TABLE=show bgp ipv6
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.syntax=<ip address>
-service.mp.cisco.commands.IP_TRACEROUTE.syntax=<ip address>
-service.r.mp.cisco.cache=0
-service.mp.cisco.commands.IP_TRACEROUTE.caching=10
-service.mp.devices=cisco
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.maxParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_MPLS_L2_VC_DETAIL.description=display
detailed information about Any Transport over MPLS (AToM) virtual circuits
(VCs)
-
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.caching=10
-service.mp.cisco.commands.STATUS_INTERFACE_STATS.caching=10
-service.mp.cisco.commands.STATUS_SHOW_MPLS_L2_VC_DETAIL=show mpls
l2transport vc detail
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.minParamCount=1
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.description=displays the path to
<ip address> that has a specific VRF
-service.mp.cisco.commands.IP_PING.description=ping an <ip address>
-service.mp.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.maxParamCount=1
-service.mp.cisco.commands.IP_TRACEROUTE_VRF=trace vrf
-service.mp.cisco.commands.IP_TRACEROUTE.regex=^[0-9]+.[0-9]+.[0-9]+.[0-9]+(/[0-9]{1,2})?$
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.caching=10
-service.mp.cisco.commands.IP_SHOW_ROUTE.minParamCount=1
-service.r.type=mp
-service.mp.cisco.commands=STATUS_SHOW_ENVIRONMENT,STATUS_INTERFACE_STATS,BGP_ROUTE_IPv4,IP_SHOW_ROUTE,STATUS_SHOW_INTERFACE_CONFIGURATION,IP_PING,IP_TRACEROUTE,IPv6_SHOW_ROUTE,IPv6_BGP_TABLE,IPv6_PING,IPv6_TRACEROUTE,STATUS_SHOW_MPLS_L2_VC_DETAIL,IP_SHOW_ROUTE_VRF,IP_PING_VRF,IP_TRACEROUTE_VRF
-service.sax_parser.config=D\:\\temp\\20070201/src/objects.config
-service.mp.cisco.commands.IP_SHOW_ROUTE.regex=^[0-9]+.[0-9]+.[0-9]+.[0-9]+(/[0-9]{1,2})?$
-service.mp.cisco.commands.IPv6_PING.minParamCount=1
-service.mp.cisco.commands.BGP_ROUTE_IPv4.syntax=<ip address>
-service.mp.cisco.commands.IP_PING_VRF.caching=10
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF=show ip route vrf
-service.mp.cisco.commands.IP_SHOW_ROUTE.maxParamCount=1
-service.mp.cisco.commands.IPv6_SHOW_ROUTE=show ipv6 route
-service.mp.cisco.commands.STATUS_SHOW_MPLS_L2_VC_DETAIL.minParamCount=0
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.regex=^[0-9]+.[0-9]+.[0-9]+.[0-9]+(/[0-9]{1,2})?$
-service.r.mp.cisco.password=cisco
-service.mp.cisco.commands.IP_SHOW_ROUTE.syntax=<ip address>
-service.mp.cisco.commands.IPv6_PING.maxParamCount=1
-service.mp.cisco.commands.IPv6_BGP_TABLE.caching=10
-service.mp.cisco.commands.STATUS_SHOW_MPLS_L2_VC_DETAIL.maxParamCount=0
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF.minParamCount=1
-service.mp.cisco.commands.IPv6_TRACEROUTE.syntax=<ipv6 address>
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF.maxParamCount=1
-service.mp.cisco.commands.BGP_ROUTE_IPv4.description=show bgp routing table
-service.mp.cisco.commands.IP_PING.regex=^[0-9]+.[0-9]+.[0-9]+.[0-9]+(/[0-9]{1,2})?$
+#This file was created by the ant script.
+#Thu Feb 01 10:28:02 CET 2007
+service.r.type=mp
+component.registrator.interval=30000
+service.r.service_name=Java SSH Telnet MP
+service.r.access_point=http\://localhost\:8080/TelnetSSHMP/services/TelnetSSH
+service.ls.registration_file=
+service.log.log4j.config=D\:\\temp\\20070201/conf/log4j.properties
+service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
+service.mp.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter
+service.r.service_type=SSH/Telnet MP
+service.r.ls_url=
+service.sax_parser.config=D\:\\temp\\20070201/src/objects.config
+service.r.service_description=Java SSH/Telnet MP, perfSONAR project
+component.registrator.scheduler_component=scheduler

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
2007-11-12 10:44:45 UTC (rev 3033)
@@ -3,13 +3,9 @@
service.r.type=mp
component.registrator.interval=30000
service.r.service_name=Java SSH Telnet MP
-service.r.access_point=http\://localhost\:8080/TelnetSSHMP/services/TelnetSSH
service.ls.registration_file=
-service.log.log4j.config=D\:\\temp\\20070201/conf/log4j.properties
service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
-service.mp.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter
service.r.service_type=SSH/Telnet MP
service.r.ls_url=
-service.sax_parser.config=D\:\\temp\\20070201/src/objects.config
service.r.service_description=Java SSH/Telnet MP, perfSONAR project
component.registrator.scheduler_component=scheduler

Added:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/lib/misc/perfsonar-base-ant-1.0.20071008.jar


Property changes on:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/lib/misc/perfsonar-base-ant-1.0.20071008.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -185,6 +185,8 @@
+ command.getParameterString());
String temp2 = manager.executeCommand(" ");

+ manager.disconnect();
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());


Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -184,6 +184,8 @@

String temp2 = manager.executeCommand(" ");

+ manager.disconnect();
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());


Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -145,8 +145,8 @@

String device;
String deviceType;
-
- for (int i=0; i<lines.length; i++){
+ String[] devicesArray = new String[lines.length];
+ for (int i=0; i<lines.length && lines[i] != null;
i++){
//System.out.println(" Writing: Line
"+(i+1)+": "+lines[i]);
//out.write("Line "+(i+1)+":
"+lines[i]+"\n");
tok = new StringTokenizer(lines[i],"%%%");
@@ -155,6 +155,7 @@
deviceInfo = tok.nextToken();
deviceTok = new
StringTokenizer(deviceInfo,"@@@");
device = deviceTok.nextToken();
+ devicesArray[i] = device;
deviceType = deviceTok.nextToken();
if
(deviceType.equalsIgnoreCase("quaggatelnet")) {
out.write("service.mp."+ device
@@ -164,9 +165,10 @@
out.write("service.r.mp." + device +
".prompt=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".rate=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".password=" + deviceTok.nextToken() + "\n");
- out.write("service.r.mp." + device +
"bgp.port=" + deviceTok.nextToken() + "\n");
- out.write("service.r.mp." + device +
"bgp.prompt=" + deviceTok.nextToken() + "\n");
- out.write("service.r.mp." + device +
"bgp.password=" + deviceTok.nextToken() + "\n");
+ out.write("service.r.mp." + device +
".bgp.port=" + deviceTok.nextToken() + "\n");
+ out.write("service.r.mp." + device +
".bgp.prompt=" + deviceTok.nextToken() + "\n");
+ out.write("service.r.mp." + device +
".bgp.password=" + deviceTok.nextToken() + "\n");
+ out.write("service.r.mp." + device +
".cache=0\n");
} else if
(deviceType.equalsIgnoreCase("ciscotelnet")) {
out.write("service.mp."+ device
+
".class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.CiscoAdapter\n");
@@ -176,6 +178,7 @@
out.write("service.r.mp." + device +
".rate=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".username=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".password=" + deviceTok.nextToken() + "\n");
+ out.write("service.r.mp." + device +
".cache=0\n");
} else if
(deviceType.equalsIgnoreCase("ciscossh")) {
out.write("service.mp."+ device
+
".class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.CiscoSshAdapter\n");
@@ -185,6 +188,7 @@
out.write("service.r.mp." + device +
".rate=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".username=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".password=" + deviceTok.nextToken() + "\n");
+ out.write("service.r.mp." + device +
".cache=0\n");
} else if
(deviceType.equalsIgnoreCase("ciscokey")) {
out.write("service.mp."+ device
+
".class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.CiscoKeyAdapter\n");
@@ -194,6 +198,7 @@
out.write("service.r.mp." + device +
".rate=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".username=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".keyUrl=" + deviceTok.nextToken() + "\n");
+ out.write("service.r.mp." + device +
".cache=0\n");
} else if
(deviceType.equalsIgnoreCase("junipertelnet")) {
out.write("service.mp."+ device
+
".class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.JuniperAdapter\n");
@@ -203,6 +208,7 @@
out.write("service.r.mp." + device +
".rate=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".username=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".password=" + deviceTok.nextToken() + "\n");
+ out.write("service.r.mp." + device +
".cache=0\n");
} else if
(deviceType.equalsIgnoreCase("juniperssh")) {
out.write("service.mp."+ device
+
".class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.JuniperSshAdapter\n");
@@ -212,6 +218,7 @@
out.write("service.r.mp." + device +
".rate=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".username=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".password=" + deviceTok.nextToken() + "\n");
+ out.write("service.r.mp." + device +
".cache=0\n");
} else if
(deviceType.equalsIgnoreCase("juniperkey")) {
out.write("service.mp."+ device
+
".class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.JuniperKeyAdapter\n");
@@ -221,6 +228,7 @@
out.write("service.r.mp." + device +
".rate=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".username=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".keyUrl=" + deviceTok.nextToken() + "\n");
+ out.write("service.r.mp." + device +
".cache=0\n");

} else {
System.out.println("There was an
unknown device type in the csv file: "+deviceType);
@@ -241,7 +249,13 @@
//Then use this temporary file for writing
all command info
addSelectedCommandsToConfig(device,
outputFile, tempFile.toString());
}
-
+
+ out.write("service.mp.devices=");
+ String tmp = "";
+ for (int i=0; i<devicesArray.length &&
devicesArray[i] != null ; i++){
+ tmp += devicesArray[i]+",";
+ }
+ out.write(tmp.substring(0,tmp.length()-1));
out.close();
} catch (IOException e) {
e.printStackTrace();

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands/ParameterChecker.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands/ParameterChecker.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands/ParameterChecker.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -36,8 +36,8 @@
public boolean checkParam(String subject, String eventTypeString,
String parameter) {

+

-
try {
Class c =
Class.forName("org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands."+subject+"Checker");
return
((Boolean)c.getDeclaredMethods()[0].invoke(c.newInstance(), new Object[]
{subject, eventTypeString, parameter})).booleanValue();
@@ -57,28 +57,30 @@
properties =
(PropertiesConfigurationComponent)AuxiliaryComponentManager.
getInstance().getComponent(ComponentNames.CONFIG);

-
- StringTokenizer disjunct = new
StringTokenizer(properties.getProperty("service.mp."+subject+".commands."+eventTypeString+".regex"),
"#");
+ String regularExpressions =
properties.getProperty("service.mp."+subject+".commands."+eventTypeString+".regex");
+ System.out.println("Regular Expressions for command "
+ eventTypeString + ": "+regularExpressions);
+ StringTokenizer disjunct = new
StringTokenizer(regularExpressions, "#");

while (disjunct.hasMoreTokens() && !ok) {

String disjunctToken = disjunct.nextToken();
- StringTokenizer tokenizer = new
StringTokenizer (disjunctToken, ","); // get property
+ StringTokenizer tokenizer = new
StringTokenizer (disjunctToken, ";"); // get property

ok = true;
while (tokenizer.hasMoreTokens() && ok) {
String token = tokenizer.nextToken();

- // System.out.println("pattern: " +
token);
- // System.out.println("parameter: " +
parameter);
+ System.out.println("pattern: " +
token);
+ System.out.println("parameter: " +
parameter);

Pattern pattern =
Pattern.compile(token);
Matcher matcher =
pattern.matcher(parameter);
ok = matcher.find();
- // System.out.println("OK: " + ok);
+ System.out.println("OK: " + ok);
}
}
} catch (PerfSONARException e1) {
+ e1.printStackTrace();
}

return ok;

Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -184,6 +184,8 @@
String temp2 = manager.executeCommand(" ");
// System.err.println("temp2: " + temp2);

+ manager.disconnect();
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());


Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -184,6 +184,8 @@
String temp2 = manager.executeCommand(" ");
System.err.println("temp2: " + temp2);

+ manager.disconnect();
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());


Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -185,6 +185,8 @@
+ command.getParameterString());
String temp2 = manager.executeCommand(" ");

+ manager.disconnect();
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());


Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -183,6 +183,8 @@
+ command.getParameterString());
String temp2 = manager.executeCommand(" ");

+ manager.disconnect();
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());


Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -189,6 +189,8 @@
String temp2 =
manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());

+ manager.disconnect();
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());


Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -189,6 +189,8 @@
String temp2 =
manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());

+ manager.disconnect();
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());


Modified:
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
===================================================================
---
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
2007-11-11 19:30:22 UTC (rev 3032)
+++
branches/new-structure/trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
2007-11-12 10:44:45 UTC (rev 3033)
@@ -180,6 +180,9 @@

String temp;
temp = telnet.send(command);
+
+
+ //telnet.disconnect();
return temp;

} catch (IOException e) {


  • perfsonar: r3033 - in branches/new-structure/trunk/geant2_java-sshtelnet-mp: . ant conf lib/misc samples src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/telnet, svnlog, 11/12/2007

Archive powered by MHonArc 2.6.16.

Top of Page