omf_common 6.0.0 → 6.0.2.pre.1

data/test/omf_common/message/xml/message_spec.rb

@@ -17,10 +17,11 @@ describe OmfCommon::Message::XML::Message do
     end
 
     it "must be able to be serialised as XML" do
-      @message.to_xml.must_match /^<create(.+)create>$/m
-      @message.to_xml.must_match /<rtype>bob<\/rtype>/m
-      @message.to_xml.must_match /<props(.+)props>/m
-      @message.to_xml.must_match /<guard(.+)guard>/m
+      xml_payload = @message.marshall[1].to_xml
+      xml_payload.must_match /^<create(.+)create>$/m
+      xml_payload.must_match /<rtype>bob<\/rtype>/m
+      xml_payload.must_match /<props(.+)props>/m
+      xml_payload.must_match /<guard(.+)guard>/m
     end
   end
 
@@ -35,9 +36,10 @@ describe OmfCommon::Message::XML::Message do
     end
 
     it "must be able to be serialised as XML" do
-      @message.to_xml.must_match /^<release(.+)release>$/m
-      @message.to_xml.must_match /<res_id>bob<\/res_id>/m
-      @message.to_xml.must_match /<guard(.+)guard>/m
+      xml_payload = @message.marshall[1].to_xml
+      xml_payload.must_match /^<release(.+)release>$/m
+      xml_payload.must_match /<res_id>bob<\/res_id>/m
+      xml_payload.must_match /<guard(.+)guard>/m
     end
   end
 
@@ -53,9 +55,9 @@ describe OmfCommon::Message::XML::Message do
           false: false,
           empty: nil,
           boolean_array: [false, true] },
-        { rtype: 'vm', guard: { os_type: 'linux' } }).to_xml
+        { rtype: 'vm', guard: { os_type: 'linux' } }).marshall[1].to_xml
 
-      @message = Message::XML::Message.parse(@xml)
+      Message::XML::Message.parse(@xml) { |v| @message = v }
     end
 
     it "must create the object correctly" do
@@ -119,18 +121,46 @@ describe OmfCommon::Message::XML::Message do
 
   describe "when parsing inform message" do
     it "must validate against inform message schema" do
-      msg = Message::XML::Message.parse <<-XML
+      raw_xml = <<-XML
         <inform xmlns="http://schema.mytestbed.net/omf/6.0/protocol" mid="bob">
           <src>xmpp://bob@localhost</src>
           <ts>100</ts>
           <itype>CREATION.OK</itype>
         </inform>
       XML
+      Message::XML::Message.parse(raw_xml) do |parsed_msg|
+        parsed_msg.ts.must_equal "100"
+        parsed_msg.itype.must_equal "CREATION.OK"
 
-      msg.ts.must_equal "100"
-      msg.itype.must_equal "CREATION.OK"
+        parsed_msg.valid?.must_equal true
+      end
+    end
+  end
+
+  describe "when authentication enabled and certificate provided" do
+    it "must generate an envelope for the message" do
+      Message.stub(:authenticate?, true) do
+        OmfCommon::Auth.init
+
+        comm = mock
+        topic = OmfCommon::Comm::Topic.create("bob_topic")
+        topic.stubs(:address).returns('bob')
+        OmfCommon.stubs(:comm).returns(comm)
+        comm.expects(:create_topic).returns(topic)
 
-      msg.valid?.must_equal true
+        cert = OmfCommon::Auth::Certificate.create(nil, 'sa', 'auth')
+        bob_cert = cert.create_for('bob', 'bob', 'bob')
+
+        message = Message::XML::Message.create(:create,
+                                                { type: 'bob', p1: 'p1_value'},
+                                                { rtype: 'bob', src: 'bob'})
+
+        # m indicates multiple lines
+        message.marshall[1].to_xml.must_match /<env(.+)env>/m
+        message.valid?.must_equal true
+
+        OmfCommon.comm.unstub(:comm)
+      end
     end
   end
 end

data/test/omf_common/message_spec.rb

@@ -53,5 +53,19 @@ describe OmfCommon::Message do
                      { itype: 'STATUS' })
       @message.print_app_event.must_equal "APP_EVENT (app100, #1, DONE.OK): Everything will be OK"
     end
+
+    it "must return inform type (itype), formatted" do
+      @message.itype = 'CREATION.OK'
+
+      @message.itype.must_equal 'CREATION.OK'
+      @message.itype(:ruby).must_equal 'creation_ok'
+      @message.itype(:frcp).must_equal 'CREATION.OK'
+
+      @message.itype = :creation_ok
+
+      @message.itype.must_equal :creation_ok
+      @message.itype(:ruby).must_equal 'creation_ok'
+      @message.itype(:frcp).must_equal 'CREATION.OK'
+    end
   end
 end

data/test/test_helper.rb

@@ -6,10 +6,35 @@ require 'minitest/autorun'
 require 'minitest/pride'
 require 'minitest/spec'
 require 'minitest/mock'
+require 'em/minitest/spec'
+require 'mocha/setup'
 
 require 'omf_common'
+require 'blather/client/dsl'
+
+require 'singleton'
 
 OmfCommon::Message.init(type: :xml)
 
 # Shut up all the loggers
 Logging.logger.root.clear_appenders
+
+# Add reset to singleton classes
+#
+class OmfCommon::Comm
+  def self.reset
+    @@instance = nil
+  end
+end
+
+class OmfCommon::Eventloop
+  def self.reset
+    @@instance = nil
+  end
+end
+
+class OmfCommon::Auth::CertificateStore
+  def self.reset
+    @@instance = nil
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.0.0
-  prerelease: 
+  version: 6.0.2.pre.1
+  prerelease: 6
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -59,6 +59,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,29 +170,38 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.1
 description: Common library of OMF, a generic framework for controlling and managing
   networking testbeds.
 email:
 - omf-user@lists.nicta.com.au
 executables:
