omf_rc_openflow 6.0.0.pre → 6.0.0.pre.1

data/README.md

@@ -1,6 +1,11 @@
 # OmfRcOpenflow
 
-OMF Resource Controllers related to Openflow
+This package includes OMF6 Resource Controllers (RCs) related to the OpenFlow technology.
+The OMF6 framework considers everything (hardware, software, etc) as a separate resource.
+This version includes the RCs of the Stanford software tools, named FlowVisor and OpenvSwitch.
+
+* FlowVisor creates OpenFlow Slices (slicing the flow space into separate pieces), so the corresponding RC is the OpenFlow_Slice_Factory.
+* OpenvSwitch creates Virtual OpenFlow Switches on top of a Linux machine using the machine's interfaces, so the corresponding RC is the Virtual_OpenFlow_Switch_Factory.
 
 ## Installation
 
@@ -18,12 +23,16 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+In a Linux machine that runs FlowVisor or OpenvSwitch software, execute:
+
+    $ omf_rc_openflow_slice_factory
+
+Or execute:
+
+    $ omf_rc_virtual_openflow_slice_factory
+
+to control the FlowVisor or OpenvSwitch resource in a OMF6 Experiment Controller (EC).
+
+The 'example' subdirectory includes some examples of experiment descriptions, that could be feeded to the omf_ec binary (the OMF6 EC)
 
-## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/bin/omf_rc_virtual_openflow_switch_factory

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+
+require "optparse"
+require 'omf_rc'
+require 'omf_rc/resource_factory'
+require 'omf_rc_openflow'
+
+$stdout.sync = true
+
+options = {
+  uid: `hostname`.chomp
+}
+
+executable_name = File.basename($PROGRAM_NAME)
+oml_enabled = false
+
+begin
+  oml_enabled = OML4R::init(ARGV, :appName => executable_name) do |opts|
+    opts.banner = "usage: #{executable_name} [options]"
+
+    opts.on("-u USER", "Username") do |user|
+      options[:user] = user
+    end
+
+    opts.on("-p PASSWORD", "Password") do |password|
+      options[:password] = password
+    end
+
+    opts.on("-s SERVER", "PubSub server") do |server|
+      options[:server] = server
+    end
+
+    opts.on("-t TOPIC", "PubSub topic to create, also becomes the uid of the resource, default to hostname") do |topic|
+      options[:uid] = topic
+    end
+
+    opts.on("-d", "--debug", "Debug mode") do
+      options[:debug] = true
+    end
+
+    opts.on("-l LOG_FILE_DIR", "Write log file to this folder") do |file_dir|
+      options[:log_file_dir] = file_dir
+    end
+  end
+rescue => e
+  # Right now OML4R does not raise proper exceptions :(
+  # OML4R requires --oml-noop to be set if we want to run without doing any
+  # measurements... this is too restrictive here, we want to run without OML
+  # if no OML parameters were set and this even if --oml-noop is not set.
+  if e.message.include?('OML4R: Missing values for parameters :expID ')
+    puts "Warning: Missing some OML options to instrument this RC, so it will "+
+      "run without instrumentation. (see --oml-help)"
+  else
+    puts e.message
+    exit(1)
+  end
+end
+
+OmfCommon::Measure.enable if oml_enabled
+
+unless options[:server] && options[:user] && options[:password]
+  puts "Error: Missing parameters to connect to a PubSub Server (see --help)"
+  exit(1)
+end
+
+Logging.logger.root.level = :debug if options[:debug]
+Blather.logger = logger
+
+if options[:log_file_dir] && File.exist?(options[:log_file_dir])
+  Logging.logger.root.add_appenders(
+    Logging.appenders.file(
+      "#{options[:log_file_dir]}/omf_rc.log",
+      :layout => Logging.layouts.pattern(:date_pattern => '%F %T %z',
+                                         :pattern => '[%d] %-5l %c: %m\n')))
+end
+
+EM.run do
+  virtual_openflow_switch_factory = OmfRc::ResourceFactory.new(:virtual_openflow_switch_factory, options)
+  virtual_openflow_switch_factory.connect
+
+  trap(:INT) { virtual_openflow_switch_factory.disconnect }
+  trap(:TERM) { virtual_openflow_switch_factory.disconnect }
+end

