Changeset 11215

Timestamp:

07/06/10 08:44:50 (2 months ago)

Author:

amir.fadlon

Message:

First version of scapy with first test that is working from start to end.

Location:

jsystemFramework/trunk/systemObjects/core/scriptingLanguages

Files:

• .classpath (modified) (1 diff)
• src/jsystem/sysobj/scripting/python/PyShell.java (modified) (5 diffs)

jsystemFramework/trunk/systemObjects/core/scriptingLanguages/.classpath

@@ -11 +11 @@
         <classpathentry kind="lib" path="/runner/thirdparty/commonLib/qdox.jar"/>
         <classpathentry kind="lib" path="/runner/thirdparty/commonLib/mail-1.4.1.jar"/>
+        <classpathentry kind="lib" path="/runner/lib/stations.jar" sourcepath="/runner/lib/stations_src.zip"/>
         <classpathentry kind="output" path="classes"/>
 </classpath>

jsystemFramework/trunk/systemObjects/core/scriptingLanguages/src/jsystem/sysobj/scripting/python/PyShell.java

@@ -1 +1 @@
 package jsystem.sysobj.scripting.python;
 
-import jsystem.extensions.analyzers.text.TextNotFound;
 import jsystem.framework.system.SystemObjectImpl;
 import systemobject.terminal.Prompt;
@@ -9 +8 @@
 import com.aqua.sysobj.conn.CliApplication;
 import com.aqua.sysobj.conn.CliCommand;
-import com.aqua.sysobj.conn.CliFactory;
+import com.aqua.sysobj.conn.CliConnection;
 
 public class PyShell extends SystemObjectImpl {
@@ -15 +14 @@
         private StationDefaultImpl station;
         private CliApplication cliApplication;
+        private CliConnection cliConnection;
 
-        private String host;
-        private int port;
+        private String worstation;
+        private String os;
         private String user;
         private String password;
+
+        private StringBuffer logFileS = null;
         
         public void init() throws Exception {
@@ -31 +33 @@
                 pyPrompts[0].setCommandEnd(true);
 
-                station = StationsFactory.createStation(getHost(), CliFactory.OPERATING_SYSTEM_WINDOWS, "telnet", getUser(), getPassword(), null);
+                
+                station = StationsFactory.createStation(getWorstation(), getOs(), "telnet", getUser(), getPassword(), null);
                 station.init();
                 cliApplication = station.getCliSession(false);
+                cliConnection = cliApplication.getConnectivityManager().getCli();
+                
+                logFileS = new StringBuffer();
                 
         }
         
+        @Override
+        public void close() {
+                station.close();
+                super.close();
+        }
+        
         public void handleCliCommand(String command) throws Exception {
-                cliApplication.handleCliCommand(command, new CliCommand(command));
-                cliApplication.analyze(new TextNotFound("Error"));
+                logFileS.append(command + "\r");
+                CliCommand cmd = new CliCommand(command);
+                cmd.addErrors("Error");
+                cliConnection.handleCliCommand(command, cmd);
         }
 
-        public void handleCliCommandWithoutWait(String title, String command) throws Exception {
-//              report.startLevel(title, Reporter.CurrentPlace);
-//              telnet.WriteLine(command);
-//              Thread.sleep(200);
-//              String result = telnet.Read("");
-//              setTestAgainstObject(result);
-//              report.stopLevel();
+        public void handleCliCommandWithoutWait(String command) throws Exception {
+                logFileS.append(command + "\n\r");
+                cliConnection.sendString(command, false);
         }
         
@@ -67 +77 @@
         }
 
-        public String getHost() {
-                return host;
+        public String getWorstation() {
+                return worstation;
         }
 
-        public void setHost(String host) {
-                this.host = host;
+        public void setWorstation(String worstation) {
+                this.worstation = worstation;
         }
 
-        public int getPort() {
-                return port;
+        public String getOs() {
+                return os;
         }
 
-        public void setPort(int port) {
-                this.port = port;
+        public void setOs(String os) {
+                this.os = os;
         }
-        
-        
+
+        public StringBuffer getLogFileS() {
+                return logFileS;
+        }
+                
 }