Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2979 - in branches/SSHTelnet-MP-RELEASE: . ant ant/ssh conf conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands

Subject: perfsonar development work

List archive

perfsonar: r2979 - in branches/SSHTelnet-MP-RELEASE: . ant ant/ssh conf conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2979 - in branches/SSHTelnet-MP-RELEASE: . ant ant/ssh conf conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands
  • Date: Mon, 22 Oct 2007 05:00:02 -0400
Author: melis
Date: 2007-10-22 05:00:02 -0400 (Mon, 22 Oct 2007)
New Revision: 2979

Modified:
branches/SSHTelnet-MP-RELEASE/.classpath
branches/SSHTelnet-MP-RELEASE/ant/const.properties
branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-pre-install-targets.xml
branches/SSHTelnet-MP-RELEASE/conf/ciscobgpcommands.txt
branches/SSHTelnet-MP-RELEASE/conf/ciscoipcommands.txt
branches/SSHTelnet-MP-RELEASE/conf/ciscominimumpackage.txt
branches/SSHTelnet-MP-RELEASE/conf/ciscostatuscommands.txt
branches/SSHTelnet-MP-RELEASE/conf/juniperbgpcommands.txt
branches/SSHTelnet-MP-RELEASE/conf/juniperipcommands.txt
branches/SSHTelnet-MP-RELEASE/conf/juniperminimumpackage.txt

branches/SSHTelnet-MP-RELEASE/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class

branches/SSHTelnet-MP-RELEASE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java

branches/SSHTelnet-MP-RELEASE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands/ParameterChecker.java
Log:
Updated the source and configuration files to version 1.2.1

Modified: branches/SSHTelnet-MP-RELEASE/.classpath
===================================================================
--- branches/SSHTelnet-MP-RELEASE/.classpath 2007-10-20 09:04:26 UTC (rev
2978)
+++ branches/SSHTelnet-MP-RELEASE/.classpath 2007-10-22 09:00:02 UTC (rev
2979)
@@ -10,5 +10,5 @@
<classpathentry kind="lib" path="lib/remote/jsch-0.1.25.jar"/>
<classpathentry kind="lib" path="lib/remote/jta20.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="conf"/>
+ <classpathentry kind="output" path="build"/>
</classpath>

Modified: branches/SSHTelnet-MP-RELEASE/ant/const.properties
===================================================================
--- branches/SSHTelnet-MP-RELEASE/ant/const.properties 2007-10-20 09:04:26
UTC (rev 2978)
+++ branches/SSHTelnet-MP-RELEASE/ant/const.properties 2007-10-22 09:00:02
UTC (rev 2979)
@@ -1,22 +1,22 @@
-#This file was created by the Ant configuration script.
-#Wed Aug 01 18:54:23 CEST 2007
-package.root=org/perfsonar
-target.port=8080
-api.windowtitle=perfSONAR
-release.basename=perfSONAR
-deploy.root=perfSONAR-SSHTelnet-MP-1.2
-service.name=JAVA-SSHTELNET-MP-1.2
-api.bottom=JRA1 GEANT2 Project
-wsdd.path=org/perfsonar/service/web/wsdd
-release.servicename=perfSONAR-SSHTelnet-MP-1.2
-build=build
-api.title=perfSONAR
-tomcat.home=/opt/apache-tomcat-5.5.20
-wsdd.home=service/web/wsdd
-package.nmwg.root=org/ggf
-api.location=doc/api
-wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
-webservice.name=MeasurementPointService
-release.version=1.2
-target.server=localhost
-wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd
+#This file was created by the Ant configuration script.
+#Mon Sep 24 11:42:45 CEST 2007
+package.root=org/perfsonar
+target.port=8080
+api.windowtitle=perfSONAR
+release.basename=perfSONAR
+deploy.root=perfSONAR-SSHTelnet-MP-1.2.1
+service.name=JAVA-SSHTELNET-MP-1.2.1
+api.bottom=JRA1 GEANT2 Project
+wsdd.path=org/perfsonar/service/web/wsdd
+release.servicename=perfSONAR-SSHTelnet-MP-1.2.1
+build=build
+api.title=perfSONAR
+tomcat.home=/opt/apache-tomcat-5.5.20
+wsdd.home=service/web/wsdd
+package.nmwg.root=org/ggf
+api.location=doc/api
+wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
+webservice.name=MeasurementPointService
+release.version=1.2.1
+target.server=localhost
+wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd

Modified:
branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-pre-install-targets.xml
===================================================================
--- branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-pre-install-targets.xml
2007-10-20 09:04:26 UTC (rev 2978)
+++ branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-pre-install-targets.xml
2007-10-22 09:00:02 UTC (rev 2979)
@@ -3,7 +3,7 @@
<!-- ===================================================================
<description>

- $Id: sshtelnetMP-pre-install-targets.xml 2676 2007-08-20 09:06:13Z melis $
+ $Id: sshtelnetMP-pre-install-targets.xml 2861 2007-09-24 10:11:08Z melis $
project: perfSONAR
author: svrstich
credits: Roman
@@ -17,7 +17,7 @@

<project name="sshtelnetmp-pre-install-targets">

- <property name="service.name" value="JAVA-SSHTELNET-MP-1.2" />
+ <property name="service.name" value="JAVA-SSHTELNET-MP-1.2.1" />

<property file="ant/const.properties" />


Modified: branches/SSHTelnet-MP-RELEASE/conf/ciscobgpcommands.txt
===================================================================
--- branches/SSHTelnet-MP-RELEASE/conf/ciscobgpcommands.txt 2007-10-20
09:04:26 UTC (rev 2978)
+++ branches/SSHTelnet-MP-RELEASE/conf/ciscobgpcommands.txt 2007-10-22
09:00:02 UTC (rev 2979)
@@ -1,7 +1,7 @@
-BGP_ROUTE_IPv4@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing table@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+BGP_ROUTE_IPv4@@@show ip bgp@@@1@@@1@@@cache@@@show bgp routing table@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
BGP_SUMMARY@@@show ip bgp summary@@@0@@@0@@@cache@@@show status of all BGP
connections@@@---@@@---
BGP_DAMPENED_PATHS@@@show ip bgp dampening
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
-BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbour@@@2@@@2@@@cache@@@show
advertised prefixes from <ip address>@@@<ip address>
advertised-routes@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?
advertised-routes$
-BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbour@@@2@@@2@@@cache@@@show
received prefixes from <ip address>@@@<ip address>
received-routes@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?
received-routes$
+BGP_NEIGHBOUR_ADVERTISED@@@show ip bgp neighbour@@@2@@@2@@@cache@@@show
advertised prefixes from <ip address>@@@<ip address>
advertised-routes@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
advertised-routes$
+BGP_NEIGHBOUR_RECEIVED@@@show ip bgp neighbour@@@2@@@2@@@cache@@@show
received prefixes from <ip address>@@@<ip address>
received-routes@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?
received-routes$
BGP_DAMPENING_FLAP-STATISTICS@@@show ip bgp dampening
flap-statistics@@@0@@@0@@@cache@@@display information about all currently
flapping BGP routes@@@---@@@---
-BGP_MULTICAST_TABLE_IPv4@@@show ip bgp ipv4
multicast@@@1@@@1@@@cache@@@display ipv4 multicast table@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
\ No newline at end of file
+BGP_MULTICAST_TABLE_IPv4@@@show ip bgp ipv4
multicast@@@1@@@1@@@cache@@@display ipv4 multicast table@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
\ No newline at end of file

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

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

