openflow-controller 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4acadf7961136eb17add772ffdeefc969d4476
-  data.tar.gz: 9bd7eb4f73e9f23631f561eeb0947619bff9adcb
+  metadata.gz: d91aedf880f4a2f25f272525c275370cc4e65658
+  data.tar.gz: 01467caf6b802b0ce3226ca182b1a031494fbbf7
 SHA512:
-  metadata.gz: f68d7de83750edb01e19754f52a0f86125958b85d4c81f82acc0bafae6c260d9288416fad3c9406a5fe42e62739b93e01a7143162ad22ee247304731c418fb79
-  data.tar.gz: 3decb0031fe40e9d8e5b1a0010d1f09767639b28b9516ab30479eec65127f07bc77e91a70f922d21d9f37f3c7d4d21736ae49c7020dd936185ede3a7c0c40d9e
+  metadata.gz: ed99be3a83bb58201cf83320db81c2192708770dc452559de0408c9621413fec4e6b16726ab0ac2b14a8e95b3d3e499a52403441cee9e456ab231df3c5c93f1d
+  data.tar.gz: f27fc51af539191953bf3fb4eb3d110431da65ace4925d10ca57264a0c3dbb96584a566eaa5a979c5c1f1a6972354855c2a117b97f4790956dae10298b779330

data/bin/ofctl

@@ -4,6 +4,7 @@ require 'readline'
 require_relative '../lib/controller'
 
 PROMPT = '> '
+BYE_MSG = 'Bye!'
 
 command = Cri::Command.define do
   name        'ofctl'
@@ -51,9 +52,18 @@ command = Cri::Command.define do
 
     loop do
       begin
-        puts " => #{eval(Readline.readline(PROMPT, true)).inspect}".green
+        input = Readline.readline(PROMPT, true)
+        if input == 'exit'
+          puts BYE_MSG
+          exit
+        end
+        output = ctl.eval(input).inspect
+        puts " => #{output}".green
       rescue StandardError => e
         puts "#{e.class}: #{e.message}".red
+      rescue SignalException => e
+        puts "\n#{BYE_MSG}"
+        exit
       end
     end
   end

data/lib/controller.rb

@@ -40,6 +40,10 @@ class OFController
     end
   end
 
+  def eval(input)
+    binding.eval(input)
+  end
+
   def run(ip = DEFAULT_IP_ADDRESS, port = DEFAULT_TCP_PORT, *args)
     maybe_send_handler :start, *args
     socket = TCPServer.open(ip, port)
@@ -50,7 +54,11 @@ class OFController
   end
 
   def datapath_ids
-    @switches.keys
+    @switches.keys.map(&:to_i)
+  end
+
+  def switches
+    @switches.values
   end
 
   def send_message(datapath_id, msg = nil)

data/lib/openflow-controller/version.rb

@@ -0,0 +1,5 @@
+module OpenFlow
+  module Controller
+    VERSION = '0.1.7'
+  end
+end

data/lib/switch.rb

@@ -1,7 +1,7 @@
 require 'openflow-protocol'
 
 class OFSwitch
-  attr_reader :controller
+  attr_reader :controller, :features_reply
 
   def initialize(controller, socket)
     @controller = controller

data/spec/controller_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe OFController do
+  before(:all) do
+    class MyCtl < OFController
+      attr_reader :start_args
+
+      def start(*args)
+        @start_args = args
+      end
+    end
+
+    @ctl = OFController.create
+    Thread.new { @ctl.run('127.0.0.1', 4242, 'Hello World!', 42) }
+  end
+
+  it 'should create a subclass when inherited' do
+    expect(@ctl.class).to be(MyCtl)
+    expect(@ctl.logger.level).to eq(Logger::INFO)
+  end
+
+  it 'should handle start' do
+    expect(@ctl.start_args).to eq(['Hello World!', 42])
+  end
+
+  it 'should start a switch when it receives a connection' do
+    socket = TCPSocket.new '127.0.0.1', 4242
+
+    # Exchange Hello messages
+    socket.write OFHello.new.to_binary_s
+    msg = OFParser.read socket
+    expect(msg.class).to be(OFHello)
+
+    # Exchange Echo messages
+    msg = OFParser.read socket
+    expect(msg.class).to be(OFEchoRequest)
+    # socket.write msg.to_reply.to_binary_s
+    socket.write OFEchoReply.new.to_binary_s
+
+    # Exchange Features messages
+    msg = OFParser.read socket
+    expect(msg.class).to be(OFFeaturesRequest)
+    socket.write OFFeaturesReply.new(datapath_id: 1).to_binary_s
+
+    sleep(0.001)
+    expect(@ctl.switches.length).to eq(1)
+    expect(@ctl.switches.first.datapath_id).to eq(1)
+    expect(@ctl.datapath_ids).to eq([1])
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require_relative '../lib/openflow-controller'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: openflow-controller
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Jérémy Pagé
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openflow-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -77,7 +77,10 @@ files:
 - bin/ofctl
 - lib/controller.rb
 - lib/openflow-controller.rb
+- lib/openflow-controller/version.rb
 - lib/switch.rb
+- spec/controller_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/jejepage/openflow-controller
 licenses:
 - MIT
@@ -98,8 +101,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: OpenFlow Controller
-test_files: []
+test_files:
+- spec/controller_spec.rb
+- spec/spec_helper.rb