data/example/openflow_slice_factory_controller.rb

@@ -19,6 +19,7 @@ opts = {
 
 Logging.logger.root.level = :debug if opts[:debug]
 
+OmfRc::ResourceFactory.load_addtional_resource_proxies(File.dirname(__FILE__)+"/../lib/omf_rc/util")
 OmfRc::ResourceFactory.load_addtional_resource_proxies(File.dirname(__FILE__)+"/../lib/omf_rc/resource_proxy")
 
 EM.run do

data/example/openflow_slice_factory_test.rb

@@ -15,7 +15,7 @@ msgs = {
   config_slice: @comm.configure_message([name: 'test', contact_email: 'a@a']),
   slices: @comm.request_message([:slices]),
   config_flows: @comm.configure_message([flows: [{operation: 'add', device: '00:00:00:00:00:00:00:01', eth_dst: '11:22:33:44:55:66'},
-                                                 {operation: 'add', device: 1, in_port: 10}]]),
+                                                 {operation: 'add', device: '00:00:00:00:00:00:00:01', eth_dst: '11:22:33:44:55:77'}]]),
 }
 
 @flowvisor_topic.subscribe {msgs[:create_slice].publish @flowvisor_id}

data/example/virtual_openflow_switch_factory_controller.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+require 'omf_rc'
+require 'omf_rc/resource_factory'
+$stdout.sync = true
+
+Blather.logger = logger
+
+opts = {
+  # XMPP server domain
+  server: 'srv.mytestbed.net',
+  user: 'ovs',
+  password: 'pw',
+  uid: 'ovs',
+  # Debug mode of not
+  debug: false
+}
+
+Logging.logger.root.level = :debug if opts[:debug]
+
+OmfRc::ResourceFactory.load_addtional_resource_proxies(File.dirname(__FILE__)+"/../lib/omf_rc/util")
+OmfRc::ResourceFactory.load_addtional_resource_proxies(File.dirname(__FILE__)+"/../lib/omf_rc/resource_proxy")
+
+EM.run do
+  # Use resource factory method to initialise a new instance of garage
+  info "Starting #{opts[:uid]}"
+  flowvisor = OmfRc::ResourceFactory.new(:virtual_openflow_switch_factory, opts)
+  flowvisor.connect
+
+  # Disconnect garage from XMPP server, when these two signals received
+  trap(:INT) { flowvisor.disconnect }
+  trap(:TERM) { flowvisor.disconnect }
+end

data/example/virtual_openflow_switch_factory_test.rb