-- monitor_topic.rb
-- send_create.rb
-- send_request.rb
+- omf_monitor_topic
+- omf_send_request
+- omf_send_create
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
 - Rakefile
-- bin/monitor_topic.rb
-- bin/send_create.rb
-- bin/send_request.rb
+- bin/file_broadcaster.rb
+- bin/file_receiver.rb
+- bin/omf_keygen
+- bin/omf_monitor_topic
+- bin/omf_send_create
+- bin/omf_send_request
 - example/engine_alt.rb
+- example/ls_app.yaml
 - example/vm_alt.rb
 - lib/omf_common.rb
+- lib/omf_common/auth.rb
+- lib/omf_common/auth/certificate.rb
+- lib/omf_common/auth/certificate_store.rb
+- lib/omf_common/auth/ssh_pub_key_convert.rb
 - lib/omf_common/comm.rb
 - lib/omf_common/comm/amqp/amqp_communicator.rb
+- lib/omf_common/comm/amqp/amqp_file_transfer.rb
 - lib/omf_common/comm/amqp/amqp_topic.rb
 - lib/omf_common/comm/local/local_communicator.rb
 - lib/omf_common/comm/local/local_topic.rb
@@ -186,7 +227,14 @@ files:
 - lib/omf_common/protocol/6.0.rng
 - lib/omf_common/version.rb
 - omf_common.gemspec
+- test/fixture/omf_test.cert.pem
+- test/fixture/omf_test.pem
+- test/fixture/omf_test.pub
+- test/fixture/omf_test.pub.pem
 - test/fixture/pubsub.rb
+- test/omf_common/auth/certificate_spec.rb
+- test/omf_common/auth/ssh_pub_key_convert_spec.rb
+- test/omf_common/comm/topic_spec.rb
 - test/omf_common/comm/xmpp/communicator_spec.rb
 - test/omf_common/comm/xmpp/topic_spec.rb
 - test/omf_common/comm_spec.rb
@@ -211,14 +259,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_common
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Common library of OMF
-test_files: []
-has_rdoc: 
+test_files:
+- test/fixture/omf_test.cert.pem
+- test/fixture/omf_test.pem
+- test/fixture/omf_test.pub
+- test/fixture/omf_test.pub.pem
+- test/fixture/pubsub.rb
+- test/omf_common/auth/certificate_spec.rb
+- test/omf_common/auth/ssh_pub_key_convert_spec.rb
+- test/omf_common/comm/topic_spec.rb
+- test/omf_common/comm/xmpp/communicator_spec.rb
+- test/omf_common/comm/xmpp/topic_spec.rb
+- test/omf_common/comm_spec.rb
+- test/omf_common/command_spec.rb
+- test/omf_common/core_ext/string_spec.rb
+- test/omf_common/message/xml/message_spec.rb
+- test/omf_common/message_spec.rb
+- test/test_helper.rb

data/bin/send_create.rb

@@ -1,94 +0,0 @@
-#
-DESCR = %{
-Send a create to a specific resource (topic) and print out any replies.
-
-Any additional command line arguments are interpreted as paramters to 
-the create.
-}
-
-require 'omf_common'
-
-OP_MODE = :development
-
-opts = {
-  communication: {
-#    url: 'amqp://srv.mytestbed.net'
-  },
-  eventloop: { type: :em},
-  logging: {
-    level: 'info'
-  }  
-}
-
-resource_url = nil
-resource_type = nil
-
-op = OptionParser.new
-op.banner = "Usage: #{op.program_name} [options] type pname1: val1 pname2: val2 ...\n#{DESCR}\n"
-op.on '-r', '--resource-url URL', "URL of resource" do |url|
-  resource_url = url
-end
-op.on '-t', '--type TYPE', "Type of resource to create" do |type|
-  resource_type = type
-end
-op.on '-d', '--debug', "Set logging to DEBUG level" do
-  opts[:logging][:level] = 'debug'
-end
-op.on_tail('-h', "--help", "Show this message") { $stderr.puts op; exit }
-rest = op.parse(ARGV) || []
-
-unless resource_url || resource_type
-  $stderr.puts 'Missing --resource-url --type or'
-  $stderr.puts op
-  exit(-1)
-end
-
-r = resource_url.split('/')
-resource = r.pop
-opts[:communication][:url] = r.join('/')
-
-copts = {}
-key = nil
-def err_exit
-  $stderr.puts("Options need to be of the 'key: value' type")
-  exit(-1)  
-end
-rest.each do |s|
-  sa = s.split(':')
-  if sa.length == 2
-    err_exit if key
-    copts[sa[0]] = sa[1]
-  else
-    if s.end_with?(':')
-      err_exit if key
-      key = s[0]
-    else
-      err_exit unless key
-      copts[key] = s[0]
-      key = nil
-    end
-  end
-end
-err_exit if key
-
-OmfCommon.init(OP_MODE, opts) do |el|
-  OmfCommon.comm.on_connected do |comm|
-    comm.subscribe(resource) do |topic|
-      # topic.on_inform do |msg|
-        # puts "#{resource}   <#{msg.type}(#{msg.itype})>    #{msg.inspect}"
-        # msg.each_property do |name, value|
-          # puts "    #{name}: #{value}"
-        # end
-        # puts "------"
-      # end
-      
-      topic.create(resource_type, copts) do |msg|
-        puts "#{resource}   <#{msg.type}(#{msg.itype})>    #{msg.inspect}"
-        msg.each_property do |name, value|
-          puts "    #{name}: #{value}"
-        end
-        puts "------"
-      end    
-    end
-  end
-end