chef-provisioning-opennebula 0.4.4 → 0.4.6

data/lib/chef/provisioning/opennebula_driver/one_lib.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,10 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'opennebula'
-
-require 'opennebula/document'
-
 #
 # Sample Document definition.
 #
@@ -50,30 +46,14 @@ class Chef
       # Implementation.
       #
       class OneLib
-        attr_accessor :client, :version_ge_4_14
+        attr_reader :client, :version_ge_4_14
 
         def initialize(args)
-          credentials = args[:credentials]
-          endpoint = args[:endpoint]
-          options = args[:options] || {}
-          if args[:driver_url]
-            scan = args[:driver_url].match(%r/(opennebula):(https?:\/\/[^:\/]+ (?::[0-9]{2,5})? (?:\/[^:\s]+) ) :?([^:\s]+)?/x)
-            endpoint = scan[2]
-            profile = scan[3]
-            fail "'driver_url' option has invalid format: #{args[:driver_url]}" if endpoint.nil? || profile.nil?
-            one_profile = Chef::Provisioning::OpenNebulaDriver::Credentials.new[profile]
-            credentials = one_profile[:credentials]
-            options = one_profile[:options] || {}
-          end
-          @client = OpenNebula::Client.new(credentials, endpoint, options)
+          @client = OpenNebula::Client.new(args[:credentials], args[:endpoint], args[:options])
           rc = @client.get_version
           raise OpenNebulaException, rc.message if OpenNebula.is_error?(rc)
-
-          server_version = rc.split('.').map(&:to_i)
-          gem_version = Gem.loaded_specs["opennebula"].version.to_s.split('.').map(&:to_i)
+          gem_version = Gem.loaded_specs['opennebula'].version.to_s.split('.').map(&:to_i)
           @version_ge_4_14 = gem_version[0] > 4 || (gem_version[0] == 4 && gem_version[1] >= 14)
-
-          version_mismatch_warning(server_version, gem_version) if server_version != gem_version
         end
 
         # This function provides a more readable way to return a
@@ -172,7 +152,7 @@ class Chef
             next if filter[:uname] && res.to_hash[hash_key]['UNAME'] != filter[:uname]
             resources << res
           end
-          return nil if resources.size == 0
+          return nil if resources.empty?
           return resources[0] if resources.size == 1
           resources
         end
@@ -191,15 +171,38 @@ class Chef
           end_state ||= 'RUNNING'
           vm = get_resource(:virtualmachine, :id => id)
           fail "Did not find VM with ID: #{id}" unless vm
-          while vm.lcm_state_str != end_state.upcase
+
+          # Wait up to 10 min for the VM to be ready
+          rc = retryable_operation("wait for VM #{id} to be ready", 600, 2) do
             vm.info
-            Chef::Log.debug("Waiting for VM '#{id}' to be in '#{end_state.upcase}' state: '#{vm.lcm_state_str}'")
-            fail "'#{vm.name}'' failed.  Current state: #{vm.state_str}" if vm.state_str == 'FAILED' || vm.lcm_state_str == 'FAILURE'
-            sleep(2)
+            if vm.lcm_state_str != 'LCM_INIT'
+              short_lcm = OpenNebula::VirtualMachine::SHORT_LCM_STATES[vm.lcm_state_str]
+              fail "'#{vm.name}'' failed.  Current state: #{vm.lcm_state_str}" if short_lcm == 'fail'
+            end
+            fail "'#{vm.name}'' failed.  Current state: #{vm.state_str}" if vm.state_str == 'FAILED'
+            Chef::Log.info("current state: '#{vm.lcm_state_str}'  short: '#{short_lcm}'")
+            OpenNebula::Error.new("Waiting") unless vm.lcm_state_str.casecmp(end_state) == 0
           end
+          fail "wait_for_vm timed out: '#{id}'" if rc.nil?
           vm
         end
 
+        # Retry an OpenNebula operation until the timeout expires.  Will always try at least once.
+        def retryable_operation(msg = "operation", timeout = 15, delay = 2)
+          return nil unless block_given?
+          start = Time.now
+          rc = nil
+          loop do
+            rc = yield
+            return true unless OpenNebula.is_error?(rc)
+            Chef::Log.info(msg)
+            sleep delay
+            break if (Time.now - start) > timeout
+          end
+          Chef::Log.info("Timed out waiting for OpenNebula operation.  Got error #{rc.message} from OpenNebula.")
+          nil
+        end
+
         def rename_vm(res, name)
           rc = res.rename(name)
           raise OpenNebulaException, rc.message if OpenNebula.is_error?(rc)
