Chronological Thread 

< Chronological >      < Thread >

---

Author: melis
Date: 2008-06-18 09:52:58 -0400 (Wed, 18 Jun 2008)
New Revision: 4021

Added:

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/SSHTELNET_configurator.sh

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/sshtelnetmptemplate.csv

branches/geant2_java-sshtelnet-mp-RELEASE/doc/commands/commands-complete-list-v6-AI.xls

branches/geant2_java-sshtelnet-mp-RELEASE/doc/commands/commands-minimum-list-v6-SM.xls
branches/geant2_java-sshtelnet-mp-RELEASE/doc/sshtelnetsample.xml
Removed:

branches/geant2_java-sshtelnet-mp-RELEASE/doc/commands/commands-complete-list-v5-SM.xls

branches/geant2_java-sshtelnet-mp-RELEASE/doc/commands/commands_minimum_set-v5-SM.xls
Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
branches/geant2_java-sshtelnet-mp-RELEASE/conf/CSVgenerator.pl

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscobgpcommands.txt
branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipcommands.txt
branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipv6commands.txt
branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscominimumpackage.txt
branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperipcommands.txt
branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperipv6commands.txt
branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperminimumpackage.txt
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/CSVgenerator.pl

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscobgpcommands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipcommands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipv6commands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperminimumpackage.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscobgpcommands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipcommands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipv6commands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperminimumpackage.txt
branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt

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

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java

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

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java

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

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java

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

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommand.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommandInterface.java

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

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java

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

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6Command.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6CommandInterface.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
Log:
and the RELEASE Branch as well

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
2008-06-18 13:52:58 UTC (rev 4021)
@@ -11,7 +11,7 @@
service.name=geant2-java-sshtelnet-mp

jarfilename=perfsonar-sshtelnet-mp
-version=1.3.2
+version=1.3.3

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

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
2008-06-18 13:52:58 UTC (rev 4021)
@@ -11,7 +11,7 @@
service.name=geant2-java-sshtelnet-mp

jarfilename=perfsonar-sshtelnet-mp
-version=1.3.2
+version=1.3.3

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

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/CSVgenerator.pl
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/CSVgenerator.pl
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/CSVgenerator.pl
2008-06-18 13:52:58 UTC (rev 4021)
@@ -41,6 +41,6 @@
{
chomp($line);
($device, $url, $prompt) = split(/,/, $line);
- print
"$device\@\@\@$type\@\@\@$url\@\@\@$port\@\@\@$prompt\@\@\@$rate\@\@\@$username\@\@\@$password\%\%\%";
+ print
"$device\@\@\@$type\@\@\@$url\@\@\@$port\@\@\@$prompt\@\@\@$rate\@\@\@$username\@\@\@$password\@\@\@0\@\@\@0\%\%\%";
print "$ciscoconfig\n";
}

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
2008-06-18 13:52:58 UTC (rev 4021)
@@ -55,6 +55,10 @@
# Description=Type of service
service.r.type=mp

+# Group=Internal
+# Description=The path where the temporary token files will be stored (be
sure to make the path writable!)
+service.mp.tokenPath=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/
+
#LS properties
#-------------

@@ -80,7 +84,7 @@

# Group=LS
# Description=The version of the service
-service.r.service_version=1.3.2
+service.r.service_version=1.3.3

# Group=LS
# Description=The e-mail address of the contact person for the service

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
2008-06-18 13:52:58 UTC (rev 4021)
@@ -4,7 +4,7 @@
<nmwg:subject id="subject0">dummy</nmwg:subject>
<nmwg:parameters id="metaParams0">
<nmwg:parameter name="class_name"
value="org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.CiscoAdapter"
/>
- <nmwg:parameter name="url" value="0.0.0.0" />
+ <nmwg:parameter name="url"
value="dummyrouter.geant2.net" />
<nmwg:parameter name="port" value="0" />
<nmwg:parameter name="prompt" value="dummyrouter&gt;"
/>
<nmwg:parameter name="rate" value="100" />
@@ -39,72 +39,6 @@
</nmwg:parameters>
</nmwg:key>
<nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/STATUS_INTERFACE_DESCRIPTION/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show
interface description" />
- <nmwg:parameter name="minParamCount"
value="0" />
- <nmwg:parameter name="maxParamCount"
value="0" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="show interface descriptions" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_INTERFACE_ADDRESS/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show ip
interface brief" />
- <nmwg:parameter name="minParamCount"
value="0" />
- <nmwg:parameter name="maxParamCount"
value="0" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="display interface addresses" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_BGP_ROUTE/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show ip
bgp" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="show bgp routing table" />
- <nmwg:parameter name="syntax"
value="&lt;prefix&gt; [&lt;length&gt;]" />
- <nmwg:parameter name="regex" value=".*" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_BGP_SUMMARY/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show ip
bgp summary" />
- <nmwg:parameter name="minParamCount"
value="0" />
- <nmwg:parameter name="maxParamCount"
value="0" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="show status of all BGP connections" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_BGP_NEIGHBOUR_ADVERTISED/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show ip
bgp neighbor" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="show advertised prefixes from &lt;ip address&gt;" />
- <nmwg:parameter name="syntax" value="&lt;ip
address&gt; advertised-routes" />
- <nmwg:parameter name="regex"
value="^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?
advertised-routes$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_BGP_NEIGHBOUR_RECEIVED/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show ip
bgp neighbor" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="show receivede prefixes from &lt;ip address&gt;" />
- <nmwg:parameter name="syntax" value="&lt;ip
address&gt; received-routes" />
- <nmwg:parameter name="regex"
value="^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?
received-routes$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>

<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_PING/1.0</nmwg:eventType>
<nmwg:parameters id="params0">
<nmwg:parameter name="command" value="ping" />
@@ -117,18 +51,6 @@
</nmwg:parameters>
</nmwg:key>
<nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_TRACEROUTE/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="trace"
/>
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="trace the IP path to &lt;ip address&gt;" />
- <nmwg:parameter name="syntax" value="&lt;ip
address&gt;" />
- <nmwg:parameter name="regex"
value="^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>

<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_ROUTE/1.0</nmwg:eventType>
<nmwg:parameters id="params0">
<nmwg:parameter name="command" value="show ip
route" />
@@ -141,190 +63,47 @@
</nmwg:parameters>
</nmwg:key>
<nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_MULTICAST_BGP_TABLE/1.0</nmwg:eventType>
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_MPLS_VRF_TRACEROUTE/1.0</nmwg:eventType>
<nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show ip
bgp IP multicast" />
+ <nmwg:parameter name="command" value="trace
vrf" />
<nmwg:parameter name="minParamCount"
value="1" />
<nmwg:parameter name="maxParamCount"
value="1" />
<nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="display IP multicast table" />
- <nmwg:parameter name="syntax"
value="&lt;prefix&gt; [&lt;length&gt;]" />
- <nmwg:parameter name="regex" value=".*" />
+ <nmwg:parameter name="description"
value="displays the path to &lt;ip address&gt; that has a specific VRF" />
+ <nmwg:parameter name="syntax" value="&lt;VPN
name&gt; &lt;ip address&gt;" />
+ <nmwg:parameter name="regex" value="^.*
[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$" />
</nmwg:parameters>
</nmwg:key>
+ </nmwg:data>
+ <nmwg:metadata id="metadata1">
+ <nmwg:subject id="subject0">dummyTestRouter2</nmwg:subject>
+ <nmwg:parameters id="metaParams0">
+ <nmwg:parameter name="class_name"
value="org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.JuniperSshAdapter"
/>
+ <nmwg:parameter name="url"
value="dummyrouter2.par.fr.geant2.net" />
+ <nmwg:parameter name="port" value="22" />
+ <nmwg:parameter name="prompt"
value="dummyrouter2&gt;" />
+ <nmwg:parameter name="rate" value="100" />
+ <nmwg:parameter name="username" value="dummy" />
+ <nmwg:parameter name="password"
value="8AFJp5vZThQaZs/n4coLNw==" />
+ <nmwg:parameter name="timeout" value="0" />
+ <nmwg:parameter name="numberOfUsers" value="0" />
+ <nmwg:parameter name="cache" value="0" />
+ </nmwg:parameters>
+ </nmwg:metadata>
+ <nmwg:data id="data1" metadataIdRef="metadata1">
<nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_MULTICAST_ROUTE/1.0</nmwg:eventType>
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_PING/1.0</nmwg:eventType>
<nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show ip
mroute" />
+ <nmwg:parameter name="command" value="ping" />
<nmwg:parameter name="minParamCount"
value="1" />
<nmwg:parameter name="maxParamCount"
value="1" />
<nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="display multicast forwarding state" />
+ <nmwg:parameter name="description"
value="ping an &lt;ip address&gt;" />
<nmwg:parameter name="syntax" value="&lt;ip
address&gt;" />
<nmwg:parameter name="regex"
value="^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$" />
</nmwg:parameters>
</nmwg:key>
<nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_MULTICAST_SDP_SUM/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show ip
msdp sum" />
- <nmwg:parameter name="minParamCount"
value="0" />
- <nmwg:parameter name="maxParamCount"
value="0" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="display MSDP peer status" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_MULTICAST_TRACEROUTE/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="mtrace"
/>
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="trace the path of a packet from the specified source interface to the
receivers of the multicast traffic" />
- <nmwg:parameter name="syntax" value="&lt;ip
address&gt;" />
- <nmwg:parameter name="regex"
value="^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IPv6_INTERFACE_ADDRESS/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show
IPv6 interface brief" />
- <nmwg:parameter name="minParamCount"
value="0" />
- <nmwg:parameter name="maxParamCount"
value="0" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="display interface IPv6 addresses" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IPv6_BGP_TABLE/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show
bgp IPv6 unicast" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="display current BGP table routing entry for &lt;IPv6 prefix&gt;" />
- <nmwg:parameter name="syntax" value="&lt;IPv6
prefix network&gt; [&lt;length&gt;]" />
- <nmwg:parameter name="regex" value=".*" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IPv6_BGP_SUMMARY/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show
bgp ipv6 unicast" />
- <nmwg:parameter name="minParamCount"
value="0" />
- <nmwg:parameter name="maxParamCount"
value="0" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="display the status of all current IPv6 BGP connections" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IPv6_BGP_NEIGHBOUR_ADVERTISED/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show
bgp IPv6 unicast neighors" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="show advertised prefixes from &lt;IPv6 address&gt;" />
- <nmwg:parameter name="syntax" value="&lt;peer
IPv6 address&gt;" />
- <nmwg:parameter name="regex"
value="^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?
advertised-routes$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IPv6_BGP_NEIGHBOUR_RECEIVED/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show
bgp IPv6 unicast neighbors" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="show received prefixes from &lt;IPv6 address&gt;" />
- <nmwg:parameter name="syntax" value="&lt;peer
IPv6 address&gt;" />
- <nmwg:parameter name="regex"
value="^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})? received
routes$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IPv6_PING/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="ping
IPv6" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="Ping an &lt;IPv6 address&gt;" />
- <nmwg:parameter name="syntax" value="&lt;IPv6
address&gt;" />
- <nmwg:parameter name="regex"
value="^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IPv6_TRACEROUTE/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="trace"
/>
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="trace the IPv6 path to &lt;IPv6 address&gt;" />
- <nmwg:parameter name="syntax" value="&lt;IPv6
address&gt;" />
- <nmwg:parameter name="regex"
value="^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IPv6_ROUTE/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show
IPv6 route" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="display IPv6 routing table entry for &lt;IPv6 address&gt;" />
- <nmwg:parameter name="syntax"
value="[&lt;IPv6 address&gt;]" />
- <nmwg:parameter name="regex"
value="^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IPv6_MULTICAST_ROUTE/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show
IPv6 mroute" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="display multicast IPv6 forwarding state" />
- <nmwg:parameter name="syntax" value="&lt;IPv6
address&gt;" />
- <nmwg:parameter name="regex"
value="^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_MPLS_VRF_LIST/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show ip
vrf brief" />
- <nmwg:parameter name="minParamCount"
value="0" />
- <nmwg:parameter name="maxParamCount"
value="0" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="list the Virtual Private Network (VPN) routing/forwarding instance
(VRF)" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_MPLS_VRF_ROUTE/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="show ip
route vrf" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="display the IP routing table associated with a Virtual Private Network
(VPN) routing/forwarding instance (VRF)" />
- <nmwg:parameter name="syntax"
value="&lt;routing-instance name&gt;" />
- <nmwg:parameter name="regex" value=".*" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_MPLS_VRF_PING/1.0</nmwg:eventType>
- <nmwg:parameters id="params0">
- <nmwg:parameter name="command" value="ping
vrf" />
- <nmwg:parameter name="minParamCount"
value="1" />
- <nmwg:parameter name="maxParamCount"
value="1" />
- <nmwg:parameter name="caching" value="0" />
- <nmwg:parameter name="description"
value="pings an &lt;ip address&gt; that has a specific VRF" />
- <nmwg:parameter name="syntax" value="&lt;VPN
name&gt; &lt;ip address&gt;" />
- <nmwg:parameter name="regex" value="^.*
[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$" />
- </nmwg:parameters>
- </nmwg:key>
- <nmwg:key>

<nmwg:eventType>http://schemas.perfsonar.net/tools/sshtelnet/IP_MPLS_VRF_TRACEROUTE/1.0</nmwg:eventType>
<nmwg:parameters id="params0">
<nmwg:parameter name="command" value="trace
vrf" />

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscobgpcommands.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscobgpcommands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscobgpcommands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -1,6 +1,6 @@
IP_BGP_ROUTE@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<prefix> [<length>]@@@.*
IP_BGP_SUMMARY@@@show ip bgp summary@@@0@@@0@@@cache@@@show status of all
BGP connections@@@---@@@---
IP_BGP_DAMPENED_PATHS@@@show ip bgp dampening
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
-IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@1@@@1@@@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$
-IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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$
+IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@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})?$
+IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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})?$
IP_BGP_DAMPENING_FLAP_STATISTICS@@@show ip bgp dampening
flap-statistics@@@0@@@0@@@cache@@@display information about all currently
flapping BGP routes@@@---@@@---
\ No newline at end of file

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipcommands.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipcommands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipcommands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -6,7 +6,7 @@
IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IP 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_OSPF_DB@@@show ip ospf database@@@0@@@0@@@cache@@@display the OSPF
database@@@---@@@---
IP_OSPF_NEIGHBOR@@@show ip ospf neighbor@@@0@@@0@@@cache@@@display the OSPF
neighbour list@@@---@@@---
-IP_OSPF_DB_EXT@@@show ospf database external@@@1@@@1@@@cache@@@display the
OSPF database externa link states@@@<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_EXT@@@show ip ospf database external@@@1@@@1@@@cache@@@display
the OSPF database externa link states@@@---@@@---
IP_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_MULTICAST_BGP_TABLE@@@show ip bgp IP multicast@@@1@@@1@@@cache@@@display
IP multicast table@@@<prefix> [<length>]@@@.*
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})?$

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipv6commands.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipv6commands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipv6commands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -1,11 +1,11 @@
IPv6_INTERFACE_ADDRESS@@@show IPv6 interface brief@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
IPv6_PROTOCOLS@@@show IPv6 protocols@@@0@@@0@@@cache@@@display detailed
information about IPv6 protocols currently configured on the
router@@@---@@@---
IPv6_ACCESS_LIST@@@show IPv6 access-lists@@@0@@@0@@@cache@@@display IPv6
access lists@@@---@@@---
-IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6 prefix network> [<length>]@@@.*
+IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_DAMPENED_PATHS@@@show bgp IPv6
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
-IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?
advertised-routes$
-IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?
received-routes$
+IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_DAMPENING_FLAP_STATISTICS@@@show bgp IPv6 unicast dampening
flap-statistics@@@0@@@0@@@cache@@@display information about all flapping BGP
routes@@@---@@@---
IPv6_INTERFACE@@@show IPv6 interface@@@1@@@1@@@cache@@@display information
about interfaces running IPv6@@@<interface>@@@.*
IPv6_PING@@@ping IPv6@@@1@@@1@@@cache@@@Ping an <IPv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
@@ -13,7 +13,7 @@
IPv6_OSPF_DB@@@show IPv6 ospf database@@@0@@@0@@@cache@@@display the OSPF3
neighbour list@@@---@@@---
IPv6_OSPF_NEIGHBOR@@@show IPv6 ospf neighbor@@@0@@@0@@@cache@@@display the
OSPF3 database@@@---@@@---
IPv6_OSPF_DB_EXT@@@show IPv6 ospf database
external@@@0@@@0@@@cache@@@display the OSPF3 database external link
status@@@---@@@---
-IPv6_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]{1,4}(/[0-9]{1,3})?$
-IPv6_MULTICAST_BGP_TABLE@@@show bgp IPv6 multicast@@@1@@@1@@@cache@@@display
IPv6 multicast table@@@<IPv6 prefix/prefix-length>@@@.*
-IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information
for <IPv6 address>@@@<IPv6-prefix>@@@.*
\ No newline at end of file
+IPv6_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]{1,4}(/[0-9]{1,3})$
+IPv6_MULTICAST_BGP_TABLE@@@show bgp IPv6 multicast@@@1@@@1@@@cache@@@display
IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@---@@@---
+IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information
for <IPv6
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
\ No newline at end of file

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscominimumpackage.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscominimumpackage.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscominimumpackage.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -4,8 +4,8 @@
IP_INTERFACE_ADDRESS@@@show ip interface brief@@@0@@@0@@@cache@@@display
interface addresses@@@---@@@---
IP_BGP_ROUTE@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<prefix> [<length>]@@@.*
IP_BGP_SUMMARY@@@show ip bgp summary@@@0@@@0@@@cache@@@show status of all
BGP connections@@@---@@@---
-IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@1@@@1@@@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$
-IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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$
+IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@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})?$
+IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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})?$
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 IP 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_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})?$
@@ -14,15 +14,15 @@
IP_MULTICAST_SDP_SUM@@@show ip msdp sum@@@0@@@0@@@cache@@@display MSDP peer
status@@@---@@@---
IP_MULTICAST_TRACEROUTE@@@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})?$
IPv6_INTERFACE_ADDRESS@@@show IPv6 interface brief@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
-IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6 prefix network> [<length>]@@@.*
+IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
-IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?
advertised-routes$
-IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?
received-routes$
+IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_PING@@@ping IPv6@@@1@@@1@@@cache@@@Ping an <IPv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_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]{1,4}(/[0-9]{1,3})?$
-IPv6_MULTICAST_BGP_TABLE@@@show bgp IPv6 multicast@@@1@@@1@@@cache@@@display
IPv6 multicast table@@@<IPv6 prefix/prefix-length>@@@.*
-IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_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]{1,4}(/[0-9]{1,3})$
+IPv6_MULTICAST_BGP_TABLE@@@show BGP IPv6 multicast@@@1@@@1@@@cache@@@display
IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@---@@@---
IP_MPLS_VRF_LIST@@@show ip vrf brief@@@0@@@0@@@cache@@@list the Virtual
Private Network (VPN) routing/forwarding instance (VRF)@@@---@@@---
IP_MPLS_VRF_ROUTE@@@show ip route vrf@@@1@@@1@@@cache@@@display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)@@@<routing-instance name>@@@.*
IP_MPLS_VRF_PING@@@ping vrf@@@1@@@1@@@cache@@@pings an <ip address> that has
a specific VRF@@@<VPN name> <ip address>@@@^.*
[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperipcommands.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperipcommands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperipcommands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -6,21 +6,21 @@
IP_OSPF_DB@@@show ospf database@@@0@@@0@@@cache@@@display the OSPF
database@@@---@@@---
IP_OSPF_NEIGHBOR@@@show ospf neighbor@@@0@@@0@@@cache@@@display the OSPF
neighbour list@@@---@@@---
IP_OSPF_DB_EXT@@@show ospf database extern@@@0@@@0@@@cache@@@display the
OSPF database externa link states@@@---@@@---
-IP_ROUTE@@@show route@@@1@@@1@@@cache@@@show the current IP routing table
for <ip address>@@@<prefix> [<length>]@@@.*
+IP_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_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet.2@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> [<length>]@@@.*
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@@@1@@@1@@@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_MULTICAST_SDP_PEER@@@show 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_MULTICAST_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_MULTICAST_SAP@@@show multicast sessions@@@0@@@0@@@cache@@@display the SAP
cache@@@---@@@---
IP_MULTICAST_SAP_DETAIL@@@show multicast sessions
detail@@@0@@@0@@@cache@@@display the SAP cache details@@@---@@@---
IP_MULTICAST_TRACEROUTE@@@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_MPLS_L2_VC@@@show l2circuit connections@@@0@@@0@@@cache@@@display
information about Any Transport over IP_MPLS (AToM) virtual circuits
(VCs)@@@---@@@---
IP_MPLS_L2_VC_DETAIL@@@show l2circuit connections
extensive@@@0@@@0@@@cache@@@display detailed information about Any Transport
over IP_MPLS (AToM) virtual circuits (VCs)@@@---@@@---
-IP_MPS_FORWARDING-TABLE@@@show route forwarding-table family
IP_MPLS@@@0@@@0@@@cache@@@display IP_MPLS forwarding table@@@---@@@---
+IP_MPS_FORWARDING-TABLE@@@show route forwarding-table family
mpls@@@0@@@0@@@cache@@@display mpls forwarding table@@@---@@@---
IP_MPLS_VRF_LIST@@@show route instance brief@@@0@@@0@@@cache@@@list the
Virtual Private Network (VPN) routing/forwarding instance (VRF)@@@---@@@---
IP_MPLS_VRF_ROUTE@@@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_MPLS_VRF_PING@@@ping@@@1@@@1@@@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_MPLS_VRF_TRACEROUTE@@@traceroute@@@1@@@1@@@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
+IP_MPLS_VRF_PING@@@ping count 5 rapid
routing-instance@@@1@@@1@@@cache@@@pings an <ip address> that has a specific
VRF@@@<routing-instance name> <ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})? .+$
+IP_MPLS_VRF_TRACEROUTE@@@traceroute
routing-instance@@@1@@@1@@@cache@@@displays the path to <ip address> that has
a specific VRF@@@<routing-instance name> <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/geant2_java-sshtelnet-mp-RELEASE/conf/juniperipv6commands.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperipv6commands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperipv6commands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -1,18 +1,18 @@
IPv6_INTERFACE_ADDRESS@@@show interfaces terse@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
IPv6_ACCESS_LIST@@@show interfaces filters@@@0@@@0@@@cache@@@display IPv6
access lists@@@---@@@---
-IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6 prefix
network/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp summary@@@0@@@0@@@cache@@@display the status of
all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_DAMPENED_PATHS@@@show route protocol bgp table inet6.0 damping
suppressed@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show route table inet6.0
advertising-protocol bgp@@@1@@@1@@@cache@@@show advertised prefixes from
<IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECEIVED@@@show route table inet6.0 receive-protocol
bgp@@@1@@@1@@@cache@@@show received prefixes from <IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_DAMPENING_FLAP_STATISTICS@@@show route protocol bgp table inet6.0
damping history@@@0@@@0@@@cache@@@display information about all flapping BGP
routes@@@---@@@---
-IPv6_INTERFACE@@@show interfaces@@@1@@@1@@@cache@@@display information about
interfaces running IPv6@@@<interface> extensive@@@^.+ extensive$
+IPv6_INTERFACE@@@show interfaces@@@1@@@1@@@cache@@@display information about
interfaces running IPv6@@@<interface>@@@^.+$
IPv6_PING@@@ping count 5 rapid@@@1@@@1@@@cache@@@Ping an <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_OSPF_DB@@@show ospf3 database@@@0@@@0@@@cache@@@display the OSPF3
neighbour list@@@---@@@---
IPv6_OSPF_NEIGHBOR@@@show ospf3 neighbor@@@0@@@0@@@cache@@@display the OSPF3
database@@@---@@@---
IPv6_OSPF_DB_EXT@@@show ospf3 database extern@@@0@@@0@@@cache@@@display the
OSPF3 database external link status@@@---@@@---
-IPv6_ROUTE@@@show route table inet6@@@0@@@1@@@cache@@@display IPv6 routing
table entry for <IPv6 address>@@@[<IPv6
address>]@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)?$
-IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6 prefix>
[<prefix-length>]@@@.*
-IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@<IPv6-prefix/prefix-length>@@@.*
-IPv6_MULTICAST_RPF@@@show multicast rpf inet6@@@1@@@1@@@cache@@@display RPF
information for <IPv6 address>@@@<IPv6 address> [<prefix-length>]@@@.*
\ No newline at end of file
+IPv6_ROUTE@@@show route@@@0@@@1@@@cache@@@display IPv6 routing table entry
for <IPv6 address>@@@<IPv6
address>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)$
+IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@---@@@---
+IPv6_MULTICAST_RPF@@@show multicast rpf inet6@@@1@@@1@@@cache@@@display RPF
information for <IPv6
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
\ No newline at end of file

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperminimumpackage.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperminimumpackage.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/juniperminimumpackage.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -8,22 +8,22 @@
IP_BGP_NEIGHBOUR_RECEIVED@@@show route receive-protocol
bgp@@@1@@@1@@@cache@@@show receivede 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})?$
IP_PING@@@ping count 5 rapid@@@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@@@traceroute@@@1@@@1@@@cache@@@trace the IP 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_ROUTE@@@show route@@@1@@@1@@@cache@@@show the current IP routing table
for <ip address>@@@<prefix> [<length>]@@@.*
+IP_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_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet.2@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> [<length>]@@@.*
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_SUM@@@show msdp@@@0@@@0@@@cache@@@display MSDP peer
status@@@---@@@---
IP_MULTICAST_TRACEROUTE@@@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})?$
IPv6_INTERFACE_ADDRESS@@@show interfaces terse@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
-IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6 prefix
network/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp summary@@@0@@@0@@@cache@@@display the status of
all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show route table inet6.0
advertising-protocol bgp@@@1@@@1@@@cache@@@show advertised prefixes from
<IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECIEVED@@@show route table inet6.0 receive-protocol
bgp@@@1@@@1@@@cache@@@show received prefixes from <IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_PING@@@ping count 5 rapid@@@1@@@1@@@cache@@@Ping an <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_ROUTE@@@show route table inet6@@@0@@@1@@@cache@@@display IPv6 routing
table entry for <IPv6 address>@@@[<IPv6
address>]@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)?$
-IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6 prefix>
[<prefix-length>]@@@.*
-IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@<IPv6-prefix/prefix-length>@@@.*
+IPv6_ROUTE@@@show route@@@0@@@1@@@cache@@@display IPv6 routing table entry
for <IPv6 address>@@@<IPv6
address>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)$
+IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@---@@@---
IP_MPLS_VRF_LIST@@@show route instance brief@@@0@@@0@@@cache@@@list the
Virtual Private Network (VPN) routing/forwarding instance (VRF)@@@---@@@---
IP_MPLS_VRF_ROUTE@@@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_MPLS_VRF_PING@@@ping count 5 rapid
routing-instance@@@1@@@1@@@cache@@@pings an <ip address> that has a specific
VRF@@@<routing-instance name> <ip address>@@@^.+
[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IP_MPLS_VRF_TRACEROUTE@@@traceroute@@@1@@@1@@@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
+IP_MPLS_VRF_PING@@@ping count 5 rapid
routing-instance@@@1@@@1@@@cache@@@pings an <ip address> that has a specific
VRF@@@<routing-instance name> <ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})? .+$
+IP_MPLS_VRF_TRACEROUTE@@@traceroute
routing-instance@@@1@@@1@@@cache@@@displays the path to <ip address> that has
a specific VRF@@@<routing-instance name> <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/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
2008-06-18 13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
2008-06-18 13:52:58 UTC (rev 4021)
@@ -55,6 +55,10 @@
# Description=Type of service
service.r.type=mp

