Skip to Content.
Sympa Menu

perfsonar-dev - r2004 - in branches/SSHTelnet-MP-STABLE: ant/ssh conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters doc/mp/sshtelnetTypeMP src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters

Subject: perfsonar development work

List archive

r2004 - in branches/SSHTelnet-MP-STABLE: ant/ssh conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters doc/mp/sshtelnetTypeMP src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters


Chronological Thread 
  • From:
  • To:
  • Subject: r2004 - in branches/SSHTelnet-MP-STABLE: ant/ssh conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters doc/mp/sshtelnetTypeMP src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters
  • Date: Tue, 30 Jan 2007 10:15:46 -0500
Author: melis
Date: 2007-01-30 10:15:45 -0500 (Tue, 30 Jan 2007)
New Revision: 2004

Modified:
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-release-targets.xml

branches/SSHTelnet-MP-STABLE/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class
branches/SSHTelnet-MP-STABLE/doc/mp/sshtelnetTypeMP/Interface
Specification for SSHTelnet 1.0.doc

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

branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java

branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java

branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java

branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java

branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java

branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java

branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/QuaggaIpAdapter.java
Log:
Interface Specification rncs enhanced
Password issue solved

Modified: branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-release-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-release-targets.xml
2007-01-30 14:50:45 UTC (rev 2003)
+++ branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-release-targets.xml
2007-01-30 15:15:45 UTC (rev 2004)
@@ -42,7 +42,7 @@
<delete dir="tmp/${service.name}/perfsonar/tmp"/>

<copy
todir="tmp/${service.name}/perfsonar/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters">
- <fileset
file="tmp/${service.name}/perfsonar/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class"/>
+ <fileset
file="tmp/${service.name}/perfsonar/build/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class"/>
</copy>
<delete dir="tmp/${service.name}/perfsonar/src/org"/>
<delete dir="tmp/${service.name}/perfsonar/doc"/>

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

Modified: branches/SSHTelnet-MP-STABLE/doc/mp/sshtelnetTypeMP/Interface
Specification for SSHTelnet 1.0.doc
===================================================================
(Binary files differ)

Modified:
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
===================================================================
---
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-01-30 14:50:45 UTC (rev 2003)
+++
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-01-30 15:15:45 UTC (rev 2004)
@@ -191,6 +191,13 @@

.println("Please give the password for device: "

+ device + ": ");
input = br.readLine();
+ while (input == null ||
input.equals("")){
+ System.out.
+ println("You
have to provide a password. Please give" +
+ " the
password for device: "
+ +
device + ": ");
+ input = br.readLine();
+ }

out.write("service.r.mp." +
device + ".password="
+ input +
"\n");
System.out
@@ -241,12 +248,27 @@

.println("Please give the username for device: "

+ device + ": ");
input = br.readLine();
+ while (input == null ||
input.equals("")){
+ System.out
+ .println("You
have to provide a username. " +
+
"Please give the username for device: "
+ +
device + ": ");
+ input = br.readLine();
+ }
out.write("service.r.mp." +
device + ".username="
+ input +
"\n");
System.out

.println("Please give the password for device: "

+ device + ": ");
input = br.readLine();
+ System.out.println("password
given: " + input);
+ while (input == null ||
input.equals("")){
+ System.out
+ .println("You
have to provide a password. " +
+
"Please give the password for device: "
+ +
device + ": ");
+ input = br.readLine();
+ }
out.write("service.r.mp." +
device + ".password="
+ input +
"\n");
} else if (type.equalsIgnoreCase("4")
@@ -277,12 +299,26 @@

.println("Please give the username for device: "

+ device + ": ");
input = br.readLine();
+ while (input == null ||
input.equals("")){
+ System.out
+ .println("You
have to provide a username. " +
+
"Please give the username for device: "
+ +
device + ": ");
+ input = br.readLine();
+ }
out.write("service.r.mp." +
device + ".username="
+ input +
"\n");
System.out

.println("Please give the path to the public ssh key for device: "

+ device + ": ");
input = br.readLine();
+ while (input == null ||
input.equals("")){
+ System.out
+ .println("You
have to provide a path to the public ssh key. " +
+
"Please give the the path to the public ssh key for device: "
+ +
device + ": ");
+ input = br.readLine();
+ }
out.write("service.r.mp." +
device + ".keyUrl=" + input
+ "\n");


Modified:
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
===================================================================
---
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2007-01-30 14:50:45 UTC (rev 2003)
+++
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2007-01-30 15:15:45 UTC (rev 2004)
@@ -219,10 +219,19 @@
+ subject + ".port"));
prompt =
properties.getProperty("service.r.mp." + subject
+ ".prompt");
- username =
properties.getProperty("service.r.mp." + subject
- + ".username");
- password =
properties.getProperty("service.r.mp." + subject
- + ".password");
+ try {
+ username =
properties.getProperty("service.r.mp." + subject
+ + ".username");
+ password =
properties.getProperty("service.r.mp." + subject
+ + ".password");
+ if (username.equals("") ||
password.equals(""))
+ throw new
ResourceException("error.mp.sshtelnet.configuration",
+ "Username or
password not set");
+ } catch (Exception e) {
+ logger.error("[CiscoIpAdapter] Error
in configuration");
+
logger.error(e.getStackTrace().toString());
+ throw e;
+ }
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));