@@ -0,0 +1,74 @@
+# OMF_VERSIONS = 6.0
+
+@comm = OmfEc.comm
+
+# @comm is default communicator defined in script runner
+#
+@ovs_id = "ovs"
+@ovs_topic = @comm.get_topic(@ovs_id)
+
+@switch_id = nil
+@switch_topic = nil
+
+
+msgs = {
+  switches: @comm.request_message([:switches]),
+  create_switch: @comm.create_message([type: 'virtual_openflow_switch']),
+  config_switch_name: @comm.configure_message([name: 'br0']),
+  config_add_port: @comm.configure_message([ports: {operation: 'add', name: 'tun0', type: 'tunnel'}]),
+  request_port: @comm.request_message([port: {information: 'netdev-tunnel/get-port', name: 'tun0'}]),
+  configure_port: @comm.configure_message([port: {name: 'tun0', remote_ip: '138.48.3.201', remote_port: '39505'}]),
+}
+
+@ovs_topic.subscribe {msgs[:switches].publish @ovs_id}
+
+# If flowvisor is not raised, the following rule will be activated.
+@ovs_topic.on_message lambda {|m| m.operation == :inform && m.read_content('inform_type') == 'CREATION_FAILED' } do |message|
+  logger.error message.read_content('reason')
+  done!
+end
+
+msgs[:switches].on_inform_status do |message|
+  logger.info "OVS (#{message.read_property('uid')}) requested switches: #{message.read_property('switches')}"
+  msgs[:create_switch].publish @ovs_id
+end
+
+msgs[:create_switch].on_inform_creation_ok do |message|
+  @switch_id = message.resource_id
+  @switch_topic = @comm.get_topic(@switch_id)
+ 
+  msgs[:release_switch] ||= @comm.release_message {|m| m.element('resource_id', @switch_id)}
+  msgs[:release_switch].on_inform_released do |message|
+    logger.info "Switch (#{@switch_id}) released"
+    m = @comm.request_message([:switches])
+    m.on_inform_status do |message|
+      logger.info "OVS (#{message.read_property('uid')}) requested switches: #{message.read_property('switches')}"
+      done!
+    end
+    m.publish @ovs_id
+  end
+  
+  logger.info "Switch (#{@switch_id}) created"
+  @switch_topic.subscribe {msgs[:config_switch_name].publish @switch_id}
+end
+
+msgs[:config_switch_name].on_inform_status do |message|
+  logger.info "Switch (#{message.read_property('uid')}) configured name: #{message.read_property('name')}"
+  msgs[:config_add_port].publish @switch_id
+end
+
+msgs[:config_add_port].on_inform_status do |message|
+  logger.info "Switch (#{message.read_property('uid')}) configured ports: #{message.read_property('ports')}"
+  msgs[:request_port].publish @switch_id
+end
+
+msgs[:request_port].on_inform_status do |message|
+  logger.info "Switch (#{message.read_property('uid')}) requested port: #{message.read_property('port')}"
+  msgs[:configure_port].publish @switch_id
+end
+
+msgs[:configure_port].on_inform_status do |message|
+  logger.info "Switch (#{message.read_property('uid')}) configured port: #{message.read_property('port')}"
+  msgs[:release_switch].publish @ovs_id
+end
+

data/lib/omf_rc/resource_proxy/openflow_slice.rb

@@ -14,7 +14,7 @@ module OmfRc::ResourceProxy::OpenflowSlice
 
   register_proxy :openflow_slice, :create_by => :openflow_slice_factory
 
-  utility :openflow_tools
+  utility :openflow_slice_tools
 
 
   # Slice's name is initiated with value "nil"

data/lib/omf_rc/resource_proxy/openflow_slice_factory.rb

@@ -19,7 +19,7 @@ module OmfRc::ResourceProxy::OpenflowSliceFactory
 
   register_proxy :openflow_slice_factory
 
-  utility :openflow_tools
+  utility :openflow_slice_tools
 
 
   # Checks if the created child is an :openflow_slice resource and passes the connection arguments that are essential for the connection with flowvisor instance
@@ -37,7 +37,6 @@ module OmfRc::ResourceProxy::OpenflowSliceFactory
     opts.property.flowvisor_connection_args = resource.property.flowvisor_connection_args
   end
 
-
   # A new resource uses the default connection arguments (ip adress, port, etc) to connect with a flowvisor instance
   hook :before_ready do |resource|
     resource.property.flowvisor_connection_args = FLOWVISOR_CONNECTION_DEFAULTS

data/lib/omf_rc/resource_proxy/virtual_openflow_switch.rb

