change version to .pre

bin/omf_rc_openflow_slice_factory

@@ -3,6 +3,8 @@
 require "optparse"
 require 'omf_rc'
 require 'omf_rc/resource_factory'
+require 'omf_rc_openflow'
+
 $stdout.sync = true
 
 options = {
@@ -72,9 +74,6 @@ if options[:log_file_dir] && File.exist?(options[:log_file_dir])
                                          :pattern => '[%d] %-5l %c: %m\n')))
 end
 
-#OmfRc::ResourceFactory.load_default_resource_proxies
-OmfRc::ResourceFactory.load_addtional_resource_proxies("../lib/omf_rc/resource_proxy")
-
 EM.run do
   openflow_slice_factory = OmfRc::ResourceFactory.new(:openflow_slice_factory, options)
   openflow_slice_factory.connect

example/openflow_slice_factory_controller.rb

@@ -2,29 +2,27 @@
 
 require 'omf_rc'
 require 'omf_rc/resource_factory'
+require 'omf_rc_openflow'
 $stdout.sync = true
 
 Blather.logger = logger
 
 opts = {
   # XMPP server domain
-  server: 'srv.mytestbed.net', # 'localhost',
+  server: 'srv.mytestbed.net',
+  user: 'flowvisor',
+  password: 'pw',
+  uid: 'flowvisor',
   # Debug mode of not
   debug: false
 }
 
 Logging.logger.root.level = :debug if opts[:debug]
 
-OmfRc::ResourceFactory.load_addtional_resource_proxies("../lib/omf_rc/resource_proxy")
-
 EM.run do
   # Use resource factory method to initialise a new instance of garage
-  g = "flowvisor"
-  info "Starting #{g}"
-  flowvisor = OmfRc::ResourceFactory.new(
-    :openflow_slice_factory,
-    opts.merge(user: g, password: 'pw', uid: g)
-  )
+  info "Starting #{opts[:uid]}"
+  flowvisor = OmfRc::ResourceFactory.new(:openflow_slice_factory, opts)
   flowvisor.connect
 
   # Disconnect garage from XMPP server, when these two signals received

lib/omf_rc_openflow/version.rb

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