Modified:
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
===================================================================
---
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2007-01-30 14:50:45 UTC (rev 2003)
+++
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2007-01-30 15:15:45 UTC (rev 2004)
@@ -223,10 +223,19 @@
+ subject + ".port"));
prompt =
properties.getProperty("service.r.mp." + subject
+ ".prompt");
- username =
properties.getProperty("service.r.mp." + subject
- + ".username");
- keyUrl =
properties.getProperty("service.r.mp." + subject
- + ".keyUrl");
+ try {
+ username =
properties.getProperty("service.r.mp." + subject
+ + ".username");
+ keyUrl =
properties.getProperty("service.r.mp." + subject
+ + ".keyUrl");
+ if (username.equals("") ||
keyUrl.equals(""))
+ throw new
ResourceException("error.mp.sshtelnet.configuration",
+ "Username or
KeyURL not set");
+ } catch (Exception e) {
+ logger.error("[CiscoKeyIpAdapter]
Error in configuration");
+
logger.error(e.getStackTrace().toString());
+ throw e;
+ }
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

@@ -437,10 +446,19 @@
+ subject + ".port"));
prompt = properties.getProperty("service.r.mp." +
subject
+ ".prompt");
- username = properties.getProperty("service.r.mp." +
subject
- + ".username");
- keyUrl = properties.getProperty("service.r.mp." +
subject
- + ".keyUrl");
+ try {
+ username =
properties.getProperty("service.r.mp." + subject
+ + ".username");
+ keyUrl =
properties.getProperty("service.r.mp." + subject
+ + ".keyUrl");
+ if (username.equals("") || keyUrl.equals(""))
+ throw new
ResourceException("error.mp.sshtelnet.configuration",
+ "Username or KeyURL
not set");
+ } catch (ResourceException e) {
+ logger.error("[CiscoKeyIpAdapter] Error in
configuration");
+ logger.error(e.getStackTrace().toString());
+ throw e;
+ }
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));


Modified:
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
===================================================================
---
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2007-01-30 14:50:45 UTC (rev 2003)
+++
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2007-01-30 15:15:45 UTC (rev 2004)
@@ -218,10 +218,19 @@
+ subject + ".port"));
prompt =
properties.getProperty("service.r.mp." + subject
+ ".prompt");
- username =
properties.getProperty("service.r.mp." + subject
- + ".username");
- password =
properties.getProperty("service.r.mp." + subject
- + ".password");
+ try {
+ username =
properties.getProperty("service.r.mp." + subject
+ + ".username");
+ password =
properties.getProperty("service.r.mp." + subject
+ + ".password");
+ if (username.equals("") ||
password.equals(""))
+ throw new
ResourceException("error.mp.sshtelnet.configuration",
+ "Username or
password not set");
+ } catch (Exception e) {
+ logger.error("[CiscoSshIpAdapter]
Error in configuration");
+
logger.error(e.getStackTrace().toString());
+ throw e;
+ }
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));


Modified:
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
===================================================================
---
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2007-01-30 14:50:45 UTC (rev 2003)
+++
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2007-01-30 15:15:45 UTC (rev 2004)
@@ -219,10 +219,19 @@
+ subject + ".port"));
prompt =
properties.getProperty("service.r.mp." + subject
+ ".prompt");
- username =
properties.getProperty("service.r.mp." + subject
- + ".username");
- password =
properties.getProperty("service.r.mp." + subject
- + ".password");
+ try {
+ username =
properties.getProperty("service.r.mp." + subject
+ + ".username");
+ password =
properties.getProperty("service.r.mp." + subject
+ + ".password");
+ if (username.equals("") ||
password.equals(""))
+ throw new
ResourceException("error.mp.sshtelnet.configuration",
+ "Username or
password not set");
+ } catch (Exception e) {
+ logger.error("[JuniperIpAdapter]
Error in configuration");
+
logger.error(e.getStackTrace().toString());
+ throw e;
+ }
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));