@@ -0,0 +1,143 @@
+# This resource is created from the parent :virtual_openflow_switch_factory resource.
+# It is related with a bridge of an ovsdb-server instance, and behaves as a proxy between experimenter and the actual ovsdb-server bridge.
+#
+module OmfRc::ResourceProxy::VirtualOpenflowSwitch
+  include OmfRc::ResourceProxyDSL
+
+  register_proxy :virtual_openflow_switch, :create_by => :virtual_openflow_switch_factory
+
+  utility :virtual_openflow_switch_tools
+
+
+  # Switch name is initiated with value "nil"
+  hook :before_ready do |resource|
+    resource.property.name = nil
+  end
+
+  # Before release, the related ovsdb-server instance should also remove the corresponding switch
+  hook :before_release do |resource|
+    arguments = {
+      "method" => "transact",
+      "params" => [ "Open_vSwitch",
+                    { "op" => "mutate",
+                      "table" => "Open_vSwitch",
+                      "where" => [],
+                      "mutations" => [["bridges", "delete", ["set", [["uuid", resource.property.uuid]]]]]
+                    },
+                    { "op" => "delete",
+                      "table" => "Bridge",
+                      "where" => [["name", "==", resource.property.name]],
+                    },
+                    { "op" => "delete",
+                      "table" => "Port",
+                      "where" => [["name", "==", resource.property.name]]
+                    },
+                    { "op" => "delete",
+                      "table" => "Interface",
+                      "where" => [["name", "==", resource.property.name]]
+                    }
+                  ],
+      "id" => "remove-switch"
+    }
+    resource.ovs_connection("ovsdb-server", arguments)
+  end
+
+
+  # Switch name is one-time configured
+  configure :name do |resource, name|
+    raise "The name cannot be changed" if resource.property.name
+    resource.property.name = name.to_s
+    arguments = {
+      "method" => "transact",
+      "params" => [ "Open_vSwitch",
+                    { "op" => "insert",
+                      "table" => "Interface",
+                      "row" => {"name" => resource.property.name, "type" => "internal"},
+                      "uuid-name" => "new_interface"
+                    },
+                    { "op" => "insert",
+                      "table" => "Port",
+                      "row" => {"name" => resource.property.name, "interfaces" => ["named-uuid", "new_interface"]},
+                      "uuid-name" => "new_port"
+                    },
+                    { "op" => "insert",
+                      "table" => "Bridge",
+                      "row" => {"name" => resource.property.name, "ports" => ["named-uuid", "new_port"], "datapath_type" => "netdev"},
+                      "uuid-name" => "new_bridge"
+                    },
+                    { "op" => "mutate",
+                      "table" => "Open_vSwitch",
+                      "where" => [],
+                      "mutations" => [["bridges", "insert", ["set", [["named-uuid", "new_bridge"]]]]]
+                    }
+                  ],
+      "id" => "add-switch"
+    }
+    result = resource.ovs_connection("ovsdb-server", arguments)["result"]
+    raise "The requested switch already existed in ovsdb-server or there is another problem" if result[4]
+    resource.property.uuid = result[2]["uuid"][1]
+    resource.property.name
+  end
+
+  # Add/remove port
+  configure :ports do |resource, array_parameters|
+    array_parameters = [array_parameters] if !array_parameters.kind_of?(Array)
+    array_parameters.each do |parameters|
+      arguments = nil
+      if parameters.operation == "add"
+        arguments = {
+          "method" => "transact",
+          "params" => [ "Open_vSwitch",
+                        { "op" => "insert",
+                          "table" => "Interface",
+                          "row" => {"name" => parameters.name, "type" => parameters.type},
+                          "uuid-name" => "new_interface"
+                        },
+                        { "op" => "insert",
+                          "table" => "Port",
+                          "row" => {"name" => parameters.name, "interfaces" => ["named-uuid", "new_interface"]},
+                          "uuid-name" => "new_port"
+                        },
+                        { "op" => "mutate",
+                          "table" => "Bridge",
+                          "where" => [["name", "==", resource.property.name]],
+                          "mutations" => [["ports", "insert", ["set", [["named-uuid", "new_port"]]]]]
+                        }
+                      ],
+          "id" => "add-port"
+        }
+      elsif parameters.operation == "remove" # TODO: It is not filled
+      end
+      result = resource.ovs_connection("ovsdb-server", arguments)["result"]
+      raise "The configuration of the switch ports faced a problem" if result[3]
+    end
+    resource.ports
+  end
+
+  # Request port information (XXX: very restrictive, just to support our case)
+  request :port do |resource, parameters|
+    arguments = {
+      "method" => parameters.information,
+      "params" => [parameters.name],
+      "id" => "port-info"
+    }
+    resource.ovs_connection("ovs-vswitchd", arguments)["result"]
+  end
+
+  # Configure port (XXX: very restrictive, just to support our case)
+  configure :port do |resource, parameters|
+    arguments = {
+      "method" => "transact",
+      "params" => [ "Open_vSwitch",
+                    { "op" => "mutate",
+                      "table" => "Interface",
+                      "where" => [["name", "==", parameters.name]],
+                      "mutations" => [["options", "insert", ["map", 
+                         [["remote_ip", parameters.remote_ip], ["remote_port", parameters.remote_port.to_s]]]]]
+                    }
+                  ],
+      "id" => "configure-port"
+    }
+    resource.ovs_connection("ovsdb-server", arguments)["result"]
+  end
+end