Modified: branches/SSHTelnet-MP-RELEASE/conf/ciscostatuscommands.txt
===================================================================
--- branches/SSHTelnet-MP-RELEASE/conf/ciscostatuscommands.txt 2007-10-20
09:04:26 UTC (rev 2978)
+++ branches/SSHTelnet-MP-RELEASE/conf/ciscostatuscommands.txt 2007-10-22
09:00:02 UTC (rev 2979)
@@ -2,7 +2,7 @@
STATUS_INTERFACE_STATS@@@show interface@@@1@@@1@@@cache@@@show interface
statistics@@@<interface>@@@---
STATUS_INTERFACE_DESCRIPTION@@@show interface
description@@@0@@@0@@@cache@@@show interface descriptions@@@---@@@---
STATUS_SHOW_MODULE@@@show module@@@0@@@0@@@cache@@@display hardware module
status and information@@@---@@@---
-STATUS_SHOW_INTERFACE_CONFIGURATION@@@show running
interface@@@1@@@1@@@cache@@@display the interface configuration for
<interface>@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+STATUS_SHOW_INTERFACE_CONFIGURATION@@@show running
interface@@@1@@@1@@@cache@@@display the interface configuration for
<interface>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
STATUS_SOFTWARE_VERSION@@@show version@@@0@@@0@@@cache@@@show the current
router software version@@@---@@@---
STATUS_SHOW_MPLS_L2_VC@@@show mpls l2transport vc@@@0@@@0@@@cache@@@display
information about Any Transport over MPLS (AToM) virtual circuits
(VCs)@@@---@@@---
STATUS_SHOW_MPLS_L2_VC_DETAIL@@@show mpls l2transport vc
detail@@@0@@@0@@@cache@@@display detailed information about Any Transport
over MPLS (AToM) virtual circuits (VCs)@@@---@@@---

Modified: branches/SSHTelnet-MP-RELEASE/conf/juniperbgpcommands.txt
===================================================================
--- branches/SSHTelnet-MP-RELEASE/conf/juniperbgpcommands.txt 2007-10-20
09:04:26 UTC (rev 2978)
+++ branches/SSHTelnet-MP-RELEASE/conf/juniperbgpcommands.txt 2007-10-22
09:00:02 UTC (rev 2979)
@@ -1,6 +1,6 @@
-BGP_ROUTE_IPv4@@@show route protocol bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<ip address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
+BGP_ROUTE_IPv4@@@show route protocol bgp@@@1@@@1@@@cache@@@show bgp routing
table@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
BGP_SUMMARY@@@show bgp summary@@@0@@@0@@@cache@@@show status of all BGP
connections@@@---@@@---
BGP_DAMPENED_PATHS@@@show route protocol bgp damping decayed
detail@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
-BGP_NEIGHBOUR_ADVERTISED@@@show route advertising-protocol
bgp@@@1@@@1@@@cache@@@show advertised prefixes from <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-BGP_NEIGHBOUR_RECEIVED@@@show route receive-protocol
bgp@@@1@@@1@@@cache@@@show received prefixes from <ip address>@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
-BGP_MULTICAST_TABLE_IPv4@@@show route protocol bgp table
inet.2@@@1@@@1@@@cache@@@display ipv4 multicast table@@@<ip
address>@@@^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]{1,2})?$
\ No newline at end of file
+BGP_NEIGHBOUR_ADVERTISED@@@show route advertising-protocol
bgp@@@1@@@1@@@cache@@@show advertised prefixes from <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+BGP_NEIGHBOUR_RECEIVED@@@show route receive-protocol
bgp@@@1@@@1@@@cache@@@show received prefixes from <ip address>@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
+BGP_MULTICAST_TABLE_IPv4@@@show route protocol bgp table
inet.2@@@1@@@1@@@cache@@@display ipv4 multicast table@@@<ip
address>@@@^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[0-9]{1,2})?$
\ No newline at end of file

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

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

Modified:
branches/SSHTelnet-MP-RELEASE/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class
===================================================================
(Binary files differ)

Modified:
branches/SSHTelnet-MP-RELEASE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
===================================================================
---
branches/SSHTelnet-MP-RELEASE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-10-20 09:04:26 UTC (rev 2978)
+++
branches/SSHTelnet-MP-RELEASE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-10-22 09:00:02 UTC (rev 2979)
@@ -145,8 +145,8 @@

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

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

Modified:
branches/SSHTelnet-MP-RELEASE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands/ParameterChecker.java
===================================================================
---
branches/SSHTelnet-MP-RELEASE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands/ParameterChecker.java
2007-10-20 09:04:26 UTC (rev 2978)
+++
branches/SSHTelnet-MP-RELEASE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands/ParameterChecker.java
2007-10-22 09:00:02 UTC (rev 2979)
@@ -36,8 +36,8 @@
public boolean checkParam(String subject, String eventTypeString,
String parameter) {

+

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

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

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

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

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

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

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

return ok;


  • perfsonar: r2979 - in branches/SSHTelnet-MP-RELEASE: . ant ant/ssh conf conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/commands, svnlog, 10/22/2007

Archive powered by MHonArc 2.6.16.

Top of Page