Merge pull request #14 from GlobalNOC/1.0.0-dev

1.0.0 dev

Bro/scipass.bro

@@ -0,0 +1,49 @@
+@load base/protocols/ftp
+@load base/utils/exec
+
+#@load base/protocols/ftp/gridftp
+#module GridFTP;
+
+function signalSciPass(c: connection)
+         {
+                local anagram : Exec::Command;
+
+                local prog = fmt("curl -X PUT -d '{\"nw_dst\":\"%s/32\", \"nw_src\":\"%s/32\", \"tp_src\":\"%d\", \"tp_dst\":\"%d\"}' http://scipass-controller:8080/scipass/flows/good_flow",
+                                  c$id$resp_h, c$id$orig_h,c$id$orig_p, c$id$resp_p);
+                #print prog;
+                local param = "";
+                anagram = [$cmd = prog, $stdin = param];
+		when ( local result = Exec::run(anagram))
+		     {
+			if ( result$exit_code != 0 )
+			     {
+			     return;
+			     }
+	             }
+		     return;
+         }
+
+event bro_init()
+      {
+        print "BRO Starting";
+      }
+
+
+event ftp_request(c: connection, command: string, arg: string)
+      {
+        #print fmt("FTP REQUEST!! command: %s args: %s", command, arg);
+
+      }
+
+event ftp_reply(c: connection, code: count, msg: string, cont_resp: bool)
+      {
+        #print fmt("FTP REPLY!! code: %d, msg: %s", code, msg);
+      }
+
+
+
+event file_over_new_connection(f: fa_file, c: connection, is_orig: bool)
+      {
+        print "FILE TRANSFER STARTED!";
+	signalSciPass(c);
+      }

SciPass.spec

@@ -24,6 +24,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__install} -d -p %{buildroot}/etc/init.d
 %{__install} python/*.py %{buildroot}/%{python_sitelib}/SciPass/
 %{__install} etc/SciPass.xml %{buildroot}/etc/SciPass/
+%{__install} etc/ryu.conf %{buildroot}/etc/SciPass/
 %{__install} etc/scipass-init %{buildroot}/etc/init.d/scipass
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -33,6 +34,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 /etc/init.d/scipass
 /etc/SciPass/SciPass.xml
+/etc/SciPass/ryu.conf
 %{python_sitelib}/SciPass/*
 
 %doc
@@ -41,4 +43,3 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Fri Jul 25 2014 aragusa <[email protected]> - 
 - Initial build.
-

etc/scipass-init

@@ -3,17 +3,17 @@
 # TTS Server for Speech Synthesis
 #
 
-options="--config-file /etc/SciPass/SciPass.cfg --verbose --use-syslog"
+options="--config-file /etc/SciPass/ryu.conf --use-syslog --nouse-stderr"
 
-CMD="ryu-manager /usr/share/SciPass/SciPass.py $options"
+CMD="ryu-manager /usr/share/SciPass/Ryu.py $options"
 
 start() {
     $CMD 2>&1 &
     echo "SciPass Started"
 }
 
 stop() {
-    pid=`ps -ef | grep 'SciPass.py' | awk '{ print $2 }'`
+    pid=`ps -ef | grep 'ryu-manager /usr/share/SciPass/Ryu.py' | grep -v "grep" | awk '{ print $2 }'`
     echo $pid
     kill $pid
     sleep 2

python/Ryu.py

@@ -98,7 +98,7 @@ def update_sensor_load(self, req):
         return Response(content_type='application/json',body=json.dumps(result))
 
 class Ryu(app_manager.RyuApp):
-
+    OFP_VERSIONS = [ofproto_v1_0.OFP_VERSION]
     _CONTEXTS = { 'wsgi': WSGIApplication }
 
     def __init__(self, *args, **kwargs):
@@ -139,6 +139,7 @@ def changeSwitchForwardingState(self, dpid=None, header=None, actions=None, comm
 
         if(not self.datapaths.has_key(dpid)):
             self.logger.error("unable to find switch with dpid " + dpid)
+            self.logger.error(self.datapaths)
             return
 
         datapath = self.datapaths[dpid]

python/SciPass.py

@@ -915,7 +915,7 @@ def setSensorLoad(self, sensor, load):
   def run_balancers(self):
     for dpid in self.config:
       for domain_name in self.config[dpid]:
-        self.logger.info("Balancing: %s %s", dpid, domain_name)
+        self.logger.debug("Balancing: %s %s", dpid, domain_name)
         self.config[dpid][domain_name]['balancer'].balance()
 
 
@@ -924,7 +924,7 @@ def getBalancer(self, dpid, domain_name):
 
 
   def TimeoutFlows(self, dpid, flows):
-    self.logger.error("Looking for flows to timeout")
+    self.logger.debug("Looking for flows to timeout")
     now = time.time()
     for flow in self.hardTimeouts:
       if(flow['dpid'] == dpid):