data/lib/omf_rc/resource_proxy/virtual_openflow_switch_factory.rb

@@ -0,0 +1,77 @@
+# This resourse is related with an ovsdb-server (interface of an OVSDB database) and behaves as a proxy between experimenter and this.
+#
+module OmfRc::ResourceProxy::VirtualOpenflowSwitchFactory
+  include OmfRc::ResourceProxyDSL
+
+  # The default arguments of the communication between this resource and the ovsdb-server
+  OVS_CONNECTION_DEFAULTS = {
+    ovsdb_server_host:   "localhost",
+    ovsdb_server_port:   "6635",
+    ovsdb_server_socket: "/usr/local/var/run/openvswitch/db.sock",
+    ovsdb_server_conn:   "unix", # default "unix" between "tcp" and "unix"
+    ovs_vswitchd_pid:    "/usr/local/var/run/openvswitch/ovs-vswitchd.pid",
+    ovs_vswitchd_socket: "/usr/local/var/run/openvswitch/ovs-vswitchd.%s.ctl",
+    ovs_vswitchd_conn:   "unix" #default "unix"
+  }
+
+
+  register_proxy :virtual_openflow_switch_factory
+
+  utility :virtual_openflow_switch_tools
+
+
+  # Checks if the created child is an :virtual_openflow_switch resource and passes the connection arguments
+  hook :before_create do |resource, type, opts = nil|
+    if type.to_sym != :virtual_openflow_switch
+      raise "This resource doesn't create resources of type "+type
+    end
+    begin
+      arguments = {
+        "method" => "list_dbs",
+        "params" => [],
+        "id" => "list_dbs"
+      }
+      resource.ovs_connection("ovsdb-server", arguments)
+    rescue
+      raise "This resource is not connected with an ovsdb-server instance, so it cannot create virtual openflow switches"
+    end
+    opts.property ||= Hashie::Mash.new
+    opts.property.provider = ">> #{resource.uid}"
+    opts.property.ovs_connection_args = resource.property.ovs_connection_args
+  end
+
+  # A new resource uses the default connection arguments (ip adress, port, socket, etc) to connect with a ovsdb-server instance
+  hook :before_ready do |resource|
+    resource.property.ovs_connection_args = OVS_CONNECTION_DEFAULTS
+  end
+
+
+  # Configures the ovsdb-server connection arguments (ip adress, port, socket, etc)
+  configure :ovs_connection do |resource, ovs_connection_args|
+    raise "Connection with a new ovsdb-server instance is not allowed if there exist created switches" if !resource.children.empty?
+    resource.property.ovs_connection_args.update(ovs_connection_args)
+  end
+
+
+  # Returns the ovsdb-server connection arguments (ip adress, port, socket, etc)
+  request :ovs_connection do |resource|
+    resource.property.ovs_connection_args
+  end
+
+  # Returns a list of virtual openflow switches, that correspond to the ovsdb-server bridges.
+  request :switches do |resource|
+    arguments = {
+      "method" => "transact", 
+      "params" => [ "Open_vSwitch", 
+                    { "op" => "select", 
+                      "table" => "Bridge", 
+                      "where" => [], 
+                      "columns" => ["name"]
+                    }
+                  ],
+      "id" => "switches"
+    }
+    result = resource.ovs_connection("ovsdb-server", arguments)["result"]
+    result[0]["rows"].map {|hash_name| hash_name["name"]}
+  end
+end