Modified:
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
===================================================================
---
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2007-01-30 14:50:45 UTC (rev 2003)
+++
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2007-01-30 15:15:45 UTC (rev 2004)
@@ -223,10 +223,19 @@
+ subject + ".port"));
prompt =
properties.getProperty("service.r.mp." + subject
+ ".prompt");
- username =
properties.getProperty("service.r.mp." + subject
- + ".username");
- keyUrl =
properties.getProperty("service.r.mp." + subject
- + ".keyUrl");
+ try {
+ username =
properties.getProperty("service.r.mp." + subject
+ + ".username");
+ keyUrl =
properties.getProperty("service.r.mp." + subject
+ + ".keyUrl");
+ if (username.equals("") ||
keyUrl.equals(""))
+ throw new
ResourceException("error.mp.sshtelnet.configuration",
+ "Username or
KeyURL not set");
+ } catch (Exception e) {
+ logger.error("[JuniperKeyIpAdapter]
Error in configuration");
+
logger.error(e.getStackTrace().toString());
+ throw e;
+ }
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

@@ -449,10 +458,19 @@
+ subject + ".port"));
prompt = properties.getProperty("service.r.mp." +
subject
+ ".prompt");
- username = properties.getProperty("service.r.mp." +
subject
- + ".username");
- keyUrl = properties.getProperty("service.r.mp." +
subject
- + ".keyUrl");
+ try {
+ username =
properties.getProperty("service.r.mp." + subject
+ + ".username");
+ keyUrl =
properties.getProperty("service.r.mp." + subject
+ + ".keyUrl");
+ if (username.equals("") || keyUrl.equals(""))
+ throw new
ResourceException("error.mp.sshtelnet.configuration",
+ "Username or KeyURL
not set");
+ } catch (ResourceException e) {
+ logger.error("[JuniperKeyIpAdapter] Error in
configuration");
+ logger.error(e.getStackTrace().toString());
+ throw e;
+ }
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

@@ -470,9 +488,8 @@
e1.printStackTrace();
throw new
SystemException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection
details");
-
}
-
+
logger.debug("[JuniperKeyIpAdapter] TelnetManager created: "
+ url
+ " " + port);


Modified:
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
===================================================================
---
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2007-01-30 14:50:45 UTC (rev 2003)
+++
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2007-01-30 15:15:45 UTC (rev 2004)
@@ -218,10 +218,19 @@
+ subject + ".port"));
prompt =
properties.getProperty("service.r.mp." + subject
+ ".prompt");
- username =
properties.getProperty("service.r.mp." + subject
- + ".username");
- password =
properties.getProperty("service.r.mp." + subject
- + ".password");
+ try {
+ username =
properties.getProperty("service.r.mp." + subject
+ + ".username");
+ password =
properties.getProperty("service.r.mp." + subject
+ + ".password");
+ if (username.equals("") ||
password.equals(""))
+ throw new
ResourceException("error.mp.sshtelnet.configuration",
+ "Username or
password not set");
+ } catch (Exception e) {
+ logger.error("[JuniperSshIpAdapter]
Error in configuration");
+
logger.error(e.getStackTrace().toString());
+ throw e;
+ }
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));


Modified:
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/QuaggaIpAdapter.java
===================================================================
---
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/QuaggaIpAdapter.java
2007-01-30 14:50:45 UTC (rev 2003)
+++
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/QuaggaIpAdapter.java
2007-01-30 15:15:45 UTC (rev 2004)
@@ -216,8 +216,17 @@
+ subject + ".port"));
prompt =
properties.getProperty("service.r.mp." + subject
+ ".prompt");
- password =
properties.getProperty("service.r.mp." + subject
- + ".password");
+ try {
+ password =
properties.getProperty("service.r.mp." + subject
+ + ".password");
+ if (password.equals(""))
+ throw new
ResourceException("error.mp.sshtelnet.configuration",
+ "Password not
set");
+ } catch (Exception e) {
+ logger.error("[QuaggaIpAdapter] Error
in configuration");
+
logger.error(e.getStackTrace().toString());
+ throw e;
+ }
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));



  • r2004 - in branches/SSHTelnet-MP-STABLE: ant/ssh conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters doc/mp/sshtelnetTypeMP src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters, svnlog, 01/30/2007

Archive powered by MHonArc 2.6.16.

Top of Page