Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3079 - in trunk/geant2_java-sshtelnet-mp: conf src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters

Subject: perfsonar development work

List archive

perfsonar: r3079 - in trunk/geant2_java-sshtelnet-mp: conf src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3079 - in trunk/geant2_java-sshtelnet-mp: conf src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters
  • Date: Thu, 29 Nov 2007 05:24:46 -0500
Author: melis
Date: 2007-11-29 05:24:45 -0500 (Thu, 29 Nov 2007)
New Revision: 3079

Modified:
trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt
trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt
trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt
trunk/geant2_java-sshtelnet-mp/conf/ciscostatuscommands.txt
trunk/geant2_java-sshtelnet-mp/conf/juniperbgpcommands.txt
trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt
trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
trunk/geant2_java-sshtelnet-mp/conf/service.properties

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

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

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/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/status/adapters/CiscoKeyStatusAdapter.java

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

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

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

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

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
Log:
added development for password encryption in service.properties file

Modified: trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt 2007-11-28
10:15:48 UTC (rev 3078)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscobgpcommands.txt 2007-11-29
10:24:45 UTC (rev 3079)
@@ -1,7 +1,7 @@
-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_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]{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_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]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[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: trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt 2007-11-28
10:15:48 UTC (rev 3078)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscoipcommands.txt 2007-11-29
10:24:45 UTC (rev 3079)
@@ -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]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(\/[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]{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_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]{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})?$
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]{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_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]{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
+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: trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt 2007-11-28
10:15:48 UTC (rev 3078)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt 2007-11-29
10:24:45 UTC (rev 3079)
@@ -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]{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})?$
+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]{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
+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: trunk/geant2_java-sshtelnet-mp/conf/ciscostatuscommands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscostatuscommands.txt 2007-11-28
10:15:48 UTC (rev 3078)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscostatuscommands.txt 2007-11-29
10:24:45 UTC (rev 3079)
@@ -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]{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})?$
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: trunk/geant2_java-sshtelnet-mp/conf/juniperbgpcommands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/juniperbgpcommands.txt 2007-11-28
10:15:48 UTC (rev 3078)
+++ trunk/geant2_java-sshtelnet-mp/conf/juniperbgpcommands.txt 2007-11-29
10:24:45 UTC (rev 3079)
@@ -1,6 +1,6 @@
-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_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]{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
+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: trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt 2007-11-28
10:15:48 UTC (rev 3078)
+++ trunk/geant2_java-sshtelnet-mp/conf/juniperipcommands.txt 2007-11-29
10:24:45 UTC (rev 3079)
@@ -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]{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_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]{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_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 rapid count 5@@@4@@@4@@@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 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_PING@@@ping rapid count 5@@@4@@@4@@@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 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]{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
+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: trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
2007-11-28 10:15:48 UTC (rev 3078)
+++ trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
2007-11-29 10:24:45 UTC (rev 3079)
@@ -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]{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})?$
+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@@@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_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]{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
+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: trunk/geant2_java-sshtelnet-mp/conf/service.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties 2007-11-28
10:15:48 UTC (rev 3078)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties 2007-11-29
10:24:45 UTC (rev 3079)
@@ -1,128 +1,11 @@
-#Tue Nov 27 15:45:39 CET 2007
+#This file was created by the ant script.
+#Thu Feb 01 10:28:02 CET 2007
+service.r.type=mp
component.registrator.interval=30000
-service.mp.cisco.commands.IPv6_TRACEROUTE.caching=0
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF.description=display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)
-service.mp.cisco.commands.IP_PING.caching=0
-service.mp.cisco.commands.IPv6_PING.description=ping an <ipv6 address>
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION=show running
interface
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.regex=^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?$
-service.mp.cisco.commands.IPv6_TRACEROUTE.regex=^([A-Fa-f0-9]{1,4}\:){7}[A-Fa-f0-9](/[0-9]{1,3})?$
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.minParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_ENVIRONMENT=show environment
-service.mp.cisco.commands.IP_PING_VRF=ping vrf
-service.r.mp.cisco.username=cisco
-service.r.mp.cisco.port=23
-service.r.mp.cisco.url=10.10.14.4
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.regex=^([A-Fa-f0-9]{1,4}\:){7}[A-Fa-f0-9](/[0-9]{1,3})?$
-service.mp.cisco.commands.BGP_ROUTE_IPv4.regex=^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?$
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.maxParamCount=1
-service.mp.cisco.commands.IP_PING_VRF.description=pings an <ip address> that
has a specific VRF
-service.r.organization_name=
-service.mp.cisco.commands.IP_PING_VRF.regex=^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?$
-service.mp.cisco.commands.IPv6_TRACEROUTE=trace ipv6
-service.r.ls_url=
-service.mp.cisco.commands.IPv6_BGP_TABLE.syntax=<IPv6 prefix network/length>
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.description=display IPv6 routing
table entry for <ipv6 address>
+service.r.service_name=Java SSH Telnet MP
service.ls.registration_file=
-service.mp.cisco.commands.IPv6_PING.caching=0
-service.r.mp.cisco.prompt=Cisco2811_1\#
-service.mp.cisco.commands.IPv6_TRACEROUTE.minParamCount=1
-service.mp.cisco.commands.STATUS_INTERFACE_STATS.syntax=<interface>
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.syntax=<ipv6 address>
-service.mp.cisco.commands.IPv6_BGP_TABLE.maxParamCount=1
-service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.description=display
the interface configuration for <interface>
-service.r.service_description=perfSONAR service
service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
-service.mp.cisco.commands.IPv6_TRACEROUTE.maxParamCount=1
-service.mp.cisco.commands.BGP_ROUTE_IPv4=show ip bgp
-service.r.service_type=mp
-service.mp.cisco.commands.IPv6_BGP_TABLE.minParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_ENVIRONMENT.minParamCount=0
-service.mp.cisco.commands.STATUS_INTERFACE_STATS.minParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_ENVIRONMENT.caching=0
-component.registrator.scheduler_component=scheduler
-service.mp.cisco.commands.BGP_ROUTE_IPv4.minParamCount=1
-service.mp.cisco.commands.IP_PING_VRF.minParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.syntax=<ip
address>
-service.mp.cisco.commands.IPv6_PING=ping ipv6
-service.mp.cisco.commands.IP_PING=ping
-service.r.mp.cisco.rate=100
-service.mp.cisco.commands.IP_SHOW_ROUTE.caching=0
-service.mp.cisco.commands.STATUS_SHOW_ENVIRONMENT.maxParamCount=0
-service.mp.cisco.commands.STATUS_INTERFACE_STATS.maxParamCount=1
-service.r.service_name=JAVA-SSHTELNET-MP
-service.mp.cisco.commands.BGP_ROUTE_IPv4.maxParamCount=1
-service.mp.cisco.commands.IP_PING_VRF.maxParamCount=1
-service.mp.cisco.commands.IP_PING.minParamCount=1
-service.mp.cisco.commands.IP_TRACEROUTE.minParamCount=1
-service.mp.cisco.commands.IPv6_TRACEROUTE.description=trace the ipv6 path to
<ipv6 address>
-service.mp.cisco.commands.IP_SHOW_ROUTE.description=show the current IP
routing table for <ip address>
-service.mp.cisco.commands.IPv6_BGP_TABLE.description=display current BGP
table routing entry for <IPv6 prefix>
-service.mp.cisco.commands.IP_PING.maxParamCount=1
-service.mp.cisco.commands.IP_TRACEROUTE.maxParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_ENVIRONMENT.description=show chassis
environment
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF.syntax=<VPN name>
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF.caching=0
-service.mp.cisco.commands.STATUS_INTERFACE_STATS.description=show interface
statistics
-service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
-service.mp.cisco.commands.STATUS_SHOW_MPLS_L2_VC_DETAIL.caching=0
-service.mp.cisco.commands.IP_SHOW_ROUTE=show ip route
-service.mp.cisco.commands.IPv6_PING.regex=^([A-Fa-f0-9]{1,4}\:){7}[A-Fa-f0-9](/[0-9]{1,3})?$
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.caching=0
-service.log.log4j.config=${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties
-service.mp.cisco.commands.IP_PING.syntax=<ip address>
-service.mp.cisco.commands.IP_PING_VRF.syntax=<ip address>
-service.r.access_point=http\://localhost\:8080/TelnetSSHMP/services/TelnetSSH
-service.mp.cisco.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.CiscoAdapter
-service.mp.cisco.commands.BGP_ROUTE_IPv4.caching=0
-service.mp.cisco.commands.IP_TRACEROUTE.description=trace the IPv4 path to
<ip address>
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.minParamCount=1
-service.mp.cisco.commands.STATUS_INTERFACE_STATS=show interface
-service.mp.cisco.commands.IPv6_PING.syntax=<ipv6 address>
-service.mp.cisco.commands.IPv6_BGP_TABLE=show bgp ipv6
-service.mp.cisco.commands.IP_TRACEROUTE=trace
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.syntax=<ip address>
-service.mp.cisco.commands.IP_TRACEROUTE.syntax=<ip address>
-service.mp.cisco.commands.IP_TRACEROUTE.caching=0
-service.r.mp.cisco.cache=0
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.maxParamCount=1
-service.mp.devices=cisco
-service.mp.cisco.commands.STATUS_SHOW_MPLS_L2_VC_DETAIL.description=display
detailed information about Any Transport over MPLS (AToM) virtual circuits
(VCs)
-service.r.contact_email=
-service.mp.cisco.commands.STATUS_INTERFACE_STATS.caching=0
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.caching=0
-service.mp.cisco.commands.STATUS_SHOW_MPLS_L2_VC_DETAIL=show mpls
l2transport vc detail
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.minParamCount=1
-service.r.service_version=1.2.1
-service.mp.cisco.commands.IP_TRACEROUTE_VRF.description=displays the path to
<ip address> that has a specific VRF
-service.mp.cisco.commands.IP_PING.description=ping an <ip address>
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.maxParamCount=1
-service.mp.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter
-service.mp.cisco.commands.IP_TRACEROUTE.regex=^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?$
-service.mp.cisco.commands.IP_TRACEROUTE_VRF=trace vrf
-service.mp.cisco.commands.IP_SHOW_ROUTE.minParamCount=1
-service.mp.cisco.commands.IPv6_SHOW_ROUTE.caching=0
-service.r.type=mp
-service.mp.cisco.commands.IP_SHOW_ROUTE.regex=^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?$
-service.sax_parser.config=${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config
-service.mp.cisco.commands=STATUS_SHOW_ENVIRONMENT,STATUS_INTERFACE_STATS,BGP_ROUTE_IPv4,IP_SHOW_ROUTE,STATUS_SHOW_INTERFACE_CONFIGURATION,IP_PING,IP_TRACEROUTE,IPv6_SHOW_ROUTE,IPv6_BGP_TABLE,IPv6_PING,IPv6_TRACEROUTE,STATUS_SHOW_MPLS_L2_VC_DETAIL,IP_SHOW_ROUTE_VRF,IP_PING_VRF,IP_TRACEROUTE_VRF
-service.mp.cisco.commands.IPv6_PING.minParamCount=1
-service.mp.cisco.commands.BGP_ROUTE_IPv4.syntax=<ip address>
-service.mp.cisco.commands.IP_PING_VRF.caching=0
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF=show ip route vrf
-service.mp.cisco.commands.IPv6_SHOW_ROUTE=show ipv6 route
-service.mp.cisco.commands.IP_SHOW_ROUTE.maxParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_MPLS_L2_VC_DETAIL.minParamCount=0
-service.mp.cisco.commands.STATUS_SHOW_INTERFACE_CONFIGURATION.regex=^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?$
-service.mp.cisco.commands.IP_SHOW_ROUTE.syntax=<ip address>
-service.r.mp.cisco.password=cisco
-service.mp.cisco.commands.IPv6_BGP_TABLE.caching=0
-service.mp.cisco.commands.IPv6_PING.maxParamCount=1
-service.mp.cisco.commands.STATUS_SHOW_MPLS_L2_VC_DETAIL.maxParamCount=0
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF.minParamCount=1
-service.mp.cisco.commands.IPv6_TRACEROUTE.syntax=<ipv6 address>
-service.as.authn_active=on
-service.mp.cisco.commands.BGP_ROUTE_IPv4.description=show bgp routing table
-service.mp.cisco.commands.IP_SHOW_ROUTE_VRF.maxParamCount=1
-service.mp.cisco.commands.IP_PING.regex=^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?$
+service.r.service_type=SSH/Telnet MP
+service.r.ls_url=
+service.r.service_description=Java SSH/Telnet MP, perfSONAR project
+component.registrator.scheduler_component=scheduler
\ No newline at end of file

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -1,5 +1,6 @@
package org.perfsonar.service.measurementPoint.lookingGlassType.encryption;

+import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -7,6 +8,7 @@
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
+import java.util.Enumeration;
import java.util.Properties;

import javax.crypto.BadPaddingException;
@@ -46,13 +48,24 @@
desCipher.init(Cipher.ENCRYPT_MODE, desKey);

// Our cleartext
- byte[] cleartext = pass.getBytes();
-
+ byte[] cleartext = pass.getBytes("ISO-8859-1");
+
ciphertext = desCipher.doFinal(cleartext);

- System.out.println("encrypted text: " + new
String(ciphertext));
+ //System.out.println("encrypted text: " + new
String(ciphertext));

- result = new String (ciphertext);
+ //System.out.println("ciphertext.length: " +
ciphertext.length);
+
+ //for (int i = 0; i < ciphertext.length; i++)
+ // System.out.println("ciphertext[" + i + "]: "
+ (char) ciphertext[i] + " (numeriek: "+ ciphertext[i] + ")");
+
+ //System.out.println("file encoding: " +
System.getProperty("file.encoding"));
+
+ //result = new String (ciphertext);
+
+ return encodeBase64(ciphertext);
+
+ //System.out.println("result.length()" +
result.length());
} catch (InvalidKeyException e) {
e.printStackTrace();
} catch (NoSuchAlgorithmException e) {
@@ -65,10 +78,9 @@
e.printStackTrace();
} catch (BadPaddingException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
}
-
-
-
return result;
}

