Changeset 11210

Timestamp:

07/05/10 09:01:50 (2 months ago)

Author:

amir.fadlon

Message:

Re implemented using Stations. Still lots of work to do but a solid start...

Location:

jsystemFramework/trunk/systemObjects/core/scriptingLanguages/src/jsystem/sysobj/scripting/python

Files:

• PyShell.java (modified) (2 diffs)
• TelnetConnection.java (deleted)

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

@@ -2 +2 @@
 
 import jsystem.extensions.analyzers.text.TextNotFound;
-import jsystem.framework.report.Reporter;
 import jsystem.framework.system.SystemObjectImpl;
+import systemobject.terminal.Prompt;
 
+import com.aqua.stations.StationDefaultImpl;
+import com.aqua.stations.StationsFactory;
+import com.aqua.sysobj.conn.CliApplication;
+import com.aqua.sysobj.conn.CliCommand;
+import com.aqua.sysobj.conn.CliFactory;
 
 public class PyShell extends SystemObjectImpl {
 
-        private TelnetConnection telnet;
+        private StationDefaultImpl station;
+        private CliApplication cliApplication;
+
         private String host;
         private int port;
@@ -15 +22 @@
         
         public void init() throws Exception {
-                super.init();   
                 
-                telnet = new TelnetConnection(host, port);
-                telnet.Login(user, password, 4000);
-                telnet.WriteLine("cd C:\\scapy-2.1.0");
-                telnet.WriteLine("python");             
-                String result = telnet.Read(">>>");
-                telnet.WriteLine("from scapy.all import *");
-                result = telnet.Read(">>>");
-                telnet.WriteLine("from scapy.layers.l2 import Dot1Q");
-                result = telnet.Read(">>>");
-                telnet.WriteLine("from scapy.layers.inet import IP");
-                result = telnet.Read(">>>");
-                telnet.WriteLine("from scapy.layers.ppp import *");
-                result = telnet.Read(">>>");
-                telnet.WriteLine("from scapy.layers.l2 import *");
-                result = telnet.Read(">>>");
-                telnet.WriteLine("import sys, os");
-                result = telnet.Read(">>>");
-                setTestAgainstObject(result);
+                super.init();
+                
+                Prompt[] pyPrompts = new Prompt[1];
+                
+                pyPrompts[0] = new Prompt();
+                pyPrompts[0].setPrompt(">>>");
+                pyPrompts[0].setCommandEnd(true);
+
+                station = StationsFactory.createStation(getHost(), CliFactory.OPERATING_SYSTEM_WINDOWS, "telnet", getUser(), getPassword(), null);
+                station.init();
+                cliApplication = station.getCliSession(false);
+                
         }
         
-        public void handleCliCommand(String title, String command) throws Exception {
-                report.startLevel(title, Reporter.CurrentPlace);
-                telnet.WriteLine(command);
-                String result = telnet.Read(">>>");
-                setTestAgainstObject(result);
-                analyze(new TextNotFound("error"));
-                report.stopLevel();
+        public void handleCliCommand(String command) throws Exception {
+                cliApplication.handleCliCommand(command, new CliCommand(command));
+                cliApplication.analyze(new TextNotFound("Error"));
         }
 
-        public void handleCliCommand(String title, String[] commands) throws Exception {
-                report.startLevel(title, Reporter.CurrentPlace);
-                for (String command : commands) {
-                        telnet.WriteLine(command);
-                        String result = (telnet.Read(">>>"));
-                        setTestAgainstObject(result);
-                        analyze(new TextNotFound("error"));
-                }
-                report.stopLevel();
+        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();
         }