data/lib/omf_rc/util/{openflow_tools.rb → openflow_slice_tools.rb}

@@ -1,6 +1,6 @@
 require 'xmlrpc/client'
 
-module OmfRc::Util::OpenflowTools
+module OmfRc::Util::OpenflowSliceTools
   include OmfRc::ResourceProxyDSL
 
   # The version of the flowvisor that this resource is able to control 
@@ -71,7 +71,6 @@ module OmfRc::Util::OpenflowTools
   end
 
   work :transformed_parameters do |resource, parameters|
-
     match = []
     FLOW_MATCH_FEATURES.each do |feature|
       match << "#{feature}=#{parameters[feature]}" if parameters[feature]

data/lib/omf_rc/util/virtual_openflow_switch_tools.rb

@@ -0,0 +1,62 @@
+module OmfRc::Util::VirtualOpenflowSwitchTools
+  include OmfRc::ResourceProxyDSL
+
+  # Internal function that returns a hash result of the json-request to the ovsdb-server or the ovs-switchd instances
+  work :ovs_connection do |resource, target, arguments|
+    stream = nil
+    if target == "ovsdb-server"
+      if resource.property.ovs_connection_args.ovsdb_server_conn == "tcp"
+        stream = TCPSocket.new(resource.property.ovs_connection_args.ovsdb_server_host, 
+                               resource.property.ovs_connection_args.ovsdb_server_port)
+      elsif resource.property.ovs_connection_args.ovsdb_server_conn == "unix"
+        stream = UNIXSocket.new(resource.property.ovs_connection_args.ovsdb_server_socket)
+      end
+    elsif target == "ovs-vswitchd"
+      if resource.property.ovs_connection_args.ovs_vswitchd_conn == "unix"
+        file = File.new(resource.property.ovs_connection_args.ovs_vswitchd_pid, "r")
+        pid = file.gets.chomp
+        file.close
+        socket = resource.property.ovs_connection_args.ovs_vswitchd_socket % [pid]
+        stream = UNIXSocket.new(socket)
+      end
+    end
+    stream.puts(arguments.to_json)
+    string = stream.gets('{')
+    counter = 1 # number of read '['
+    while counter > 0
+      char = stream.getc
+      if char == '{'
+        counter += 1
+      elsif char == '}'
+        counter -= 1
+      end
+      string += char
+    end
+    stream.close
+    JSON.parse(string)
+  end
+
+  # Internal function that returns the ports of a specific switch
+  work :ports do |resource|
+    arguments = {
+      "method" => "transact", 
+      "params" => [ "Open_vSwitch", 
+                    { "op" => "select", 
+                      "table" => "Bridge", 
+                      "where" => [["name", "==", resource.property.name]], 
+                      "columns" => ["ports"]
+                    },
+                    { "op" => "select", 
+                      "table" => "Port", 
+                      "where" => [], 
+                      "columns" => ["name", "_uuid"]
+                    }
+                  ],
+      "id" => "ports"
+    }
+    result = resource.ovs_connection("ovsdb-server", arguments)["result"]
+    uuid2name = Hash[result[1]["rows"].map {|hash_uuid_name| [hash_uuid_name["_uuid"][1], hash_uuid_name["name"]]}]
+    uuids = result[0]["rows"][0]["ports"][1].map {|array_uuid| array_uuid[1]}
+    uuids.map {|v| uuid2name[v]}
+  end
+end