@@ -265,7 +268,8 @@ DEV_PREFIX = #{img_config[:prefix]}
           image = nil
           state = 'INIT'
           pool = get_pool(:image)
-          while state == 'INIT' || state == 'LOCKED'
+
+          retryable_operation("wait for IMAGE #{img_id} to be ready", 600, 2) do
             pool.info!(-2, img_id, img_id)
             pool.each do |img|
               next unless img.id == img_id
@@ -275,7 +279,7 @@ DEV_PREFIX = #{img_config[:prefix]}
               state = cur_state
               break
             end
-            sleep(2)
+            OpenNebula::Error.new("Waiting") if state == 'INIT' || state == 'LOCKED'
           end
           fail "Failed to create #{name} image. State = '#{state}'" if state != 'READY'
           Chef::Log.info("Image #{name} is in READY state")
@@ -384,7 +388,7 @@ DEV_PREFIX = #{img_config[:prefix]}
           t_hash = nil
           doc = OpenNebula::CustomObject.new(OpenNebula::CustomObject.build_xml, @client)
           unless OpenNebula.is_error?(doc)
-            rc = doc.allocate("#{File.read(options[:template_file])}")
+            rc = doc.allocate(File.read(options[:template_file]).to_s)
             fail "Failed to allocate OpenNebula document: #{rc.message}" if OpenNebula.is_error?(rc)
             doc.info!
             t_hash = doc.to_hash['DOCUMENT']['TEMPLATE']
@@ -399,7 +403,7 @@ DEV_PREFIX = #{img_config[:prefix]}
 
         #
         # This method will create a VM template from parameters provided
-        # in the 't' Hash.  The hash must have equivalent structure as the
+        # in the 't' Hash. The hash must have equivalent structure as the
         # VM template.
         #
         # We considered using OpenNebulaHelper::create_template for this,
@@ -470,28 +474,14 @@ DEV_PREFIX = #{img_config[:prefix]}
             else
               comma = (index < count) && level > 0
               level.times { tpl << "  " }
-              if v.is_a?(Integer)
-                tpl << "#{k} = \"#{v}\""
-              elsif v.is_a?(String)
-                # Fix for: template does not support embedded quotation marks
-                # Escaping of " only happens if " is not already escaped, preceded by \\
-                tpl << "#{k} = \"#{v.gsub(/(?<!\\)\"/, '\"')}\""
-              else # any other type
-                # convert to string and print it
-                tpl << "#{k} = \"#{v}\""
-              end
+              txt = v.is_a?(String) ? "#{k} = \"#{v.gsub(/(?<!\\)\"/, '\"')}\"" : "#{k} = \"#{v}\""
+              tpl << txt
               tpl << (comma ? ",\n" : "\n")
               index += 1
             end
           end
           tpl
         end
-
-        def version_mismatch_warning(server, gem)
-          Chef::Log.warn('GEM / SERVER VERSION MISMATCH')
-          Chef::Log.warn("Your gem version is #{gem.join('.')} and the server version is #{server.join('.')}")
-          Chef::Log.warn('Users may experience issues with this gem.')
-        end
       end
     end
   end

data/lib/chef/provisioning/opennebula_driver/resources.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-resources = %w( image template vnet vnet_lease user )
+resources = %w( image template vnet vnet_lease user flow_template flow_service )
 
 resources.each do |r|
   Chef::Log.debug "OpenNebula driver loading resource: one_#{r}"

data/lib/chef/provisioning/opennebula_driver/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ class Chef
     # Extending module.
     #
     module OpenNebulaDriver
-      VERSION = '0.4.4'
+      VERSION = '0.4.6'.freeze
     end
   end
 end

data/lib/chef/resource/one_flow_service.rb