@@ -95,10 +107,17 @@
// Initialize the same cipher for decryption
desCipher.init(Cipher.DECRYPT_MODE, desKey);

+ //byte[] encrypted = pass.getBytes("ISO-8859-1");
+ byte[] encrypted = decodeBase64(pass);
+
+ //System.out.println("lengte van het te decrypteren
gedoe: " + encrypted.length);
+ //for (int i = 0; i < encrypted.length; i++)
+ // System.out.println("encrypted[" + i + "]: " +
(char) encrypted[i] + " (numeriek: "+ encrypted[i] + ")");
+
// Decrypt the ciphertext
- byte[] cleartext1 =
desCipher.doFinal(pass.getBytes());
+ byte[] cleartext1 = desCipher.doFinal(encrypted);

- result = new String (cleartext1);
+ result = new String(cleartext1, "ISO-8859-1");
} catch (InvalidKeyException e) {
e.printStackTrace();
} catch (NoSuchAlgorithmException e) {
@@ -111,15 +130,142 @@
e.printStackTrace();
} catch (BadPaddingException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
}

return result;
}

+ /**
+ * Decodes BASE64 encoded string.
+ * @param encoded BASE64 string to decode
+ * @return decoded data
+ */
+ public static byte[] decodeBase64(String encoded) {
+ int i;
+ byte output[] = new byte[3];
+ int state;
+ final String ILLEGAL_STRING = "Illegal BASE64 string";
+
+ ByteArrayOutputStream data = new
ByteArrayOutputStream(encoded.length());
+
+ state = 1;
+ for(i=0; i < encoded.length(); i++) {
+ byte c;
+ {
+ char alpha = encoded.charAt(i);
+ if (Character.isWhitespace(alpha)) continue;
+
+ if ((alpha >= 'A') && (alpha <= 'Z')) c =
(byte)(alpha - 'A');
+ else if ((alpha >= 'a') && (alpha <= 'z')) c
= (byte)(26 + (alpha - 'a'));
+ else if ((alpha >= '0') && (alpha <= '9')) c
= (byte)(52 + (alpha - '0'));
+ else if (alpha=='+') c = 62;
+ else if (alpha=='/') c = 63;
+ else if (alpha=='=') break; // end
+ else throw new
IllegalArgumentException(ILLEGAL_STRING); // error
+ }
+
+ switch(state) {
+ case 1: output[0] = (byte)(c << 2);
+ break;
+ case 2: output[0] |= (byte)(c >>> 4);
+ output[1] = (byte)((c & 0x0F) << 4);
+ break;
+ case 3: output[1] |= (byte)(c >>> 2);
+ output[2] = (byte)((c & 0x03) << 6);
+ break;
+ case 4: output[2] |= c;
+ data.write(output,0,output.length);
+ break;
+ }
+ state = (state < 4 ? state+1 : 1);
+ } // for
+
+ if (i < encoded.length()) /* then '=' found, but the end of
string */
+ switch(state) {
+ case 3: data.write(output,0,1);
+ if ((encoded.charAt(i)=='=') &&
(encoded.charAt(i+1)=='='))
+ return data.toByteArray();
+ else throw new
IllegalArgumentException(ILLEGAL_STRING);
+
+ case 4:
+ data.write(output,0,2);
+ if (encoded.charAt(i)=='=') return
data.toByteArray();
+ else throw new
IllegalArgumentException(ILLEGAL_STRING);
+
+ default:
+ throw new
IllegalArgumentException(ILLEGAL_STRING);
+ }
+ else { // end of string
+ if (state==1) return data.toByteArray();
+ else throw new
IllegalArgumentException(ILLEGAL_STRING);
+ //return data.toByteArray();
+ }
+
+ } // decode
+
+ private final static String BASE64 =
+
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+ /**
+ * Encodes binary data by BASE64 method.
+ * @param data binary data to encode
+ * @return BASE64 encoded data
+ */
+ public static String encodeBase64(byte[] data) {
+
+ char output[] = new char[4];
+ int state = 1;
+ int restbits = 0;
+ int chunks = 0;
+
+ StringBuffer encoded = new StringBuffer();
+
+ for(int i=0; i < data.length; i++) {
+
+ int ic = (data[i] >= 0 ? data[i] : (data[i] & 0x7F) +
128);
+ switch (state)
+ { case 1: output[0] = BASE64.charAt(ic >>> 2);
+ restbits = ic & 0x03;
+ break;
+ case 2: output[1] = BASE64.charAt((restbits << 4) |
(ic >>> 4));
+ restbits = ic & 0x0F;
+ break;
+ case 3: output[2] = BASE64.charAt((restbits << 2) |
(ic >>> 6));
+ output[3] = BASE64.charAt(ic & 0x3F);
+ encoded.append(output);
+
+ // keep no more then 76 character per line
+ chunks++;
+ if ((chunks % 19)==0) encoded.append("\r\n");
+ break;
+ }
+ state = (state < 3 ? state+1 : 1);
+ } // for
+
+ /* finalize */
+ switch (state)
+ { case 2:
+ output[1] = BASE64.charAt((restbits << 4));
+ output[2] = output[3] = '=';
+ encoded.append(output);
+ break;
+ case 3:
+ output[2] = BASE64.charAt((restbits << 2));
+ output[3] = '=';
+ encoded.append(output);
+ break;
+ }
+
+ return encoded.toString();
+ } // encode()
+
+
+
public static void main (String[] args) {
Properties pr = new Properties();
- String encrypted = encryptPassword("cisco");
- System.out.println("Te stockeren: " + encrypted);
+ String encrypted = encryptPassword("thisisasmalltest");
pr.setProperty("password", encrypted);

try {
@@ -130,8 +276,7 @@
e.printStackTrace();
}

- System.out.println("File written");
-
+
pr = new Properties();
try {
pr.setProperty("test", "testje");
@@ -142,54 +287,12 @@
pr.load(new FileInputStream("test.properties"));

pr.store(System.out, "");
- System.out.println("encrypted gedoe: " +
pr.getProperty("password"));
- System.out.println("lengte van het encrypted gedoe: "
+ pr.getProperty("password").length());
String decrypted =
decryptPassword(pr.getProperty("password"));
- System.out.print("decrypted password: " + decrypted);
+ System.out.println("decrypted password: " +
decrypted);
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
- }
-
- /*
- try {
- KeyGenerator keygen = KeyGenerator.getInstance("DES");
- SecretKey desKey = keygen.generateKey();
-
- Cipher desCipher;
-
- // Create the cipher
- desCipher =
Cipher.getInstance("DES/ECB/PKCS5Padding");
-
- // Initialize the cipher for encryption
- desCipher.init(Cipher.ENCRYPT_MODE, desKey);
-
- // Our cleartext
- byte[] cleartext = "This is just an
example".getBytes();
-
- // Encrypt the cleartext
- byte[] ciphertext = desCipher.doFinal(cleartext);
-
- System.out.println("encrypted text: " + new
String(ciphertext));
-
- // Initialize the same cipher for decryption
- desCipher.init(Cipher.DECRYPT_MODE, desKey);
-
- // Decrypt the ciphertext
- byte[] cleartext1 = desCipher.doFinal(ciphertext);
-
- } catch (InvalidKeyException e) {
- e.printStackTrace();
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- } catch (NoSuchPaddingException e) {
- e.printStackTrace();
- } catch (IllegalBlockSizeException e) {
- e.printStackTrace();
- } catch (BadPaddingException e) {
- e.printStackTrace();
- }
- */
+ }
}
}

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -424,8 +424,7 @@
"some\nmore questions will be
asked to configure the URL, port, username,\n" +
"password or key, prompt and
access-rate (Here you can specify what\n" +
"the minimum interval has to be between
requests (in ms)).");
- //System.out
- // .println("Now, some access
parameters will be asked ...");
+ //System.out.println("Now, some access
parameters will be asked ...");
System.out.println();
//}
it = devices.iterator();
@@ -539,7 +538,7 @@
input = br.readLine();
}

prop.setProperty("service.r.mp." + device + ".password",
PasswordEncryptor.encryptPassword(input));
- System.out.println("Encrypted
password: " + PasswordEncryptor.encryptPassword(input));
+
//System.out.println("Encrypted password: " +
PasswordEncryptor.encryptPassword(input));
} else if (type.equalsIgnoreCase("4")
||
type.equalsIgnoreCase("7")) {
System.out.println("Please
give the url for device: "
@@ -951,19 +950,6 @@
stitcher.doStuff(args[0]);
//createServiceStorageXML(args[0], args[0] +
"XML.xml");
}
-
- if (args.length == 2) {
- //PropertiesConfigurationComponent pr =
(PropertiesConfigurationComponent) AuxiliaryComponentManager
- //
.getInstance().getComponent(ComponentNames.CONFIG);
-
- Properties pr = new Properties();
- pr.load(new FileInputStream(args[0]));
-
- String password =
pr.getProperty("service.r.mp." + args[1] + ".password");
- System.out.println("encrypted password from
properties file: " + password);
- String pass =
PasswordEncryptor.decryptPassword(password);
- System.out.println("decrypted password from
properties file: " + pass);
- }
} catch (RuntimeException e) {
} catch (Exception e){
e.printStackTrace();

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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -187,6 +188,7 @@
manager.disconnect();

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

}// if
@@ -242,7 +244,7 @@

logger.debug("[CiscoIpAdapter] Trying to connect");

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

logger.debug("[CiscoIpv6Adapter Login");


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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -248,7 +249,7 @@

if (passphrase == null || passphrase.equals(""))
manager.connect(username, keyUrl);
- else manager.connect(username, keyUrl, passphrase);
+ else manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
logger.info("[CiscoKeyIpAdapter] Login");

} catch (Exception e) {

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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -240,7 +241,7 @@

logger.info("[CiscoSshIpAdapter] Trying to connect");

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

logger.info("[CiscoSshIpAdapter Login");

@@ -445,7 +446,7 @@
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

- manager = new SshManager(url, username, password,
false);
+ manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false);

} catch (NumberFormatException e1) {


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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -242,7 +243,7 @@

logger.debug("[JuniperIpAdapter] Trying to connect");

- manager.connect(username, "login:", password,
"Password:");
+ manager.connect(username, "login:",
PasswordEncryptor.decryptPassword(password), "Password:");

logger.debug("[JuniperIpv6Adapter Login");


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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -248,7 +249,7 @@

if (passphrase == null || passphrase.equals(""))
manager.connect(username, keyUrl);
- else manager.connect(username, keyUrl, passphrase);
+ else manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
logger.info("[JuniperKeyIpAdapter] Login");

} catch (Exception e) {

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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -240,7 +241,7 @@

logger.info("[JuniperSshIpAdapter] Trying to
connect");

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

logger.info("[JuniperSshIpAdapter Login");

@@ -459,7 +460,7 @@
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

- manager = new SshManager(url, username, password,
false);
+ manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false);

} catch (NumberFormatException e1) {


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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -234,7 +235,7 @@

logger.debug("[CiscoIpv6Adapter Trying to connect");

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

logger.debug("[CiscoIpv6Adapter Login");


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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -240,7 +241,7 @@

if (passphrase == null || passphrase.equals(""))
manager.connect(username, keyUrl);
- else manager.connect(username, keyUrl, passphrase);
+ else manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
logger.info("[CiscoKeyIpv6Adapter] Login");

} catch (Exception e) {

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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -231,7 +232,7 @@

logger.info("[CiscoSshIpv6Adapter] Trying to
connect");

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

logger.info("[CiscoSshIpv6Adapter Login");

@@ -438,7 +439,7 @@
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

- manager = new SshManager(url, username, password,
false);
+ manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false);

} catch (NumberFormatException e1) {


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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -232,7 +233,7 @@

logger.debug("[JuniperIpv6Adapter Trying to connect");

- manager.connect(username, "login:", password,
"Password:");
+ manager.connect(username, "login:",
PasswordEncryptor.decryptPassword(password), "Password:");

logger.debug("[JuniperIpv6Adapter Login");


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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -240,7 +241,7 @@

if (passphrase == null || passphrase.equals(""))
manager.connect(username, keyUrl);
- else manager.connect(username, keyUrl, passphrase);
+ else manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
logger.info("[JuniperKeyIpv6Adapter] Login");

} catch (Exception e) {

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
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -231,7 +232,7 @@

logger.info("[JuniperSshIpv6Adapter] Trying to
connect");

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

logger.info("[JuniperSshIpv6Adapter Login");

@@ -450,7 +451,7 @@
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

- manager = new SshManager(url, username, password,
false);
+ manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false);

} catch (NumberFormatException e1) {


Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.status.StatusAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.status.commands.StatusCommand;
@@ -242,7 +243,7 @@

if (passphrase == null || passphrase.equals(""))
manager.connect(username, keyUrl);
- else manager.connect(username, keyUrl, passphrase);
+ else manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
logger.info("[CiscoKeyStatusAdapter] Login");

} catch (Exception e) {

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -243,7 +243,7 @@

logger.info("[CiscoSshStatusAdapter] Trying to
connect");

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

logger.info("[CiscoSshStatusAdapter Login");

@@ -450,7 +450,7 @@
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

- manager = new SshManager(url, username, password,
false);
+ manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false);

} catch (NumberFormatException e1) {


Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoStatusAdapter.java
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoStatusAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -228,8 +228,6 @@
logger.debug("[CiscoStatusAdapter] username:
"+ username);
password =
properties.getProperty("service.r.mp." + subject
+ ".password");
- logger.debug("[CiscoStatusAdapter] encrypted
password: "+ password);
- logger.debug("[CiscoStatusAdapter] decrypted
password: "+ PasswordEncryptor.decryptPassword(password));
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));
logger.debug("[CiscoStatusAdapter] cache: "+
caching);

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.status.StatusAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.status.commands.StatusCommand;
@@ -242,7 +243,7 @@

if (passphrase == null || passphrase.equals(""))
manager.connect(username, keyUrl);
- else manager.connect(username, keyUrl, passphrase);
+ else manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
logger.info("[JuniperKeyStatusAdapter] Login");

} catch (Exception e) {

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.status.StatusAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.status.commands.StatusCommand;
@@ -231,7 +232,7 @@

logger.info("[JuniperSshStatusAdapter] Trying to
connect");

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

logger.info("[JuniperSshStatusAdapter Login");

@@ -450,7 +451,7 @@
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

- manager = new SshManager(url, username, password,
false);
+ manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false);

} catch (NumberFormatException e1) {


Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
2007-11-28 10:15:48 UTC (rev 3078)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
2007-11-29 10:24:45 UTC (rev 3079)
@@ -25,6 +25,7 @@
import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.status.StatusAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.status.commands.StatusCommand;
@@ -237,7 +238,7 @@

logger.debug("[JuniperStatusAdapter] Trying to
connect");

- manager.connect(username, "login:", password,
"Password:");
+ manager.connect(username, "login:",
PasswordEncryptor.decryptPassword(password), "Password:");
logger.debug("[JuniperStatusAdapter] Login");

} catch (Exception e) {


  • perfsonar: r3079 - in trunk/geant2_java-sshtelnet-mp: conf src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters, svnlog, 11/29/2007

Archive powered by MHonArc 2.6.16.

Top of Page