data/lib/omf_rc_openflow.rb

@@ -2,4 +2,7 @@ require "omf_rc_openflow/version"
 
 require 'omf_rc/resource_proxy/openflow_slice_factory.rb'
 require 'omf_rc/resource_proxy/openflow_slice.rb'
-require 'omf_rc/util/openflow_tools.rb'
+require 'omf_rc/util/openflow_slice_tools.rb'
+require 'omf_rc/resource_proxy/virtual_openflow_switch_factory.rb'
+require 'omf_rc/resource_proxy/virtual_openflow_switch.rb'
+require 'omf_rc/util/virtual_openflow_switch_tools.rb'

data/lib/omf_rc_openflow/version.rb

@@ -1,3 +1,3 @@
 module OmfRcOpenflow
-  VERSION = "6.0.0.pre"
+  VERSION = "6.0.0.pre.1"
 end

data/omf_rc_openflow.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/omf_rc_openflow/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Kostas Choumas"]
   gem.email         = ["kohoumas@gmail.com"]
-  gem.description   = %q{OMF Resource Controllers related to Openflow}
-  gem.summary       = %q{OMF Resource Controllers related to Openflow}
+  gem.description   = %q{OMF6 Resource Controllers related to the Openflow technology}
+  gem.summary       = %q{OMF6 Resource Controllers related to the Openflow technology, including the Stanford software tools named FlowVisor and OpenvSwitch}
   gem.homepage      = "http://nitlab.inf.uth.gr"
 
   gem.files         = `git ls-files`.split($\)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc_openflow
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre
+  version: 6.0.0.pre.1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_rc
-  requirement: &20473800 !ruby/object:Gem::Requirement
+  requirement: &20646460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,12 +21,13 @@ dependencies:
         version: 6.0.0.pre
   type: :runtime
   prerelease: false
-  version_requirements: *20473800
-description: OMF Resource Controllers related to Openflow
+  version_requirements: *20646460
+description: OMF6 Resource Controllers related to the Openflow technology
 email:
 - kohoumas@gmail.com
 executables:
 - omf_rc_openflow_slice_factory
+- omf_rc_virtual_openflow_switch_factory
 extensions: []
 extra_rdoc_files: []
 files:
@@ -36,11 +37,17 @@ files:
 - README.md
 - Rakefile
 - bin/omf_rc_openflow_slice_factory
+- bin/omf_rc_virtual_openflow_switch_factory
 - example/openflow_slice_factory_controller.rb
 - example/openflow_slice_factory_test.rb
+- example/virtual_openflow_switch_factory_controller.rb
+- example/virtual_openflow_switch_factory_test.rb
 - lib/omf_rc/resource_proxy/openflow_slice.rb
 - lib/omf_rc/resource_proxy/openflow_slice_factory.rb
-- lib/omf_rc/util/openflow_tools.rb
+- lib/omf_rc/resource_proxy/virtual_openflow_switch.rb
+- lib/omf_rc/resource_proxy/virtual_openflow_switch_factory.rb
+- lib/omf_rc/util/openflow_slice_tools.rb
+- lib/omf_rc/util/virtual_openflow_switch_tools.rb
 - lib/omf_rc_openflow.rb
 - lib/omf_rc_openflow/version.rb
 - omf_rc_openflow.gemspec
@@ -67,6 +74,7 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: OMF Resource Controllers related to Openflow
+summary: OMF6 Resource Controllers related to the Openflow technology, including the
+  Stanford software tools named FlowVisor and OpenvSwitch
 test_files: []
 has_rdoc: