Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4002 - in trunk/geant2_java-sshtelnet-mp: ant conf conf/axis-1.4/WEB-INF/classes/perfsonar/conf contrib/metadata_configuration_tools/CSV_Generator_script/conf contrib/metadata_configuration_tools/Configuration_Tool/conf doc doc/commands 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/ipv6/commands

Subject: perfsonar development work

List archive

perfsonar: r4002 - in trunk/geant2_java-sshtelnet-mp: ant conf conf/axis-1.4/WEB-INF/classes/perfsonar/conf contrib/metadata_configuration_tools/CSV_Generator_script/conf contrib/metadata_configuration_tools/Configuration_Tool/conf doc doc/commands 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/ipv6/commands


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4002 - in trunk/geant2_java-sshtelnet-mp: ant conf conf/axis-1.4/WEB-INF/classes/perfsonar/conf contrib/metadata_configuration_tools/CSV_Generator_script/conf contrib/metadata_configuration_tools/Configuration_Tool/conf doc doc/commands 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/ipv6/commands
  • Date: Thu, 12 Jun 2008 10:38:17 -0400
Author: melis
Date: 2008-06-12 10:38:17 -0400 (Thu, 12 Jun 2008)
New Revision: 4002

Added:

trunk/geant2_java-sshtelnet-mp/doc/commands/commands-complete-list-v6-AI.xls
trunk/geant2_java-sshtelnet-mp/doc/commands/commands-minimum-list-v6-SM.xls
trunk/geant2_java-sshtelnet-mp/doc/sshtelnetsample.xml
Removed:
trunk/geant2_java-sshtelnet-mp/conf/commands-complete-list.xls
trunk/geant2_java-sshtelnet-mp/conf/commands_minimum_set.xls

trunk/geant2_java-sshtelnet-mp/doc/commands/commands-complete-list-v5-SM.xls
trunk/geant2_java-sshtelnet-mp/doc/commands/commands_minimum_set-v5-SM.xls
Modified:
trunk/geant2_java-sshtelnet-mp/ant/const.properties
trunk/geant2_java-sshtelnet-mp/ant/const.properties.template

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperminimumpackage.txt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6CommandInterface.java
Log:
added the fix for the design flaw in SSHTELNET MP

delete the commands-complete-list.xls and commands_minimum_set.xls, because
these are already found in doc/commands

also added a sample metadata configuration file: sshtelnetsample.xml

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-06-12 13:20:25
UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-06-12 14:38:17
UTC (rev 4002)
@@ -11,7 +11,7 @@
service.name=geant2-java-sshtelnet-mp

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

exist.war.file=exist-1.0.1.war

exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.0.1

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2008-06-12 13:20:25 UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2008-06-12 14:38:17 UTC (rev 4002)
@@ -11,7 +11,7 @@
service.name=geant2-java-sshtelnet-mp

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

exist.war.file=exist-1.0.1.war

exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.0.1

Modified:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
===================================================================
---
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
2008-06-12 14:38:17 UTC (rev 4002)
@@ -80,7 +80,7 @@

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

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

Modified:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
===================================================================
---
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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: trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt 2008-06-12
13:20:25 UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt 2008-06-12
14:38:17 UTC (rev 4002)
@@ -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: trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt 2008-06-12
13:20:25 UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt 2008-06-12
14:38:17 UTC (rev 4002)
@@ -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: trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt 2008-06-12
13:20:25 UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt 2008-06-12
14:38:17 UTC (rev 4002)
@@ -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: trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt 2008-06-12
13:20:25 UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt 2008-06-12
14:38:17 UTC (rev 4002)
@@ -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})?$

Deleted: trunk/geant2_java-sshtelnet-mp/conf/commands-complete-list.xls

Deleted: trunk/geant2_java-sshtelnet-mp/conf/commands_minimum_set.xls

Modified: trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt 2008-06-12
13:20:25 UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt 2008-06-12
14:38:17 UTC (rev 4002)
@@ -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: trunk/geant2_java-sshtelnet-mp/conf/juniperipv6commands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/juniperipv6commands.txt 2008-06-12
13:20:25 UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/conf/juniperipv6commands.txt 2008-06-12
14:38:17 UTC (rev 4002)
@@ -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: trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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: trunk/geant2_java-sshtelnet-mp/conf/service.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties 2008-06-12
13:20:25 UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties 2008-06-12
14:38:17 UTC (rev 4002)
@@ -80,7 +80,7 @@

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

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

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
2008-06-12 13:20:25 UTC (rev 4001)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
2008-06-12 14:38:17 UTC (rev 4002)
@@ -80,7 +80,7 @@

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

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

Modified:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscobgpcommands.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscobgpcommands.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscobgpcommands.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipcommands.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipcommands.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipcommands.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipv6commands.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipv6commands.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperipv6commands.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperminimumpackage.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperminimumpackage.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/conf/juniperminimumpackage.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscobgpcommands.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscobgpcommands.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscobgpcommands.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipcommands.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipcommands.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipcommands.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipv6commands.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipv6commands.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperipv6commands.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperminimumpackage.txt
===================================================================
---
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperminimumpackage.txt
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/Configuration_Tool/conf/juniperminimumpackage.txt
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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

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

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


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

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


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

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

Added: trunk/geant2_java-sshtelnet-mp/doc/sshtelnetsample.xml

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommand.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommand.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommand.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommandInterface.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommandInterface.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/commands/IpCommandInterface.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6Command.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6Command.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6Command.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6CommandInterface.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6CommandInterface.java
2008-06-12 13:20:25 UTC (rev 4001)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/commands/Ipv6CommandInterface.java
2008-06-12 14:38:17 UTC (rev 4002)
@@ -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);
}


  • perfsonar: r4002 - in trunk/geant2_java-sshtelnet-mp: ant conf conf/axis-1.4/WEB-INF/classes/perfsonar/conf contrib/metadata_configuration_tools/CSV_Generator_script/conf contrib/metadata_configuration_tools/Configuration_Tool/conf doc doc/commands 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/ipv6/commands, svnlog, 06/12/2008

Archive powered by MHonArc 2.6.16.

Top of Page