+# Group=Internal
+# Description=The path where the temporary token files will be stored (be
sure to make the path writable!)
+service.mp.tokenPath=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/
+
#LS properties
#-------------

@@ -80,7 +84,7 @@

# Group=LS
# Description=The version of the service
-service.r.service_version=1.3.2
+service.r.service_version=1.3.3

# Group=LS
# Description=The e-mail address of the contact person for the service

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
2008-06-18 13:52:58 UTC (rev 4021)
@@ -55,6 +55,10 @@
# Description=Type of service
service.r.type=mp

+# Group=Internal
+# Description=The path where the temporary token files will be stored (be
sure to make the path writable!)
+service.mp.tokenPath=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/
+
#LS properties
#-------------

@@ -80,7 +84,7 @@

# Group=LS
# Description=The version of the service
-service.r.service_version=1.3.2
+service.r.service_version=1.3.3

# Group=LS
# Description=The e-mail address of the contact person for the service

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/CSVgenerator.pl
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/CSVgenerator.pl
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/CSVgenerator.pl
2008-06-18 13:52:58 UTC (rev 4021)
@@ -19,10 +19,12 @@
$type = "ciscotelnet";
$port = "23";
$rate = "2000";
-$username = "username";
-$password = "password";
+$username = x;
+#must be in DES and then BASE64
+$password = x;
+$timeout = "15";
+$maxusers = "2";

-
open(FILE, $ROUTERSFILE) || die("Could not open file $ROUTERSFILE!");
@routers = <FILE>;
close(FILE);
@@ -41,6 +43,6 @@
{
chomp($line);
($device, $url, $prompt) = split(/,/, $line);
- print
"$device\@\@\@$type\@\@\@$url\@\@\@$port\@\@\@$prompt\@\@\@$rate\@\@\@$username\@\@\@$password\%\%\%";
+ print
"$device\@\@\@$type\@\@\@$url\@\@\@$port\@\@\@$prompt\@\@\@$rate\@\@\@$username\@\@\@$password\@\@\@$timeout\@\@\@$maxusers\%\%\%";
print "$ciscoconfig\n";
-}
+}
\ No newline at end of file

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscobgpcommands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscobgpcommands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscobgpcommands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -1,6 +1,6 @@
IP_BGP_ROUTE@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<prefix> [<length>]@@@.*
IP_BGP_SUMMARY@@@show ip bgp summary@@@0@@@0@@@cache@@@show status of all
BGP connections@@@---@@@---
IP_BGP_DAMPENED_PATHS@@@show ip bgp dampening
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
-IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@1@@@1@@@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$
-IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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$
+IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@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})?$
+IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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})?$
IP_BGP_DAMPENING_FLAP_STATISTICS@@@show ip bgp dampening
flap-statistics@@@0@@@0@@@cache@@@display information about all currently
flapping BGP routes@@@---@@@---
\ No newline at end of file

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -6,7 +6,7 @@
IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IP 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_OSPF_DB@@@show ip ospf database@@@0@@@0@@@cache@@@display the OSPF
database@@@---@@@---
IP_OSPF_NEIGHBOR@@@show ip ospf neighbor@@@0@@@0@@@cache@@@display the OSPF
neighbour list@@@---@@@---
-IP_OSPF_DB_EXT@@@show ospf database external@@@1@@@1@@@cache@@@display the
OSPF database externa link states@@@<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_EXT@@@show ip ospf database external@@@1@@@1@@@cache@@@display
the OSPF database externa link states@@@---@@@---
IP_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_MULTICAST_BGP_TABLE@@@show ip bgp IP multicast@@@1@@@1@@@cache@@@display
IP multicast table@@@<prefix> [<length>]@@@.*
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})?$

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -1,11 +1,11 @@
IPv6_INTERFACE_ADDRESS@@@show IPv6 interface brief@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
IPv6_PROTOCOLS@@@show IPv6 protocols@@@0@@@0@@@cache@@@display detailed
information about IPv6 protocols currently configured on the
router@@@---@@@---
IPv6_ACCESS_LIST@@@show IPv6 access-lists@@@0@@@0@@@cache@@@display IPv6
access lists@@@---@@@---
-IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6 prefix network> [<length>]@@@.*
+IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_DAMPENED_PATHS@@@show bgp IPv6
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
-IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?
advertised-routes$
-IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})? received
routes$
+IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_DAMPENING_FLAP_STATISTICS@@@show bgp IPv6 unicast dampening
flap-statistics@@@0@@@0@@@cache@@@display information about all flapping BGP
routes@@@---@@@---
IPv6_INTERFACE@@@show IPv6 interface@@@1@@@1@@@cache@@@display information
about interfaces running IPv6@@@<interface>@@@.*
IPv6_PING@@@ping IPv6@@@1@@@1@@@cache@@@Ping an <IPv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
@@ -13,7 +13,7 @@
IPv6_OSPF_DB@@@show IPv6 ospf database@@@0@@@0@@@cache@@@display the OSPF3
neighbour list@@@---@@@---
IPv6_OSPF_NEIGHBOR@@@show IPv6 ospf neighbor@@@0@@@0@@@cache@@@display the
OSPF3 database@@@---@@@---
IPv6_OSPF_DB_EXT@@@show IPv6 ospf database
external@@@0@@@0@@@cache@@@display the OSPF3 database external link
status@@@---@@@---
-IPv6_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]{1,4}(/[0-9]{1,3})?$
-IPv6_MULTICAST_BGP_TABLE@@@show bgp IPv6 multicast@@@1@@@1@@@cache@@@display
IPv6 multicast table@@@<IPv6 prefix/prefix-length>@@@.*
-IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information
for <IPv6 address>@@@<IPv6-prefix>@@@.*
\ No newline at end of file
+IPv6_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]{1,4}(/[0-9]{1,3})$
+IPv6_MULTICAST_BGP_TABLE@@@show bgp IPv6 multicast@@@1@@@1@@@cache@@@display
IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@---@@@---
+IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information
for <IPv6
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
\ No newline at end of file

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -4,8 +4,8 @@
IP_INTERFACE_ADDRESS@@@show ip interface brief@@@0@@@0@@@cache@@@display
interface addresses@@@---@@@---
IP_BGP_ROUTE@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<prefix> [<length>]@@@.*
IP_BGP_SUMMARY@@@show ip bgp summary@@@0@@@0@@@cache@@@show status of all
BGP connections@@@---@@@---
-IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@1@@@1@@@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$
-IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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$
+IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@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})?$
+IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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})?$
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 IP 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_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})?$
@@ -14,14 +14,15 @@
IP_MULTICAST_SDP_SUM@@@show ip msdp sum@@@0@@@0@@@cache@@@display MSDP peer
status@@@---@@@---
IP_MULTICAST_TRACEROUTE@@@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})?$
IPv6_INTERFACE_ADDRESS@@@show IPv6 interface brief@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
-IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6 prefix network> [<length>]@@@.*
+IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
-IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?
advertised-routes$
-IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})? received
routes$
+IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_PING@@@ping IPv6@@@1@@@1@@@cache@@@Ping an <IPv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_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]{1,4}(/[0-9]{1,3})?$
-IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_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]{1,4}(/[0-9]{1,3})$
+IPv6_MULTICAST_BGP_TABLE@@@show BGP IPv6 multicast@@@1@@@1@@@cache@@@display
IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@---@@@---
IP_MPLS_VRF_LIST@@@show ip vrf brief@@@0@@@0@@@cache@@@list the Virtual
Private Network (VPN) routing/forwarding instance (VRF)@@@---@@@---
IP_MPLS_VRF_ROUTE@@@show ip route vrf@@@1@@@1@@@cache@@@display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)@@@<routing-instance name>@@@.*
IP_MPLS_VRF_PING@@@ping vrf@@@1@@@1@@@cache@@@pings an <ip address> that has
a specific VRF@@@<VPN name> <ip address>@@@^.*
[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipcommands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipcommands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipcommands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -6,21 +6,21 @@
IP_OSPF_DB@@@show ospf database@@@0@@@0@@@cache@@@display the OSPF
database@@@---@@@---
IP_OSPF_NEIGHBOR@@@show ospf neighbor@@@0@@@0@@@cache@@@display the OSPF
neighbour list@@@---@@@---
IP_OSPF_DB_EXT@@@show ospf database extern@@@0@@@0@@@cache@@@display the
OSPF database externa link states@@@---@@@---
-IP_ROUTE@@@show route@@@1@@@1@@@cache@@@show the current IP routing table
for <ip address>@@@<prefix> [<length>]@@@.*
+IP_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_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet.2@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> [<length>]@@@.*
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@@@1@@@1@@@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_MULTICAST_SDP_PEER@@@show 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_MULTICAST_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_MULTICAST_SAP@@@show multicast sessions@@@0@@@0@@@cache@@@display the SAP
cache@@@---@@@---
IP_MULTICAST_SAP_DETAIL@@@show multicast sessions
detail@@@0@@@0@@@cache@@@display the SAP cache details@@@---@@@---
IP_MULTICAST_TRACEROUTE@@@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_MPLS_L2_VC@@@show l2circuit connections@@@0@@@0@@@cache@@@display
information about Any Transport over IP_MPLS (AToM) virtual circuits
(VCs)@@@---@@@---
IP_MPLS_L2_VC_DETAIL@@@show l2circuit connections
extensive@@@0@@@0@@@cache@@@display detailed information about Any Transport
over IP_MPLS (AToM) virtual circuits (VCs)@@@---@@@---
-IP_MPS_FORWARDING-TABLE@@@show route forwarding-table family
IP_MPLS@@@0@@@0@@@cache@@@display IP_MPLS forwarding table@@@---@@@---
+IP_MPS_FORWARDING-TABLE@@@show route forwarding-table family
mpls@@@0@@@0@@@cache@@@display mpls forwarding table@@@---@@@---
IP_MPLS_VRF_LIST@@@show route instance brief@@@0@@@0@@@cache@@@list the
Virtual Private Network (VPN) routing/forwarding instance (VRF)@@@---@@@---
IP_MPLS_VRF_ROUTE@@@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_MPLS_VRF_PING@@@ping@@@1@@@1@@@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_MPLS_VRF_TRACEROUTE@@@traceroute@@@1@@@1@@@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
+IP_MPLS_VRF_PING@@@ping count 5 rapid
routing-instance@@@1@@@1@@@cache@@@pings an <ip address> that has a specific
VRF@@@<routing-instance name> <ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})? .+$
+IP_MPLS_VRF_TRACEROUTE@@@traceroute
routing-instance@@@1@@@1@@@cache@@@displays the path to <ip address> that has
a specific VRF@@@<routing-instance name> <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/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipv6commands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipv6commands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipv6commands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -1,18 +1,18 @@
IPv6_INTERFACE_ADDRESS@@@show interfaces terse@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
IPv6_ACCESS_LIST@@@show interfaces filters@@@0@@@0@@@cache@@@display IPv6
access lists@@@---@@@---
-IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6 prefix
network/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp summary@@@0@@@0@@@cache@@@display the status of
all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_DAMPENED_PATHS@@@show route protocol bgp table inet6.0 damping
suppressed@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show route table inet6.0
advertising-protocol bgp@@@1@@@1@@@cache@@@show advertised prefixes from
<IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECEIVED@@@show route table inet6.0 receive-protocol
bgp@@@1@@@1@@@cache@@@show received prefixes from <IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_DAMPENING_FLAP_STATISTICS@@@show route protocol bgp table inet6.0
damping history@@@0@@@0@@@cache@@@display information about all flapping BGP
routes@@@---@@@---
-IPv6_INTERFACE@@@show interfaces@@@1@@@1@@@cache@@@display information about
interfaces running IPv6@@@<interface> extensive@@@^.+ extensive$
+IPv6_INTERFACE@@@show interfaces@@@1@@@1@@@cache@@@display information about
interfaces running IPv6@@@<interface>@@@^.+$
IPv6_PING@@@ping count 5 rapid@@@1@@@1@@@cache@@@Ping an <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_OSPF_DB@@@show ospf3 database@@@0@@@0@@@cache@@@display the OSPF3
neighbour list@@@---@@@---
IPv6_OSPF_NEIGHBOR@@@show ospf3 neighbor@@@0@@@0@@@cache@@@display the OSPF3
database@@@---@@@---
IPv6_OSPF_DB_EXT@@@show ospf3 database extern@@@0@@@0@@@cache@@@display the
OSPF3 database external link status@@@---@@@---
-IPv6_ROUTE@@@show route table inet6@@@0@@@1@@@cache@@@display IPv6 routing
table entry for <IPv6 address>@@@[<IPv6
address>]@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)?$
-IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6 prefix>
[<prefix-length>]@@@.*
-IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@<IPv6-prefix/prefix-length>@@@.*
-IPv6_MULTICAST_RPF@@@show multicast rpf inet6@@@1@@@1@@@cache@@@display RPF
information for <IPv6 address>@@@<IPv6 address> [<prefix-length>]@@@.*
\ No newline at end of file
+IPv6_ROUTE@@@show route@@@0@@@1@@@cache@@@display IPv6 routing table entry
for <IPv6 address>@@@<IPv6
address>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)$
+IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@---@@@---
+IPv6_MULTICAST_RPF@@@show multicast rpf inet6@@@1@@@1@@@cache@@@display RPF
information for <IPv6
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
\ No newline at end of file

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperminimumpackage.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperminimumpackage.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperminimumpackage.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -8,22 +8,22 @@
IP_BGP_NEIGHBOUR_RECEIVED@@@show route receive-protocol
bgp@@@1@@@1@@@cache@@@show receivede 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})?$
IP_PING@@@ping count 5 rapid@@@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@@@traceroute@@@1@@@1@@@cache@@@trace the IP 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_ROUTE@@@show route@@@1@@@1@@@cache@@@show the current IP routing table
for <ip address>@@@<prefix> [<length>]@@@.*
+IP_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_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet.2@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> [<length>]@@@.*
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_SUM@@@show msdp@@@0@@@0@@@cache@@@display MSDP peer
status@@@---@@@---
IP_MULTICAST_TRACEROUTE@@@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})?$
IPv6_INTERFACE_ADDRESS@@@show interfaces terse@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
-IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6 prefix
network/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp summary@@@0@@@0@@@cache@@@display the status of
all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show route table inet6.0
advertising-protocol bgp@@@1@@@1@@@cache@@@show advertised prefixes from
<IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECIEVED@@@show route table inet6.0 receive-protocol
bgp@@@1@@@1@@@cache@@@show received prefixes from <IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_PING@@@ping count 5 rapid@@@1@@@1@@@cache@@@Ping an <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_ROUTE@@@show route table inet6@@@0@@@1@@@cache@@@display IPv6 routing
table entry for <IPv6 address>@@@[<IPv6
address>]@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)?$
-IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6 prefix>
[<prefix-length>]@@@.*
-IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@<IPv6-prefix/prefix-length>@@@.*
+IPv6_ROUTE@@@show route@@@0@@@1@@@cache@@@display IPv6 routing table entry
for <IPv6 address>@@@<IPv6
address>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)$
+IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@---@@@---
IP_MPLS_VRF_LIST@@@show route instance brief@@@0@@@0@@@cache@@@list the
Virtual Private Network (VPN) routing/forwarding instance (VRF)@@@---@@@---
IP_MPLS_VRF_ROUTE@@@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_MPLS_VRF_PING@@@ping count 5 rapid
routing-instance@@@1@@@1@@@cache@@@pings an <ip address> that has a specific
VRF@@@<routing-instance name> <ip address>@@@^.+
[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IP_MPLS_VRF_TRACEROUTE@@@traceroute@@@1@@@1@@@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
+IP_MPLS_VRF_PING@@@ping count 5 rapid
routing-instance@@@1@@@1@@@cache@@@pings an <ip address> that has a specific
VRF@@@<routing-instance name> <ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})? .+$
+IP_MPLS_VRF_TRACEROUTE@@@traceroute
routing-instance@@@1@@@1@@@cache@@@displays the path to <ip address> that has
a specific VRF@@@<routing-instance name> <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

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/SSHTELNET_configurator.sh

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscobgpcommands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscobgpcommands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscobgpcommands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -1,6 +1,6 @@
IP_BGP_ROUTE@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<prefix> [<length>]@@@.*
IP_BGP_SUMMARY@@@show ip bgp summary@@@0@@@0@@@cache@@@show status of all
BGP connections@@@---@@@---
IP_BGP_DAMPENED_PATHS@@@show ip bgp dampening
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
-IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@1@@@1@@@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$
-IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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$
+IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@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})?$
+IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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})?$
IP_BGP_DAMPENING_FLAP_STATISTICS@@@show ip bgp dampening
flap-statistics@@@0@@@0@@@cache@@@display information about all currently
flapping BGP routes@@@---@@@---
\ No newline at end of file

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -6,7 +6,7 @@
IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IP 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_OSPF_DB@@@show ip ospf database@@@0@@@0@@@cache@@@display the OSPF
database@@@---@@@---
IP_OSPF_NEIGHBOR@@@show ip ospf neighbor@@@0@@@0@@@cache@@@display the OSPF
neighbour list@@@---@@@---
-IP_OSPF_DB_EXT@@@show ospf database external@@@1@@@1@@@cache@@@display the
OSPF database externa link states@@@<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_EXT@@@show ip ospf database external@@@1@@@1@@@cache@@@display
the OSPF database externa link states@@@---@@@---
IP_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_MULTICAST_BGP_TABLE@@@show ip bgp IP multicast@@@1@@@1@@@cache@@@display
IP multicast table@@@<prefix> [<length>]@@@.*
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})?$

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -1,11 +1,11 @@
IPv6_INTERFACE_ADDRESS@@@show IPv6 interface brief@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
IPv6_PROTOCOLS@@@show IPv6 protocols@@@0@@@0@@@cache@@@display detailed
information about IPv6 protocols currently configured on the
router@@@---@@@---
IPv6_ACCESS_LIST@@@show IPv6 access-lists@@@0@@@0@@@cache@@@display IPv6
access lists@@@---@@@---
-IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6 prefix network> [<length>]@@@.*
+IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_DAMPENED_PATHS@@@show bgp IPv6
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
-IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?
advertised-routes$
-IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})? received
routes$
+IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_DAMPENING_FLAP_STATISTICS@@@show bgp IPv6 unicast dampening
flap-statistics@@@0@@@0@@@cache@@@display information about all flapping BGP
routes@@@---@@@---
IPv6_INTERFACE@@@show IPv6 interface@@@1@@@1@@@cache@@@display information
about interfaces running IPv6@@@<interface>@@@.*
IPv6_PING@@@ping IPv6@@@1@@@1@@@cache@@@Ping an <IPv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
@@ -13,7 +13,7 @@
IPv6_OSPF_DB@@@show IPv6 ospf database@@@0@@@0@@@cache@@@display the OSPF3
neighbour list@@@---@@@---
IPv6_OSPF_NEIGHBOR@@@show IPv6 ospf neighbor@@@0@@@0@@@cache@@@display the
OSPF3 database@@@---@@@---
IPv6_OSPF_DB_EXT@@@show IPv6 ospf database
external@@@0@@@0@@@cache@@@display the OSPF3 database external link
status@@@---@@@---
-IPv6_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]{1,4}(/[0-9]{1,3})?$
-IPv6_MULTICAST_BGP_TABLE@@@show bgp IPv6 multicast@@@1@@@1@@@cache@@@display
IPv6 multicast table@@@<IPv6 prefix/prefix-length>@@@.*
-IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information
for <IPv6 address>@@@<IPv6-prefix>@@@.*
\ No newline at end of file
+IPv6_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]{1,4}(/[0-9]{1,3})$
+IPv6_MULTICAST_BGP_TABLE@@@show bgp IPv6 multicast@@@1@@@1@@@cache@@@display
IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@---@@@---
+IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information
for <IPv6
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
\ No newline at end of file

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -4,8 +4,8 @@
IP_INTERFACE_ADDRESS@@@show ip interface brief@@@0@@@0@@@cache@@@display
interface addresses@@@---@@@---
IP_BGP_ROUTE@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<prefix> [<length>]@@@.*
IP_BGP_SUMMARY@@@show ip bgp summary@@@0@@@0@@@cache@@@show status of all
BGP connections@@@---@@@---
-IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@1@@@1@@@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$
-IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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$
+IP_BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbor@@@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})?$
+IP_BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbor@@@1@@@1@@@cache@@@show
receivede 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})?$
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 IP 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_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})?$
@@ -14,14 +14,15 @@
IP_MULTICAST_SDP_SUM@@@show ip msdp sum@@@0@@@0@@@cache@@@display MSDP peer
status@@@---@@@---
IP_MULTICAST_TRACEROUTE@@@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})?$
IPv6_INTERFACE_ADDRESS@@@show IPv6 interface brief@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
-IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6 prefix network> [<length>]@@@.*
+IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
-IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?
advertised-routes$
-IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})? received
routes$
+IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_PING@@@ping IPv6@@@1@@@1@@@cache@@@Ping an <IPv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_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]{1,4}(/[0-9]{1,3})?$
-IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_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]{1,4}(/[0-9]{1,3})$
+IPv6_MULTICAST_BGP_TABLE@@@show BGP IPv6 multicast@@@1@@@1@@@cache@@@display
IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast
IPv6 forwarding state@@@---@@@---
IP_MPLS_VRF_LIST@@@show ip vrf brief@@@0@@@0@@@cache@@@list the Virtual
Private Network (VPN) routing/forwarding instance (VRF)@@@---@@@---
IP_MPLS_VRF_ROUTE@@@show ip route vrf@@@1@@@1@@@cache@@@display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)@@@<routing-instance name>@@@.*
IP_MPLS_VRF_PING@@@ping vrf@@@1@@@1@@@cache@@@pings an <ip address> that has
a specific VRF@@@<VPN name> <ip address>@@@^.*
[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipcommands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipcommands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipcommands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -6,21 +6,21 @@
IP_OSPF_DB@@@show ospf database@@@0@@@0@@@cache@@@display the OSPF
database@@@---@@@---
IP_OSPF_NEIGHBOR@@@show ospf neighbor@@@0@@@0@@@cache@@@display the OSPF
neighbour list@@@---@@@---
IP_OSPF_DB_EXT@@@show ospf database extern@@@0@@@0@@@cache@@@display the
OSPF database externa link states@@@---@@@---
-IP_ROUTE@@@show route@@@1@@@1@@@cache@@@show the current IP routing table
for <ip address>@@@<prefix> [<length>]@@@.*
+IP_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_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet.2@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> [<length>]@@@.*
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@@@1@@@1@@@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_MULTICAST_SDP_PEER@@@show 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_MULTICAST_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_MULTICAST_SAP@@@show multicast sessions@@@0@@@0@@@cache@@@display the SAP
cache@@@---@@@---
IP_MULTICAST_SAP_DETAIL@@@show multicast sessions
detail@@@0@@@0@@@cache@@@display the SAP cache details@@@---@@@---
IP_MULTICAST_TRACEROUTE@@@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_MPLS_L2_VC@@@show l2circuit connections@@@0@@@0@@@cache@@@display
information about Any Transport over IP_MPLS (AToM) virtual circuits
(VCs)@@@---@@@---
IP_MPLS_L2_VC_DETAIL@@@show l2circuit connections
extensive@@@0@@@0@@@cache@@@display detailed information about Any Transport
over IP_MPLS (AToM) virtual circuits (VCs)@@@---@@@---
-IP_MPS_FORWARDING-TABLE@@@show route forwarding-table family
IP_MPLS@@@0@@@0@@@cache@@@display IP_MPLS forwarding table@@@---@@@---
+IP_MPS_FORWARDING-TABLE@@@show route forwarding-table family
mpls@@@0@@@0@@@cache@@@display mpls forwarding table@@@---@@@---
IP_MPLS_VRF_LIST@@@show route instance brief@@@0@@@0@@@cache@@@list the
Virtual Private Network (VPN) routing/forwarding instance (VRF)@@@---@@@---
IP_MPLS_VRF_ROUTE@@@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_MPLS_VRF_PING@@@ping@@@1@@@1@@@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_MPLS_VRF_TRACEROUTE@@@traceroute@@@1@@@1@@@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
+IP_MPLS_VRF_PING@@@ping count 5 rapid
routing-instance@@@1@@@1@@@cache@@@pings an <ip address> that has a specific
VRF@@@<routing-instance name> <ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})? .+$
+IP_MPLS_VRF_TRACEROUTE@@@traceroute
routing-instance@@@1@@@1@@@cache@@@displays the path to <ip address> that has
a specific VRF@@@<routing-instance name> <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/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipv6commands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipv6commands.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipv6commands.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -1,18 +1,18 @@
IPv6_INTERFACE_ADDRESS@@@show interfaces terse@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
IPv6_ACCESS_LIST@@@show interfaces filters@@@0@@@0@@@cache@@@display IPv6
access lists@@@---@@@---
-IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6 prefix
network/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp summary@@@0@@@0@@@cache@@@display the status of
all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_DAMPENED_PATHS@@@show route protocol bgp table inet6.0 damping
suppressed@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show route table inet6.0
advertising-protocol bgp@@@1@@@1@@@cache@@@show advertised prefixes from
<IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECEIVED@@@show route table inet6.0 receive-protocol
bgp@@@1@@@1@@@cache@@@show received prefixes from <IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_DAMPENING_FLAP_STATISTICS@@@show route protocol bgp table inet6.0
damping history@@@0@@@0@@@cache@@@display information about all flapping BGP
routes@@@---@@@---
-IPv6_INTERFACE@@@show interfaces@@@1@@@1@@@cache@@@display information about
interfaces running IPv6@@@<interface> extensive@@@^.+ extensive$
+IPv6_INTERFACE@@@show interfaces@@@1@@@1@@@cache@@@display information about
interfaces running IPv6@@@<interface>@@@^.+$
IPv6_PING@@@ping count 5 rapid@@@1@@@1@@@cache@@@Ping an <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_OSPF_DB@@@show ospf3 database@@@0@@@0@@@cache@@@display the OSPF3
neighbour list@@@---@@@---
IPv6_OSPF_NEIGHBOR@@@show ospf3 neighbor@@@0@@@0@@@cache@@@display the OSPF3
database@@@---@@@---
IPv6_OSPF_DB_EXT@@@show ospf3 database extern@@@0@@@0@@@cache@@@display the
OSPF3 database external link status@@@---@@@---
-IPv6_ROUTE@@@show route table inet6@@@0@@@1@@@cache@@@display IPv6 routing
table entry for <IPv6 address>@@@[<IPv6
address>]@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)?$
-IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6 prefix>
[<prefix-length>]@@@.*
-IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@<IPv6-prefix/prefix-length>@@@.*
-IPv6_MULTICAST_RPF@@@show multicast rpf inet6@@@1@@@1@@@cache@@@display RPF
information for <IPv6 address>@@@<IPv6 address> [<prefix-length>]@@@.*
\ No newline at end of file
+IPv6_ROUTE@@@show route@@@0@@@1@@@cache@@@display IPv6 routing table entry
for <IPv6 address>@@@<IPv6
address>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)$
+IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@---@@@---
+IPv6_MULTICAST_RPF@@@show multicast rpf inet6@@@1@@@1@@@cache@@@display RPF
information for <IPv6
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
\ No newline at end of file

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperminimumpackage.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperminimumpackage.txt
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperminimumpackage.txt
2008-06-18 13:52:58 UTC (rev 4021)
@@ -8,22 +8,22 @@
IP_BGP_NEIGHBOUR_RECEIVED@@@show route receive-protocol
bgp@@@1@@@1@@@cache@@@show receivede 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})?$
IP_PING@@@ping count 5 rapid@@@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@@@traceroute@@@1@@@1@@@cache@@@trace the IP 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_ROUTE@@@show route@@@1@@@1@@@cache@@@show the current IP routing table
for <ip address>@@@<prefix> [<length>]@@@.*
+IP_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_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet.2@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> [<length>]@@@.*
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_SUM@@@show msdp@@@0@@@0@@@cache@@@display MSDP peer
status@@@---@@@---
IP_MULTICAST_TRACEROUTE@@@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})?$
IPv6_INTERFACE_ADDRESS@@@show interfaces terse@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
-IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6 prefix
network/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@display current BGP table routing entry for <IPv6
prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp summary@@@0@@@0@@@cache@@@display the status of
all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show route table inet6.0
advertising-protocol bgp@@@1@@@1@@@cache@@@show advertised prefixes from
<IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECIEVED@@@show route table inet6.0 receive-protocol
bgp@@@1@@@1@@@cache@@@show received prefixes from <IPv6 address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_PING@@@ping count 5 rapid@@@1@@@1@@@cache@@@Ping an <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_ROUTE@@@show route table inet6@@@0@@@1@@@cache@@@display IPv6 routing
table entry for <IPv6 address>@@@[<IPv6
address>]@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)?$
-IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6 prefix>
[<prefix-length>]@@@.*
-IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@<IPv6-prefix/prefix-length>@@@.*
+IPv6_ROUTE@@@show route@@@0@@@1@@@cache@@@display IPv6 routing table entry
for <IPv6 address>@@@<IPv6
address>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?)$
+IPv6_MULTICAST_BGP_TABLE@@@show route protocol bgp table
inet6.2@@@1@@@1@@@cache@@@display IPv6 multicast table@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_MULTICAST_ROUTE@@@show multicast route inet6@@@1@@@1@@@cache@@@display
multicast IPv6 forwarding state@@@---@@@---
IP_MPLS_VRF_LIST@@@show route instance brief@@@0@@@0@@@cache@@@list the
Virtual Private Network (VPN) routing/forwarding instance (VRF)@@@---@@@---
IP_MPLS_VRF_ROUTE@@@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_MPLS_VRF_PING@@@ping count 5 rapid
routing-instance@@@1@@@1@@@cache@@@pings an <ip address> that has a specific
VRF@@@<routing-instance name> <ip address>@@@^.+
[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IP_MPLS_VRF_TRACEROUTE@@@traceroute@@@1@@@1@@@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
+IP_MPLS_VRF_PING@@@ping count 5 rapid
routing-instance@@@1@@@1@@@cache@@@pings an <ip address> that has a specific
VRF@@@<routing-instance name> <ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})? .+$
+IP_MPLS_VRF_TRACEROUTE@@@traceroute
routing-instance@@@1@@@1@@@cache@@@displays the path to <ip address> that has
a specific VRF@@@<routing-instance name> <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

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/sshtelnetmptemplate.csv

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt 2008-06-18
13:50:29 UTC (rev 4020)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt 2008-06-18
13:52:58 UTC (rev 4021)
@@ -1,6 +1,13 @@
Change log
----------

+1.3.3 - 18/06/2008
+
+ * ps-base version: 1.0.20080310
+ * web-admin version: 0.8.3b
+ * fixed the design flaw which was related to the command parameters (had to
update the list of commands for this)
+ * added a parameter to the service.properties file, which defines a
directory to put the temporary token files
+
1.3.2 - 06/06/2008

* ps-base version: 1.0.20080310

Deleted:
branches/geant2_java-sshtelnet-mp-RELEASE/doc/commands/commands-complete-list-v5-SM.xls

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/doc/commands/commands-complete-list-v6-AI.xls


Property changes on:
branches/geant2_java-sshtelnet-mp-RELEASE/doc/commands/commands-complete-list-v6-AI.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/doc/commands/commands-minimum-list-v6-SM.xls


Property changes on:
branches/geant2_java-sshtelnet-mp-RELEASE/doc/commands/commands-minimum-list-v6-SM.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Deleted:
branches/geant2_java-sshtelnet-mp-RELEASE/doc/commands/commands_minimum_set-v5-SM.xls

Added: branches/geant2_java-sshtelnet-mp-RELEASE/doc/sshtelnetsample.xml

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -70,6 +70,8 @@
// ---------------------- constructors
public CiscoBgpAdapter() throws PerfSONARException {

+
+
try {

logger = (LoggerComponent)
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);
@@ -83,16 +85,14 @@

} catch (PerfSONARException e) {

-
logger.error("[CISCOBGPADAPTER][Constructor]"+e.getStackTrace().toString());
+
logger.error("[CiscoBgpAdapter][Constructor]"+e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoBgpAdapter] Constructor started");
+ logger.info("[CiscoBgpAdapter] Constructor finished");

- logger.debug("[CiscoBgpAdapter] Constructor finished");
-
}// CiscoBgpAdapter

// ---------------------- public methods
@@ -101,7 +101,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoBgpAdapter] getAvailableSpecificCommands
called");
+ logger.info("[CiscoBgpAdapter] getAvailableSpecificCommands called");

return availableSpecificCommands;

@@ -111,7 +111,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoBgpAdapter] setAvailableSpecificCommand called");
+ logger.info("[CiscoBgpAdapter] setAvailableSpecificCommand called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -121,7 +121,7 @@
*/
public void addAvailableSpecificCommand(BgpCommandInterface command) {

- logger.debug("[CiscoBgpAdapter] addAvailableSpecificCommand called");
+ logger.info("[CiscoBgpAdapter] addAvailableSpecificCommand called");

availableSpecificCommands.add(command);

@@ -132,7 +132,7 @@
public BgpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoBgpAdapter] getCommand called");
+ logger.info("[CiscoBgpAdapter] getCommand called");

BgpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -143,14 +143,14 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoBgpAdapter] Command found");
+ logger.debug("[CiscoBgpAdapter][getCommand] Command found: "
+ command);
return command;

}

}// while
-
- logger.error("[CiscoBgpAdapter] Command NOT found");
+ logger.debug("[CiscoBgpAdapter][getCommand] Command NOT found!");
+ logger.error("[CiscoBgpAdapter][getCommand] Command NOT found!");
throw new PerfSONARException("error.mp.sshtelnet.nosuchcommand",
"Requested command not found");

@@ -160,7 +160,7 @@
*/
public BgpCommandInterface executeCommand(BgpCommandInterface command) {

- logger.debug("[CiscoBgpAdapter] executeCommand called");
+ logger.info("[CiscoBgpAdapter] executeCommand called");

if (manager != null) {

@@ -174,7 +174,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoBgpAdapter][executeCommand] New result returned");
cachedResults.add(command);
logger.debug("[CiscoBgpAdapter] executeCommand finished");
return command;
@@ -210,16 +210,16 @@

}

- logger.info("[CiscoBgpAdapter] Trying to connect");
+ logger.debug("[CiscoBgpAdapter][connect] Trying to connect");

manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");

- logger.info("[CiscoBgpAdapter Login");
+ logger.debug("[CiscoBgpAdapter][connect] Logged in");

} catch (Exception e) {

logger.error("[CiscoBgpAdapter][Connect] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -271,7 +271,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[CiscoBgpAdapter] Configuring available operations
...");
+ logger.info("[CiscoBgpAdapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -286,17 +286,16 @@

BgpCommand command = new BgpCommand(token,
properties.getProperty(subject, token, "command"));
try {
-
logger.debug("service.mp."+subject+".commands."+token+".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOBGPADAPTER][ConfigureCommands]"+e1.getStackTrace().toString());
+ logger.error("[CiscoBgpAdapter][ConfigureCommands]
MinParamCount not found: "+e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOBGPADAPTER][ConfigureCommands]"+e1.getStackTrace().toString());
+ logger.error("[CiscoBgpAdapter][ConfigureCommands]
MaxParamCount not found: "+e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -308,13 +307,13 @@

} catch (PerfSONARException e) {

-
logger.error("[CISCOBGPADAPTER][ConfigureCommands]"+e.getStackTrace().toString());
+ logger.error("[CiscoBgpAdapter][ConfigureCommands] Unable to
retrieve commands: "+e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[CiscoBgpAdapter] Available operations configured");
+ logger.info("[CiscoBgpAdapter] Available operations configured");

}

@@ -374,7 +373,7 @@
public Message takeAction(String actionType, Message request)
throws PerfSONARException {

- logger.info("[CiscoBgpAdapter] Webservice takeAction call received");
+ logger.info("[CiscoBgpAdapter][takeAction] Webservice takeAction
call received");

Metadata[] metadata = request.getMetadataArray();
Subject s = metadata[0].getSubject();
@@ -382,13 +381,13 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoBgpAdapter][takeAction] SubjectString: " +
subject);

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
//eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoBgpAdapter][takeAction] EventTypeString: " +
eventTypeString);

CiscoBgpAdapter adapter = new CiscoBgpAdapter();

@@ -408,20 +407,21 @@

} catch (NumberFormatException e1) {

-
logger.error("[CISCOBGPADAPTER][TakeAction]"+e1.getStackTrace().toString());
+ logger.error("[CiscoBgpAdapter][takeAction] One of the numbers
in the metadata" +
+ " configuration file is not parsable:
"+e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

-
logger.error("[CISCOBGPADAPTER][TakeAction]"+e1.getStackTrace().toString());
+
logger.error("[CiscoBgpAdapter][takeAction]"+e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoStatusAdapter] TelnetManager created: " + url +
" " + port);
+ logger.debug("[CiscoBgpAdapter][takeAction] TelnetManager created: "
+ url + " " + port);

try {

@@ -429,13 +429,13 @@

} catch (PerfSONARException e) {

-
logger.error("[CISCOBGPADAPTER][TakeAction]"+e.getStackTrace().toString());
+ logger.error("[CiscoBgpAdapter][takeAction] Unable to retrieve
prompt: "+e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve prompt");

}

- logger.debug("[CiscoStatusAdapter] Prompt set in TelnetManager: " +
prompt);
+ logger.debug("[CiscoStatusAdapter][takeAction] Prompt set in
TelnetManager: " + prompt);

//This private method call will include all supported methods
//that can be performed on the remote device
@@ -455,7 +455,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoBgpAdapter][takeAction] Parameter value:
" + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -479,12 +479,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoBgpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoBgpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -515,12 +515,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoBgpAdapter][takeAction] Cached result
returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoBgpAdapter][takeAction] Cached result
removed");
it.remove();

}
@@ -542,7 +542,7 @@

}

- logger.info("[CiscoBgpAdapter] Command executed succesfully");
+ logger.info("[CiscoBgpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -551,7 +551,7 @@
datum.setDatum(temp);
}

- logger.info("[CiscoBgpAdapter] Constructing response message");
+ logger.info("[CiscoBgpAdapter][takeAction] Constructing response
message");

Message response = new Message();


Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -70,6 +70,8 @@
// ---------------------- constructors
public CiscoKeyBgpAdapter() throws PerfSONARException {

+
+
try {

logger = (LoggerComponent)
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);
@@ -84,13 +86,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOKEYBGPADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoKeyBgpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoKeyBgpAdapter] Constructor finished");
+ logger.info("[CiscoKeyBgpAdapter] Constructor finished");

}// CiscoKeyBgpAdapter

@@ -100,7 +102,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoKeyBgpAdapter] getAvailableSpecificCommands
called");
+ logger.info("[CiscoKeyBgpAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -110,7 +112,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoKeyBgpAdapter] setAvailableSpecificCommand
called");
+ logger.info("[CiscoKeyBgpAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -120,7 +122,7 @@
*/
public void addAvailableSpecificCommand(BgpCommandInterface command) {

- logger.debug("[CiscoKeyBgpAdapter] addAvailableSpecificCommand
called");
+ logger.info("[CiscoKeyBgpAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -131,7 +133,7 @@
public BgpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoKeyBgpAdapter] getCommand called");
+ logger.info("[CiscoKeyBgpAdapter] getCommand called");

BgpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -142,7 +144,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoKeyBgpAdapter] Command found");
+ logger.debug("[CiscoKeyBgpAdapter][getCommand] Command
found: " + command);
return command;

}
@@ -159,11 +161,10 @@
*/
public BgpCommandInterface executeCommand(BgpCommandInterface command) {

- logger.debug("[CiscoKeyBgpAdapter] executeCommand called");
+ logger.info("[CiscoKeyBgpAdapter] executeCommand called");

if (manager != null) {

- logger.info("Executing command");
String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());

command.setResult(temp2);
@@ -171,9 +172,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoKeyBgpAdapter][execute Command] New result
returned");
cachedResults.add(command);
- logger.debug("[JuniperStatusAdapter] executeCommand finished");
+ logger.debug("[CiscoKeyBgpAdapter] executeCommand finished");
return command;

}// executeCommand
@@ -205,19 +206,19 @@
} else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}

- logger.info("[CiscoKeyBgpAdapter] Trying to connect");
+ logger.debug("[CiscoKeyBgpAdapter] Trying to connect");

//if (passphrase == null || passphrase.equals("")) {
//manager.connect(username, keyUrl);
//} else {
//manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
//}
- logger.info("[CiscoKeyBgpAdapter] Login");
+ logger.debug("[CiscoKeyBgpAdapter][connect] Logged in");

} catch (Exception e) {

logger.error("[CiscoKeyBgpAdapter][Connect] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");
}
@@ -268,7 +269,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[CiscoKeyBgpAdapter] Configuring available operations
...");
+ logger.info("[CiscoKeyBgpAdapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -286,13 +287,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CiscoKeyBgpAdapter][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoKeyBgpAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CiscoKeyBgpAdapter][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoKeyBgpAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -304,13 +305,13 @@

} catch (PerfSONARException e) {

- logger.error("[CiscoKeyBgpAdapter][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[CiscoKeyBgpAdapter][ConfigureCommands] Unable to
retrieve commands: " + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[CiscoKeyBgpAdapter] Available operations configured");
+ logger.info("[CiscoKeyBgpAdapter] Available operations configured");

}

@@ -378,14 +379,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoKeyBgpAdapter][takeAction] SubjectString: " +
subject);

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
//eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));


- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoKeyBgpAdapter][takeAction] EventTypeString: " +
eventTypeString);

//CiscoKeyBgpAdapter adapter = new CiscoKeyBgpAdapter();

@@ -405,20 +406,21 @@

} catch (NumberFormatException e1) {

- logger.error("[CiscoKeyBgpAdapter][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoKeyBgpAdapter][takeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[CiscoKeyBgpAdapter][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoKeyBgpAdapter][takeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoKeyBgpAdapter] TelnetManager created: " + url +
" " + port);
+ logger.debug("[CiscoKeyBgpAdapter][takeAction] SshKeyManager
created: " + url + " " + port);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -436,7 +438,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoKeyBgpAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -460,12 +462,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoKeyBgpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoKeyBgpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -496,12 +498,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoKeyBgpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoKeyBgpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -523,7 +525,7 @@

}

- logger.info("[CiscoKeyBgpAdapter] Command executed succesfully");
+ logger.info("[CiscoKeyBgpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();

@@ -533,7 +535,7 @@
datum.setDatum(temp);
}

- logger.info("[CiscoKeyBgpAdapter] Constructing response message");
+ logger.info("[CiscoKeyBgpAdapter][takeAction] Constructing response
message");

Message response = new Message();


Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -82,16 +82,14 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSSHBGPADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoSshBgpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshYE.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoSshBgpAdapter] Constructor started");
+ logger.info("[CiscoSshBgpAdapter] Constructor finished");

- logger.debug("[CiscoSshBgpAdapter] Constructor finished");
-
}// CiscoSshBgpAdapter

// ---------------------- public methods
@@ -100,7 +98,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoSshBgpAdapter] getAvailableSpecificCommands
called");
+ logger.info("[CiscoSshBgpAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -110,7 +108,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoSshBgpAdapter] setAvailableSpecificCommand
called");
+ logger.info("[CiscoSshBgpAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -120,7 +118,7 @@
*/
public void addAvailableSpecificCommand(BgpCommandInterface command) {

- logger.debug("[CiscoSshBgpAdapter] addAvailableSpecificCommand
called");
+ logger.info("[CiscoSshBgpAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -131,7 +129,7 @@
public BgpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoSshBgpAdapter] getCommand called");
+ logger.info("[CiscoSshBgpAdapter] getCommand called");

BgpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -142,7 +140,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoSshBgpAdapter] Command found");
+ logger.debug("[CiscoSshBgpAdapter][getCommand] Command
found: " + command);
return command;

}
@@ -159,7 +157,7 @@
*/
public BgpCommandInterface executeCommand(BgpCommandInterface command) {

- logger.debug("[CiscoSshBgpAdapter] executeCommand called");
+ logger.info("[CiscoSshBgpAdapter] executeCommand called");

if (manager != null) {

@@ -169,7 +167,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoSshBgpAdapter][execute Command] New result
returned");
cachedResults.add(command);
logger.debug("[CiscoSshBgpAdapter] executeCommand finished");
return command;
@@ -204,16 +202,16 @@

}

- logger.info("[CiscoSshBgpAdapter] Trying to connect");
+ logger.info("[CiscoSshBgpAdapter][connect] Trying to connect");

//manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");

- logger.info("[CiscoSshBgpAdapter Login");
+ logger.info("[CiscoSshBgpAdapter][connect] Logged in");

} catch (Exception e) {

logger.error("[CiscoSshBgpAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -265,7 +263,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[CiscoSshBgpAdapter] Configuring available operations
...");
+ logger.info("[CiscoSshBgpAdapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -284,13 +282,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOSSHBGPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoSshBgpAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOSSHBGPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoSshBgpAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -302,13 +300,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSSHBGPADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[CiscoSshBgpAdapter][ConfigureCommands] Unable to
retrieve commands: " + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[CiscoSshBgpAdapter] Available operations configured");
+ logger.info("[CiscoSshBgpAdapter] Available operations configured");

}

@@ -378,14 +376,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoSshBgpAdapter][takeAction] SubjectString: " +
subject);

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
//eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));


- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoSshBgpAdapter][takeAction] EventTypeString: " +
eventTypeString);

//CiscoSshBgpAdapter adapter = new CiscoSshBgpAdapter();

@@ -407,20 +405,21 @@

} catch (NumberFormatException e1) {

- logger.error("[CISCOSSHBGPADAPTER][TakeAction]" +
e1.getStackTrace()[0].toString());
+ logger.error("[CiscoSshBgpAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[CISCOSSHBGPADAPTER][TakeAction]" +
e1.getStackTrace()[0].toString());
+ logger.error("[CiscoSshBgpAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoStatusAdapter] SshManager created: " + url + " "
+ port);
+ logger.debug("[CiscoStatusAdapter][takeAction] SshManager created: "
+ url + " " + port);

//This private method call will include all supported methods
//that can be performed on the remote device
@@ -440,7 +439,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoSshBgpAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -464,12 +463,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoSshBgpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoSshBgpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -500,12 +499,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoSshBgpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoSshBgpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -527,7 +526,7 @@

}

- logger.info("[CiscoSshBgpAdapter] Command executed succesfully");
+ logger.info("[CiscoSshBgpAdapter][takeAction] Command executed
succesfully");
logger.debug("" + valid);

Datum datum = new Datum();
@@ -537,7 +536,7 @@
datum.setDatum(temp);
}

- logger.info("[CiscoSshBgpAdapter] Constructing response message");
+ logger.info("[CiscoSshBgpAdapter][takeAction] Constructing response
message");

Message response = new Message();


Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -83,13 +83,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERBGPADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperBgpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperBgpAdapter] Constructor finished");
+ logger.info("[JuniperBgpAdapter] Constructor finished");

}// JuniperBgpAdapter

@@ -99,7 +99,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperBgpAdapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperBgpAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -109,7 +109,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperBgpAdapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperBgpAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -119,7 +119,7 @@
*/
public void addAvailableSpecificCommand(BgpCommandInterface command) {

- logger.debug("[JuniperBgpAdapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperBgpAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -130,7 +130,7 @@
public BgpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperBgpAdapter] getCommand called");
+ logger.info("[JuniperBgpAdapter] getCommand called");

BgpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -141,7 +141,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperBgpAdapter] Command found");
+ logger.debug("[JuniperBgpAdapter][getCommand] Command found:
" + command);
return command;

}
@@ -158,7 +158,7 @@
*/
public BgpCommandInterface executeCommand(BgpCommandInterface command) {

- logger.debug("[JuniperStatusAdapter] executeCommand called");
+ logger.info("[JuniperStatusAdapter] executeCommand called");

if (manager != null) {

@@ -173,9 +173,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperBgpAdapter][executeCommand] New result
returned");
cachedResults.add(command);
- logger.debug("[JuniperStatusAdapter] executeCommand finished");
+ logger.debug("[JuniperBgpAdapter] executeCommand finished");
return command;

}// executeCommand
@@ -206,16 +206,17 @@

}

- logger.info("[JuniperBgpAdapter] Trying to connect");
+ logger.info("[JuniperBgpAdapter][connect] Trying to connect");

((TelnetManager)
manager).setPrompt(properties.getProperty(subject, "prompt"));
manager.connect(username, "login:",
PasswordEncryptor.decryptPassword(password), "Password:");
- logger.info("[JuniperBgpAdapter] Login");
+
+ logger.info("[JuniperBgpAdapter][connect] Logged in");

} catch (Exception e) {

logger.error("[JuniperBgpAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -267,7 +268,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[JuniperBgpAdapter] Configuring available operations
...");
+ logger.info("[JuniperBgpAdapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -286,13 +287,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERBGPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperBgpAdapter][ConfigureCommands]
MinParamCount not found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERBGPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperBgpAdapter][ConfigureCommands]
MaxParamCount not found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -304,13 +305,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERBGPADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperBgpAdapter][ConfigureCommands] Unable to
retrieve commands: " + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[JuniperBgpAdapter] Available operations configured");
+ logger.info("[JuniperBgpAdapter] Available operations configured");

}

@@ -386,14 +387,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperBgpAdapter][takeAction] SubjectString: " +
subject);

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
//eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));


- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperBgpAdapter][takeAction] EventTypeString: " +
eventTypeString);

JuniperBgpAdapter adapter = new JuniperBgpAdapter();

@@ -412,14 +413,15 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERBGPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperBgpAdapter][TakeAction] One of the numbers
in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERBGPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperBgpAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

@@ -433,7 +435,7 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERBGPADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[JuniperBgpAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve prompt");

@@ -457,7 +459,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperBgpAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -481,12 +483,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperBgpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperBgpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -517,12 +519,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperBgpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperBgpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -544,7 +546,7 @@

}

- logger.info("[JuniperBgpAdapter] Command executed succesfully");
+ logger.info("[JuniperBgpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();

@@ -554,7 +556,7 @@
datum.setDatum(temp);
}

- logger.info("[JuniperBgpAdapter] Constructing response message");
+ logger.info("[JuniperBgpAdapter][takeAction] Constructing response
message");

Message response = new Message();


Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -68,6 +68,8 @@

ciphertext = desCipher.doFinal(cleartext);

+ System.out.println("CipherText: " + ciphertext);
+
return Base64.encode(ciphertext);

//System.out.println("result.length()" + result.length());
@@ -149,5 +151,12 @@
return result;
}

+ public static void main (String[] args) {
+ //String encrypt = encryptPassword(args[0]);
+ //System.out.println("Encrypted Password : " + encrypt);
+
+ //System.out.println("Decrypted string: " + decryptPassword(encrypt));
+ System.out.println("Decrypted string: " + decryptPassword(args[0]));
+ }

}

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -22,6 +22,7 @@
import org.ggf.ns.nmwg.topology.v2_0.EndPoint;
import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
import org.perfsonar.base.auxiliary.ComponentNames;
+import
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
@@ -50,6 +51,7 @@

// ---------------------- class-fields
private LoggerComponent logger = null;
+ private ConfigurationComponent configuration = null;
private MetadataConfiguration properties = null;
private CiscoIpAdapter ciscoIpAdapter = null;
private CiscoIpv6Adapter ciscoIpv6Adapter = null;
@@ -68,6 +70,8 @@

this.serviceEngineType =
"service.MeasurementPoint.TELNETSSHType";

+ this.configuration = (ConfigurationComponent)
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.CONFIG);
+
ciscoIpAdapter = new CiscoIpAdapter();
ciscoIpv6Adapter = new CiscoIpv6Adapter();
ciscoStatusAdapter = new CiscoStatusAdapter();
@@ -135,19 +139,24 @@
long rateLong = Long.parseLong(rate);

try {
- FileInputStream in = new FileInputStream("token_" +
subjectString);
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
+ FileInputStream in = new FileInputStream(path + "token_" +
subjectString);
ObjectInputStream is = new ObjectInputStream(in);
last = is.readLong();
is.close();

- FileOutputStream out = new FileOutputStream("token_" +
subjectString);
+ FileOutputStream out = new FileOutputStream(path + "token_" +
subjectString);
ObjectOutputStream s = new ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e) {
-
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
try {
- FileOutputStream out = new FileOutputStream("token_" +
subjectString);
+ FileOutputStream out = new FileOutputStream(path + "token_"
+ subjectString);
ObjectOutputStream s = new ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());
s.flush();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -22,6 +22,7 @@
import org.ggf.ns.nmwg.topology.v2_0.EndPoint;
import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
import org.perfsonar.base.auxiliary.ComponentNames;
+import
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
@@ -50,6 +51,7 @@

// ---------------------- class-fields
private LoggerComponent logger = null;
+ private ConfigurationComponent configuration = null;
private MetadataConfiguration properties = null;
private CiscoKeyIpAdapter ciscoKeyIpAdapter = null;
private CiscoKeyIpv6Adapter ciscoKeyIpv6Adapter = null;
@@ -68,6 +70,8 @@

this.serviceEngineType =
"service.MeasurementPoint.TELNETSSHType";

+ this.configuration = (ConfigurationComponent)
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.CONFIG);
+
ciscoKeyIpAdapter = new CiscoKeyIpAdapter();
ciscoKeyIpv6Adapter = new CiscoKeyIpv6Adapter();
ciscoKeyStatusAdapter = new CiscoKeyStatusAdapter();
@@ -134,19 +138,24 @@
long rateLong = Long.parseLong(rate);

try {
- FileInputStream in = new FileInputStream("token_" +
subjectString);
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
+ FileInputStream in = new FileInputStream(path + "token_" +
subjectString);
ObjectInputStream is = new ObjectInputStream(in);
last = is.readLong();
is.close();

- FileOutputStream out = new FileOutputStream("token_" +
subjectString);
+ FileOutputStream out = new FileOutputStream(path + "token_" +
subjectString);
ObjectOutputStream s = new ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e) {
-
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
try {
- FileOutputStream out = new FileOutputStream("token_" +
subjectString);
+ FileOutputStream out = new FileOutputStream(path + "token_"
+ subjectString);
ObjectOutputStream s = new ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());
s.flush();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -30,6 +30,7 @@
import org.ggf.ns.nmwg.topology.v2_0.EndPoint;
import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
import org.perfsonar.base.auxiliary.ComponentNames;
+import
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
@@ -61,6 +62,8 @@
// ---------------------- class-fields

private LoggerComponent logger = null;
+
+ private ConfigurationComponent configuration = null;

private MetadataConfiguration properties = null;

@@ -85,7 +88,9 @@
properties.initStorage();

this.serviceEngineType =
"service.MeasurementPoint.TELNETSSHType";
-
+
+ this.configuration = (ConfigurationComponent)
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.CONFIG);
+
ciscoSshIpAdapter = new CiscoSshIpAdapter();
ciscoSshIpv6Adapter = new CiscoSshIpv6Adapter();
ciscoSshStatusAdapter = new CiscoSshStatusAdapter();
@@ -155,20 +160,25 @@
long rateLong = Long.parseLong(rate);

try {
- FileInputStream in = new FileInputStream("token_" +
subjectString);
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
+ FileInputStream in = new FileInputStream(path +
"token_" + subjectString);
ObjectInputStream is = new ObjectInputStream(in);
last = is.readLong();
is.close();

- FileOutputStream out = new FileOutputStream("token_"
+ FileOutputStream out = new FileOutputStream(path +
"token_"
+ subjectString);
ObjectOutputStream s = new ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e) {
-
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
try {
- FileOutputStream out = new
FileOutputStream("token_"
+ FileOutputStream out = new
FileOutputStream(path + "token_"
+ subjectString);
ObjectOutputStream s = new
ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -22,6 +22,7 @@
import org.ggf.ns.nmwg.topology.v2_0.EndPoint;
import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
import org.perfsonar.base.auxiliary.ComponentNames;
+import
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
@@ -50,6 +51,7 @@

// ---------------------- class-fields
private LoggerComponent logger = null;
+ private ConfigurationComponent configuration = null;
private MetadataConfiguration properties = null;
private JuniperIpAdapter juniperIpAdapter = null;
private JuniperIpv6Adapter juniperIpv6Adapter = null;
@@ -68,6 +70,8 @@

this.serviceEngineType =
"service.MeasurementPoint.TELNETSSHType";

+ this.configuration = (ConfigurationComponent)
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.CONFIG);
+
juniperIpAdapter = new JuniperIpAdapter();
juniperIpv6Adapter = new JuniperIpv6Adapter();
juniperStatusAdapter = new JuniperStatusAdapter();
@@ -135,19 +139,24 @@
long rateLong = Long.parseLong(rate);

try {
- FileInputStream in = new FileInputStream("token_" +
subjectString);
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
+ FileInputStream in = new FileInputStream(path + "token_" +
subjectString);
ObjectInputStream is = new ObjectInputStream(in);
last = is.readLong();
is.close();

- FileOutputStream out = new FileOutputStream("token_" +
subjectString);
+ FileOutputStream out = new FileOutputStream(path + "token_" +
subjectString);
ObjectOutputStream s = new ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e) {
-
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
try {
- FileOutputStream out = new FileOutputStream("token_" +
subjectString);
+ FileOutputStream out = new FileOutputStream(path + "token_"
+ subjectString);
ObjectOutputStream s = new ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());
s.flush();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -22,6 +22,7 @@
import org.ggf.ns.nmwg.topology.v2_0.EndPoint;
import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
import org.perfsonar.base.auxiliary.ComponentNames;
+import
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
@@ -52,6 +53,8 @@

private LoggerComponent logger = null;

+ private ConfigurationComponent configuration = null;
+
private MetadataConfiguration properties = null;

private JuniperKeyIpAdapter juniperKeyIpAdapter = null;
@@ -76,6 +79,8 @@

this.serviceEngineType =
"service.MeasurementPoint.TELNETSSHType";

+ this.configuration = (ConfigurationComponent)
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.CONFIG);
+
juniperKeyIpAdapter = new JuniperKeyIpAdapter();
juniperKeyIpv6Adapter = new JuniperKeyIpv6Adapter();
juniperKeyStatusAdapter = new
JuniperKeyStatusAdapter();
@@ -144,20 +149,25 @@
long rateLong = Long.parseLong(rate);

try {
- FileInputStream in = new FileInputStream("token_" +
subjectString);
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
+ FileInputStream in = new FileInputStream(path +
"token_" + subjectString);
ObjectInputStream is = new ObjectInputStream(in);
last = is.readLong();
is.close();

- FileOutputStream out = new FileOutputStream("token_"
+ FileOutputStream out = new FileOutputStream(path +
"token_"
+ subjectString);
ObjectOutputStream s = new ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e) {
-
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
try {
- FileOutputStream out = new
FileOutputStream("token_"
+ FileOutputStream out = new
FileOutputStream(path + "token_"
+ subjectString);
ObjectOutputStream s = new
ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -22,6 +22,7 @@
import org.ggf.ns.nmwg.topology.v2_0.EndPoint;
import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
import org.perfsonar.base.auxiliary.ComponentNames;
+import
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
@@ -54,6 +55,8 @@

private MetadataConfiguration properties = null;

+ private ConfigurationComponent configuration = null;
+
private JuniperSshIpAdapter juniperSshIpAdapter = null;

private JuniperSshIpv6Adapter juniperSshIpv6Adapter = null;
@@ -76,6 +79,8 @@

this.serviceEngineType =
"service.MeasurementPoint.TELNETSSHType";

+ this.configuration = (ConfigurationComponent)
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.CONFIG);
+
juniperSshIpAdapter = new JuniperSshIpAdapter();
juniperSshIpv6Adapter = new JuniperSshIpv6Adapter();
juniperSshStatusAdapter = new
JuniperSshStatusAdapter();
@@ -144,20 +149,25 @@
long rateLong = Long.parseLong(rate);

try {
- FileInputStream in = new FileInputStream("token_" +
subjectString);
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
+ FileInputStream in = new FileInputStream(path +
"token_" + subjectString);
ObjectInputStream is = new ObjectInputStream(in);
last = is.readLong();
is.close();

- FileOutputStream out = new FileOutputStream("token_"
+ FileOutputStream out = new FileOutputStream(path +
"token_"
+ subjectString);
ObjectOutputStream s = new ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e) {
-
+ String path =
configuration.getProperty("service.mp.tokenPath");
+ if (!path.endsWith("/"))
+ path = path + "/";
try {
- FileOutputStream out = new
FileOutputStream("token_"
+ FileOutputStream out = new
FileOutputStream(path + "token_"
+ subjectString);
ObjectOutputStream s = new
ObjectOutputStream(out);
s.writeLong(System.currentTimeMillis());

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -153,13 +153,13 @@
if (deviceElementOK && devices.contains(value)) {

logger.debug("Device: " + value);
- logger.debug("Device index: " +
devices.indexOf(value));
- logger.debug("Size of Count: " + count.length +
"\nindex of device: " + devices.indexOf(value));
+ //logger.debug("Device index: " +
devices.indexOf(value));
+ //logger.debug("Size of Count: " + count.length +
"\nindex of device: " + devices.indexOf(value));
count[devices.indexOf(value)]++;
- logger.debug("Count["+ devices.indexOf(value) + "]: "
+ count[devices.indexOf(value)]);
- logger.debug("Size of currentDevices: " +
currentDevices.length + "\nindex : " + i);
+ //logger.debug("Count["+ devices.indexOf(value) + "]:
" + count[devices.indexOf(value)]);
+ //logger.debug("Size of currentDevices: " +
currentDevices.length + "\nindex : " + i);
currentDevices[i] = devices.indexOf(value);
//contains the indexes of the devices in use
- logger.debug("currentDevices["+i+"]: " +
currentDevices[i]);
+ //logger.debug("currentDevices["+i+"]: " +
currentDevices[i]);

logger.debug("Number of current connections for
device \"" + value + "\": " + count[currentDevices[i]]);

@@ -371,7 +371,6 @@
metaparam.setParameterValue(configuration.getProperty(token,
"url"));
} catch (PerfSONARException e1) {

logger.debug("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse]
url parameter not found for device: "+ token);
-
logger.error("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse] "+
e1.getStackTrace()[0].toString());
}

metaParams.addChild(metaparam);
@@ -408,7 +407,6 @@

param1.setParameterValue(configuration.getProperty(token, innerToken,
"description"));
} catch (PerfSONARException e) {

logger.debug("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse]
description parameter not found for device: "+ token + " and command: " +
innerToken);
-
logger.error("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse] "+
e.getStackTrace()[0].toString());
}

Parameter param2 = new Parameter();
@@ -418,7 +416,6 @@

param2.setParameterValue(configuration.getProperty(token, innerToken,
"syntax"));
} catch (PerfSONARException e) {

logger.debug("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse]
syntax parameter not found for device: "+ token + " and command: " +
innerToken);
-
logger.error("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse] "+
e.getStackTrace()[0].toString());
}

Parameter param3 = new Parameter();
@@ -428,7 +425,6 @@

param3.setParameterValue(configuration.getProperty(token, innerToken,
"command"));
} catch (PerfSONARException e) {

logger.debug("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse]
command parameter not found for device: "+ token + " and command: " +
innerToken);
-
logger.error("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse] "+
e.getStackTrace()[0].toString());
}

params.addChild(param1);

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -163,8 +163,10 @@

if (manager != null) {

- manager.executeCommand(command.getCommand() + " " +
command.getParameterString());
- String temp2 = manager.executeCommand(" ");
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ manager.executeCommand(command.getCommand() + " " +
command.getParameterString() + " " + command.getSuffix());
+ else manager.executeCommand(command.getCommand() + " " +
command.getParameterString());
+ String temp2 = manager.executeCommand(" ");
//logger.debug("temp2: " + temp2);

manager.disconnect();
@@ -293,6 +295,10 @@
if (token.contains("IP_")) {

IpCommand command = new IpCommand(token,
properties.getProperty(subject, token, "command"));
+ if (token.endsWith("ADVERTISED"))
+ command.setSuffix("advertised-routes");
+ else if (token.endsWith("RECEIVED"))
+ command.setSuffix("received-routes");
try {
logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -192,9 +192,12 @@
if (manager != null) {

logger.debug("Executing command");
- String temp2 =
manager.executeCommand(command.getCommand() + " "
- + command.getParameterString());
-
+ String temp2 = "";
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
+ else temp2 = manager.executeCommand(command.getCommand() + "
" + command.getParameterString());
+
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());

@@ -326,6 +329,11 @@

IpCommand command = new
IpCommand(token, properties
.getProperty(subject,
token, "command"));
+ if (token.endsWith("ADVERTISED"))
+ command.setSuffix("advertised-routes");
+ else if (token.endsWith("RECEIVED"))
+ command.setSuffix("received-routes");
+
try {
int minParamCount =
Integer.parseInt(properties

.getProperty(subject, token, "minParamCount"));

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -165,7 +165,12 @@

if (manager != null) {

- String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());
+ String temp2 = "";
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
+ else temp2 = manager.executeCommand(command.getCommand() + "
" + command.getParameterString());
+
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());

@@ -290,6 +295,11 @@
if (token.contains("IP")) {

IpCommand command = new IpCommand(token,
properties.getProperty(subject, token, "command"));
+ if (token.endsWith("ADVERTISED"))
+ command.setSuffix("advertised-routes");
+ else if (token.endsWith("RECEIVED"))
+ command.setSuffix("received-routes");
+
try {
logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -163,8 +163,10 @@

if (manager != null) {

- manager.executeCommand(command.getCommand() + " " +
command.getParameterString());
- String temp2 = manager.executeCommand(" ");
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ manager.executeCommand(command.getCommand() + " " +
command.getParameterString() + " " + command.getSuffix());
+ else manager.executeCommand(command.getCommand() + " " +
command.getParameterString());
+ String temp2 = manager.executeCommand(" ");
//logger.debug("temp2: " + temp2);

manager.disconnect();
@@ -292,6 +294,10 @@
if (token.contains("IP_")) {

IpCommand command = new IpCommand(token,
properties.getProperty(subject, token, "command"));
+ if (token.equals("IP_INTERFACE"))
+ command.setSuffix("extensive");
+ else if (token.equals("IP_MULTICAST_SDP_PEER"))
+ command.setSuffix("detail");
try {
logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -167,8 +167,11 @@
if (manager != null) {

logger.debug("Executing command");
- String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());
-
+ String temp2 = "";
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
+ else temp2 = manager.executeCommand(command.getCommand() + "
" + command.getParameterString());
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());

@@ -297,6 +300,11 @@
if (token.contains("IP_")) {

IpCommand command = new IpCommand(token,
properties.getProperty(subject, token, "command"));
+ if (token.equals("IP_INTERFACE"))
+ command.setSuffix("extensive");
+ else if (token.equals("IP_MULTICAST_SDP_PEER"))
+ command.setSuffix("detail");
+
try {
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -166,8 +166,11 @@

if (manager != null) {

- String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());
- command.setResult(temp2);
+ String temp2 = "";
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
+ else temp2 = manager.executeCommand(command.getCommand() + "
" + command.getParameterString());
+ command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());

}// if
@@ -292,6 +295,11 @@
if (token.contains("IP_")) {

IpCommand command = new IpCommand(token,
properties.getProperty(subject, token, "command"));
+ if (token.equals("IP_INTERFACE"))
+ command.setSuffix("extensive");
+ else if (token.equals("IP_MULTICAST_SDP_PEER"))
+ command.setSuffix("detail");
+
try {
logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommand.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommand.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommand.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -25,6 +25,7 @@
private String description = null;
private String command = null;
private String result = null;
+ private String suffix = null;
private List parameters = null;
private int minParamCount = 0;
private int maxParamCount = 0;
@@ -111,6 +112,10 @@
return parameterString;

}
+
+ public String getSuffix() {
+ return suffix;
+ }

/* (non-Javadoc)
* @see
org.perfsonar.service.measurementPoint.lookingGlass.ipv6.commands.Ipv6CommandInterface#setCommand(java.lang.String)
@@ -204,4 +209,8 @@
this.timestamp = timestamp;

}
+
+ public void setSuffix(String suffix){
+ this.suffix = suffix;
+ }
}

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommandInterface.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommandInterface.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommandInterface.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -40,6 +40,8 @@
public abstract int getMaxParamCount();

public abstract long getTimestamp();
+
+ public abstract String getSuffix();

/**
* Returns a enumeration of the paramteres, converted into a space
@@ -64,4 +66,6 @@
public abstract void setMaxParamCount(int count);

public abstract void setTimestamp(long timestamp);
+
+ public abstract void setSuffix(String suffix);
}

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -166,8 +166,10 @@

if (manager != null) {

- manager.executeCommand(command.getCommand() + " " +
command.getParameterString());
- String temp2 = manager.executeCommand(" ");
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ manager.executeCommand(command.getCommand() + " " +
command.getParameterString() + " " + command.getSuffix());
+ else manager.executeCommand(command.getCommand() + " " +
command.getParameterString());
+ String temp2 = manager.executeCommand(" ");

manager.disconnect();

@@ -284,6 +286,11 @@
if (token.contains("IPv6")) {

Ipv6Command command = new Ipv6Command(token,
properties.getProperty(subject, token, "command"));
+ if (token.endsWith("ADVERTISED"))
+ command.setSuffix("advertised-routes");
+ else if (token.endsWith("RECEIVED"))
+ command.setSuffix("received-routes");
+
try {
logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -168,7 +168,11 @@
if (manager != null) {

logger.debug("Executing command");
- String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());
+ String temp2 = "";
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
+ else temp2 = manager.executeCommand(command.getCommand() + "
" + command.getParameterString());
+

command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());
@@ -288,6 +292,11 @@
if (token.contains("IPv6_")) {

Ipv6Command command = new Ipv6Command(token,
properties.getProperty(subject, token, "command"));
+ if (token.endsWith("ADVERTISED"))
+ command.setSuffix("advertised-routes");
+ else if (token.endsWith("RECEIVED"))
+ command.setSuffix("received-routes");
+
try {
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -165,8 +165,11 @@

if (manager != null) {

- String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());
- command.setResult(temp2);
+ String temp2 = "";
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
+ else temp2 = manager.executeCommand(command.getCommand() + "
" + command.getParameterString());
+ command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());

}// if
@@ -281,6 +284,11 @@
if (token.contains("IPv6")) {

Ipv6Command command = new Ipv6Command(token,
properties.getProperty(subject, token, "command"));
+ if (token.endsWith("ADVERTISED"))
+ command.setSuffix("advertised-routes");
+ else if (token.endsWith("RECEIVED"))
+ command.setSuffix("received-routes");
+
try {
logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -164,8 +164,10 @@

if (manager != null) {

- manager.executeCommand(command.getCommand() + " " +
command.getParameterString());
- String temp2 = manager.executeCommand(" ");
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ manager.executeCommand(command.getCommand() + " " +
command.getParameterString() + " " + command.getSuffix());
+ else manager.executeCommand(command.getCommand() + " " +
command.getParameterString());
+ String temp2 = manager.executeCommand(" ");

manager.disconnect();

@@ -282,6 +284,8 @@
if (token.contains("IPv6")) {

Ipv6Command command = new Ipv6Command(token,
properties.getProperty(subject, token, "command"));
+ if (token.equals("IPv6_INTERFACE"))
+ command.setSuffix("extensive");
try {
logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -168,8 +168,11 @@
if (manager != null) {

logger.debug("Executing command");
- String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());
-
+ String temp2 = "";
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
+ else temp2 = manager.executeCommand(command.getCommand() + "
" + command.getParameterString());
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());

@@ -287,6 +290,8 @@
if (token.contains("IPv6_")) {

Ipv6Command command = new Ipv6Command(token,
properties.getProperty(subject, token, "command"));
+ if (token.equals("IPv6_INTERFACE"))
+ command.setSuffix("extensive");
try {
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -165,7 +165,11 @@

if (manager != null) {

- String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());
+ String temp2 = "";
+ if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
+ temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
+ else temp2 = manager.executeCommand(command.getCommand() + "
" + command.getParameterString());
+
command.setResult(temp2);
command.setTimestamp(System.currentTimeMillis());

@@ -281,6 +285,8 @@
if (token.contains("IPv6_")) {

Ipv6Command command = new Ipv6Command(token,
properties.getProperty(subject, token, "command"));
+ if (token.equals("IPv6_INTERFACE"))
+ command.setSuffix("extensive");
try {
logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6Command.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6Command.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6Command.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -25,6 +25,7 @@
private String description = null;
private String command = null;
private String result = null;
+ private String suffix = null;
private List parameters = null;
private int minParamCount = 0;
private int maxParamCount = 0;
@@ -204,4 +205,14 @@
this.deviceName = deviceName;

}
+
+ public String getSuffix() {
+ return suffix;
+ }
+
+ public void setSuffix(String suffix) {
+ this.suffix = suffix;
+ }
+
+
}

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6CommandInterface.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6CommandInterface.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6CommandInterface.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -40,6 +40,8 @@
public abstract int getMaxParamCount();

public abstract long getTimestamp();
+
+ public abstract String getSuffix();

/**
* Returns a enumeration of the paramteres, converted into a space
@@ -64,4 +66,6 @@
public abstract void setMaxParamCount(int count);

public abstract void setTimestamp(long timestamp);
+
+ public abstract void setSuffix(String suffix);
}

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -184,7 +184,7 @@

public List getProperties(String property) throws PerfSONARException {

- logger.debug("[DbMetadataConfiguration] getProperties(" + property +
") called.");
+ //logger.debug("[DbMetadataConfiguration] getProperties(" + property
+ ") called.");


String query = "";
@@ -197,7 +197,7 @@
query += "return data($i)";
}

- logger.debug("[DbMetadataConfiguration] query: " + query);
+ //logger.debug("[DbMetadataConfiguration] query: " + query);

Object object = null;
try {
@@ -217,7 +217,7 @@
"DbMetadataConfiguration.getProperties: " + "Result
array of metadata search in null");
}

- logger.debug("DbMetadataConfiguration.getProperties: " + "The number
of elements returned as a result of xquery statement: " + xmlResults.length);
+ //logger.debug("DbMetadataConfiguration.getProperties: " + "The
number of elements returned as a result of xquery statement: " +
xmlResults.length);

if (xmlResults.length == 0) {
throw new PerfSONARException(
@@ -338,7 +338,7 @@
xmldbAccess, dataRepository);
storageManager.setResultType(
XmlDbStorageManager.STRING_ARRAY_TYPE);
-
+
return storageManager;

}

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
2008-06-18 13:50:29 UTC (rev 4020)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
2008-06-18 13:52:58 UTC (rev 4021)
@@ -123,6 +123,7 @@
telnet.connect(url, port);
logger.debug("Logging in ...");
telnet.login(userName, loginPrompt, passwd, passwdPrompt);
+
logger.debug("logged in !!");

} catch (IOException e) {

---

• perfsonar: r4021 - in branches/geant2_java-sshtelnet-mp-RELEASE: ant conf conf/axis-1.4/WEB-INF/classes/perfsonar/conf contrib/metadata_configuration_tools contrib/metadata_configuration_tools/CSV_Generator_script contrib/metadata_configuration_tools/CSV_Generator_script/conf contrib/metadata_configuration_tools/Configuration_Tool contrib/metadata_configuration_tools/Configuration_Tool/conf doc doc/commands src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip v6/commands src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/remote/telnet, svnlog, 06/18/2008

---

Archive powered by MHonArc 2.6.16.