@@ -0,0 +1,61 @@
+# Copyright 2016, BlackBerry Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'chef/provider/one_flow_service'
+
+#
+# Implementation of Resource class.
+#
+class Chef
+  #
+  # Implementation of Resource class.
+  #
+  class Resource
+    #
+    # Implementation of Resource class.
+    #
+    class OneFlowService < Chef::Resource::LWRPBase
+      resource_name :one_flow_service
+
+      attribute :name, :kind_of => String, :name_attribute => true
+      attribute :template, :kind_of => [Fixnum, String], :default => nil
+      attribute :template_options, :kind_of => Hash, :default => {}
+      attribute :mode, :regex => [/^[0-7]{3}$/], :default => '600'
+      attribute :role, :regex => [/^\w+$/], :default => nil
+      attribute :cardinality, :kind_of => Fixnum, :default => -1
+      attribute :period, :kind_of => Fixnum, :default => nil
+      attribute :number, :kind_of => Fixnum, :default => nil
+      attribute :force_scale, :kind_of => [TrueClass, FalseClass], :default => false
+      attribute :override_failsafe, :kind_of => [TrueClass, FalseClass], :default => false
+
+      attribute :driver
+      attribute :flow_url
+
+      attr_accessor :exists, :equal, :template_equal, :mode_equal, :in_running_state
+
+      actions :instantiate, :recover, :delete, :shutdown, :scale,
+              :shutdown_hard, :undeploy, :undeploy_hard, :hold,
+              :release, :stop, :suspend, :resume, :boot,
+              :delete_recreate, :reboot, :reboot_hard, :poweroff,
+              :poweroff_hard, :snapshot_create
+
+      default_action :instantiate
+
+      def initialize(*args)
+        super
+        @driver = run_context.chef_provisioning.current_driver
+      end
+    end
+  end
+end

data/lib/chef/resource/one_flow_template.rb

@@ -0,0 +1,53 @@
+# Copyright 2016, BlackBerry Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'chef/provider/one_flow_template'
+
+#
+# Implementation of Resource class.
+#
+class Chef
+  #
+  # Implementation of Resource class.
+  #
+  class Resource
+    #
+    # Implementation of Resource class.
+    #
+    class OneFlowTemplate < Chef::Resource::LWRPBase
+      resource_name :one_flow_template
+
+      attribute :name, :kind_of => String, :name_attribute => true
+
+      attribute :template, :kind_of => [Hash, String, Fixnum], :default => nil
+      attribute :template_options, :kind_of => Hash, :default => {}
+
+      attribute :service_name, :kind_of => String, :default => nil
+      attribute :mode, :regex => [/^[0-7]{3}$/], :default => '600'
+
+      attribute :driver
+      attribute :flow_url
+
+      attr_accessor :exists, :equal, :template_equal, :mode_equal
+
+      actions :create, :delete
+      default_action :create
+
+      def initialize(*args)
+        super
+        @driver = run_context.chef_provisioning.current_driver
+      end
+    end
+  end
+end

data/lib/chef/resource/one_image.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ class Chef
       attribute :prefix, :kind_of => String, :equal_to => %w(vd xvd sd hd)
       attribute :persistent, :kind_of => [TrueClass, FalseClass]
       attribute :public, :kind_of => [TrueClass, FalseClass]
-      attribute :mode, :regex => [/^\d\d\d$/]
+      attribute :mode, :regex => [/^[0-7]{3}$/]
       attribute :disk_type, :kind_of => String
       attribute :source, :kind_of => String
       attribute :target, :kind_of => String

data/lib/chef/resource/one_template.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/chef/resource/one_user.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/chef/resource/one_vnet.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ class Chef
       attribute :ar_id, :kind_of => Integer
       attribute :template_file, :kind_of => String
       attribute :cluster_id, :kind_of => Integer
-      attribute :mode, :regex => [/^\d\d\d$/]
+      attribute :mode, :regex => [/^[0-7]{3}$/]
 
       attribute :driver
 

data/lib/chef/resource/one_vnet_lease.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/spec/config_sample.rb

@@ -3,15 +3,24 @@
 ## Feel free to modify any variables to your needs.  ##
 #######################################################
 
-# this is the OpenNebula endpoint url
-ONE_XMLRPC = 'http://1.2.3.4:443/api:boggi'
+# your driver url, opennebula:<endpoint_url>:<profile>
+DRIVER_URL = 'opennebula:http://1.2.3.4:443/api:boggi'
+
+# test for profile moving, set nil to skip
+DRIVER_URL_2 = 'opennebula:http://1.2.3.4:443/api:gary'
+
+# set this to nil if you do not want to test OneFlow
+ONE_FLOW_URL = 'http://gary.1.2.3.4:9876'
 
 # the path to your local chef repo, an empty folder would work, if the folder does not exist, one will be automatically created
 CHEF_REPO_PATH = '/home/gary/test-repo'
 
-# required for recipes/OneDriver/create_one_image_spec.rb
+# required for recipes involving allocating datablocks
 DATASTORE_ID = 103
 
