openflow-controller 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 109e1c4911c835a90566e9c2224d057e23f12468
-  data.tar.gz: fecc6e282c364e83adba7df511c94b8c5139652d
+  metadata.gz: 3b55169812a488fa57a7c87739769f155f821614
+  data.tar.gz: 42f7ef4847a2f6858e5f486643accdc78bef68e9
 SHA512:
-  metadata.gz: 761495183bcae351fa9bf46a316687f8b313e92e1c11088679c3aeb56261584eaa647a1fd9c582a6ee393bd8aedc7cb9f83db6ab1548b4ccd432bed2e656194f
-  data.tar.gz: cfe6b8c90161837ac64dcd7507d5a07906bc6beda68de255280be5903ab2429f791a239c64407c8b1fddd7cc6ef8452b56c3a3024ff2ea93519ced28bcbca771
+  metadata.gz: ae798f44ea134543fcfbf0239bc1c6a3b995830e70babe2b3718d77c2467a9a3c1cbe6de15aa12e66ab52fc90b049ce3ecc43df0844031558528927b6a5384b4
+  data.tar.gz: 37be1296345a3d69b6441bd3c704027ff282669cef09649212c944fbfd04646725a41fa5bd1a04b36c8d7f0f06e00728062d9189de050484a5eae0a4780e8128

data/bin/ofctl

@@ -1,7 +1,22 @@
 #!/usr/bin/env ruby
 require 'gli'
+require 'readline'
 require_relative '../lib/controller'
 
+PROMPT = '> '
+
+def run_console(controller, ip, port, *args)
+  Thread.new { controller.run ip, port, args }
+
+  loop do
+    begin
+      puts " => #{eval(Readline.readline(PROMPT, true)).inspect}"
+    rescue StandardError => e
+      puts "#{e.class}: #{e.message}"
+    end
+  end
+end
+
 module CommandLine
   extend GLI::App
 
@@ -35,6 +50,41 @@ module CommandLine
     end
   end
 
+  desc 'Runs a Simple OpenFlow Controller with REPL'
+  command :console do |c|
+    c.flag :ip,
+      desc: 'IP Address',
+      must_match: /\d+\.\d+\.\d+\.\d+/,
+      required: false,
+      default_value: OFController::DEFAULT_IP_ADDRESS
+    c.flag :port,
+      desc: 'Port Number',
+      type: Integer,
+      required: false,
+      default_value: OFController::DEFAULT_TCP_PORT
+    c.switch :debug,
+      desc: 'Run in Debug Mode',
+      default_value: false
+
+    c.action do |_global_options, options, args|
+      controller = if options[:debug]
+                     OFController.new(Logger::DEBUG)
+                   else
+                     OFController.new
+                   end
+
+      prompt = '> '
+      controller.logger.formatter = proc do |severity, datetime, _progname, msg|
+        buf = PROMPT + Readline::line_buffer
+        "\r" + ' ' * buf.length + "\r" +
+        "#{datetime} (#{severity}) -- #{msg}\n" +
+        buf
+      end
+
+      run_console controller, options[:ip], options[:port], args
+    end
+  end
+
   default_command :help
 
   exit run(ARGV)

data/lib/controller.rb

@@ -31,6 +31,7 @@ class OFController
 
   def initialize(level = Logger::INFO)
     @switches = {}
+    @messages = {}
     @logger = Logger.new($stdout).tap do |logger|
       logger.formatter = proc do |severity, datetime, _progname, msg|
         "#{datetime} (#{severity}) -- #{msg}\n"
@@ -48,12 +49,41 @@ class OFController
     loop { start_switch_thread socket.accept }
   end
 
-  def send_message(datapath_id, msg)
-    @switches.fetch(datapath_id).send(msg)
+  def datapath_ids
+    @switches.keys
+  end
+
+  def send_message(datapath_id, msg = nil)
+    if msg.nil?
+      msg         = datapath_id
+      datapath_id = datapath_ids.first
+    end
+    @switches.fetch(datapath_id.to_s).send(msg)
+  end
+
+  def broadcast(msg)
+    datapath_ids.each { |did| send_message did, msg }
+  end
+
+  def messages_for(datapath_id)
+    @messages.fetch(datapath_id.to_s)
+  end
+
+  def last_message_for(datapath_id)
+    messages_for(datapath_id).last
+  end
+
+  def messages
+    messages_for datapath_ids.first
+  end
+
+  def last_message
+    messages.last
   end
 
   def start(*_args) end
   def switch_ready(_datapath_id) end
+  def message_received(_datapath_id, _msg) end
   def error(_datapath_id, _msg) end
   def echo_request(datapath_id, msg)
     send_message datapath_id, OFEchoReply.new(xid: msg.xid)
@@ -94,7 +124,8 @@ class OFController
 
   def create_and_register_new_switch(socket)
     switch = OFSwitch.new(self, socket)
-    @switches[switch.datapath_id] = switch
+    @messages[switch.datapath_id.to_s] = []
+    @switches[switch.datapath_id.to_s] = switch
   end
 
   def start_switch_main(datapath_id)
@@ -108,13 +139,20 @@ class OFController
   end
 
   def unregister_switch(datapath_id)
-    @switches.delete(datapath_id)
+    @messages.delete(datapath_id.to_s)
+    @switches.delete(datapath_id.to_s)
     logger.info "Switch #{datapath_id} is disconnected."
     maybe_send_handler :switch_disconnected, datapath_id
   end
 
   def handle_openflow_message(datapath_id)
-    msg = @switches.fetch(datapath_id).receive
+    msg = @switches.fetch(datapath_id.to_s).receive
+
+    unless msg.class == OFEchoRequest
+      logger.debug "Switch #{datapath_id} received #{msg.type} message."
+      @messages[datapath_id.to_s] << msg
+      maybe_send_handler :message_received, datapath_id, msg
+    end
 
     case msg
     when OFError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openflow-controller
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jérémy Pagé