+# required for recipes involving allocating vnets
+VNET_ID = 394
+
 VM_TEMPLATE = {
   # the base URL from which files are downloaded eg. chef-client.deb, init.sh, service.gz etc.
   'HTTPBASE' => 'http://my.server.com',

data/spec/integration/test_all_integration_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,276 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'spec_helper'
-require 'chef/provisioning/opennebula_driver'
+require "#{File.dirname(__FILE__)}/../config.rb"
 
-describe 'OneDriver' do
-  describe 'create_one_template_spec.rb' do
-    test_helper(
-      'create_one_template_spec.rb',
-      'OneDriver/create_one_template_spec.rb',
-      "create template 'OpenNebula-test-tpl'"
-    )
-  end
+# Test OneDriver
+require_relative 'test_one_driver'
 
-  describe 'create_one_template_int_spec.rb' do
-    test_helper(
-      'create_one_template_int_spec.rb',
-      'OneDriver/create_one_template_int_spec.rb',
-      "create template 'OpenNebula-test-tpl-ints'"
-    )
-  end
-
-  describe 'instantiate_one_template_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/instantiate_one_template_spec.rb',
-        "created vm 'OpenNebula-tpl-1-vm'"
-      )
-    end
-  end
-
-  describe 'create_bootstrap_vm_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/create_bootstrap_vm_spec.rb',
-        "created vm 'OpenNebula-bootstrap-vm'"
-      )
-    end
-  end
-
-  describe 'create_one_image_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/create_one_image_spec.rb',
-        /allocated image 'OpenNebula-bootstrap-img'.*?wait for image 'OpenNebula-bootstrap-img' to be READY/m
-      )
-    end
-  end
-  describe 'create_one_image_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/create_one_image_spec.rb',
-        /image 'OpenNebula-bootstrap-img' already exists - nothing to do.*?image 'OpenNebula-bootstrap-img' is already in READY state - nothing to do/m
-      )
-    end
-  end
-
-  describe 'attach_one_image_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/attach_one_image_spec.rb',
-        /disk not attached, attaching.*?attached disk OpenNebula-bootstrap-img to OpenNebula-bootstrap-vm/m
-      )
-    end
-  end
-  describe 'attach_one_image_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/attach_one_image_spec.rb',
-        /disk is already attached.*?attached disk OpenNebula-bootstrap-img to OpenNebula-bootstrap-vm/m
-      )
-    end
-  end
-
-  describe 'snapshot_one_image_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/snapshot_one_image_spec.rb',
-        "created snapshot from 'OpenNebula-bootstrap-vm'"
-      )
-    end
-  end
-
-  describe 'converge_bootstrap_vm_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/converge_bootstrap_vm_spec.rb',
-        /vm 'OpenNebula-bootstrap-vm' is ready.*?create client OpenNebula-bootstrap-vm at clients.*?run 'chef-client -l info' on OpenNebula-bootstrap-vm/m
-      )
-    end
-  end
-
-  # deploys two test backend VM's
-  describe 'snapshot_two_image_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/snapshot_two_image_spec.rb',
-        "created snapshot from 'OpenNebula-bootstrap-vm'"
-      )
-    end
-  end
-
-  describe 'create_back_one_vm_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/create_back_one_vm_spec.rb',
-        /created vm 'OpenNebula-back-1-vm'.*?create node OpenNebula-back-1-vm.*?vm 'OpenNebula-back-1-vm' is ready.*?update node OpenNebula-back-1-vm/m
-      )
-    end
-  end
-
-  describe 'attach_back_one_vm_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/attach_back_one_vm_spec.rb',
-        /disk not attached, attaching.*?attached disk OpenNebula-snap-1-img to OpenNebula-back-1-vm/m
-      )
-    end
-  end
-  describe 'attach_back_one_vm_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/attach_back_one_vm_spec.rb',
-        /disk is already attached.*?attached disk OpenNebula-snap-1-img to OpenNebula-back-1-vm/m
-      )
-    end
-  end
-
-  describe 'converge_back_one_vm_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/converge_back_one_vm_spec.rb',
-        /vm 'OpenNebula-back-1-vm' is ready.*?create client OpenNebula-back-1-vm at clients.*?run 'chef-client -l info' on OpenNebula-back-1-vm/m
-      )
-    end
-  end
-
-  describe 'create_back_two_vm_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/create_back_two_vm_spec.rb',
-        /created vm 'OpenNebula-back-2-vm'.*?create node OpenNebula-back-2-vm.*?vm 'OpenNebula-back-2-vm' is ready.*?update node OpenNebula-back-2-vm/m
-      )
-    end
-  end
-
-  describe 'attach_back_two_vm_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/attach_back_two_vm_spec.rb',
-        /disk not attached, attaching.*?attached disk OpenNebula-snap-2-img to OpenNebula-back-2-vm/m
-      )
-    end
-  end
-  describe 'attach_back_two_vm_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/attach_back_two_vm_spec.rb',
-        /disk is already attached.*?attached disk OpenNebula-snap-2-img to OpenNebula-back-2-vm/m
-      )
-    end
-  end
-
-  describe 'converge_back_two_vm_spec.rb' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/converge_back_two_vm_spec.rb',
-        /vm 'OpenNebula-back-2-vm' is ready.*?create client OpenNebula-back-2-vm at clients.*?run 'chef-client -l info' on OpenNebula-back-2-vm/m
-      )
-    end
-  end
-
-  #############
-  ## CLEANUP ##
-  #############
-
-  describe 'delete OpenNebula-test-tpl' do
-    test_helper(
-      'delete OpenNebula-test-tpl',
-      'OneDriver/delete/OpenNebula-test-tpl.rb',
-      "delete template 'OpenNebula-test-tpl'"
-    )
-  end
-
-  describe 'delete OpenNebula-test-tpl-ints' do
-    test_helper(
-      'delete OpenNebula-test-tpl-ints',
-      'OneDriver/delete/OpenNebula-test-tpl-ints.rb',
-      "delete template 'OpenNebula-test-tpl-ints'"
-    )
-  end
-
-  describe 'delete OpenNebula-tpl-1-vm' do
-    test_helper(
-      'delete OpenNebula-tpl-1-vm',
-      'OneDriver/delete/OpenNebula-tpl-1-vm.rb',
-      /destroyed machine OpenNebula-tpl-1-vm.*?delete node OpenNebula-tpl-1-vm.*?delete client OpenNebula-tpl-1-vm at clients/m
-    )
-  end
-
-  describe 'delete OpenNebula-bootstrap-vm' do
-    test_helper(
-      'delete OpenNebula-bootstrap-vm',
-      'OneDriver/delete/OpenNebula-bootstrap-vm.rb',
-      /destroyed machine OpenNebula-bootstrap-vm.*?delete node OpenNebula-bootstrap-vm.*?delete client OpenNebula-bootstrap-vm at clients/m
-    )
-  end
-
-  describe 'delete OpenNebula-bootstrap-img' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/delete/OpenNebula-bootstrap-img.rb',
-        "deleted image 'OpenNebula-bootstrap-img'"
-      )
-    end
-  end
-  describe 'delete OpenNebula-bootstrap-img' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/delete/OpenNebula-bootstrap-img.rb',
-        "image 'OpenNebula-bootstrap-img' does not exist - nothing to do"
-      )
-    end
-  end
-
-  describe 'delete OpenNebula-back-1-vm' do
-    test_helper(
-      'delete OpenNebula-back-1-vm',
-      'OneDriver/delete/OpenNebula-back-1-vm.rb',
-      /destroyed machine OpenNebula-back-1-vm.*?delete node OpenNebula-back-1-vm.*?delete client OpenNebula-back-1-vm at clients/m
-    )
-  end
-
-  describe 'delete OpenNebula-back-2-vm' do
-    test_helper(
-      'delete OpenNebula-back-2-vm',
-      'OneDriver/delete/OpenNebula-back-2-vm.rb',
-      /destroyed machine OpenNebula-back-2-vm.*?delete node OpenNebula-back-2-vm.*?delete client OpenNebula-back-2-vm at clients/m
-    )
-  end
-
-  describe 'delete OpenNebula-snap-1-img' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/delete/OpenNebula-snap-1-img.rb',
-        "deleted image 'OpenNebula-snap-1-img'"
-      )
-    end
-  end
-  describe 'delete OpenNebula-snap-1-img' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/delete/OpenNebula-snap-1-img.rb',
-        "image 'OpenNebula-snap-1-img' does not exist - nothing to do"
-      )
-    end
-  end
-
-  describe 'delete OpenNebula-snap-2-img' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/delete/OpenNebula-snap-2-img.rb',
-        "deleted image 'OpenNebula-snap-2-img'"
-      )
-    end
-  end
-  describe 'delete OpenNebula-snap-2-img' do
-    it do
-      is_expected.to converge_test_recipe(
-        'OneDriver/delete/OpenNebula-snap-2-img.rb',
-        "image 'OpenNebula-snap-2-img' does not exist - nothing to do"
-      )
-    end
-  end
-end
+# Test OneFlow
+require_relative 'test_one_flow' unless ONE_FLOW_URL.nil?