chef-provisioning-opennebula 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8609a2bdd368fd8004c7451eec93e7f4801cae99
-  data.tar.gz: bb88358b632d8f75e45ed1d3e6f0719302428499
+  metadata.gz: f967f28103c43f8a53e87e54eddd0de8fd1f9af1
+  data.tar.gz: cbb861a93ed158a967a661937c9ac3576ad9c66a
 SHA512:
-  metadata.gz: 0c6633a838fb95a2d98183088b7e1c64939cf1efd4f5f161937dd74fd46472b4fb4a15ef6127be71ce0a039d3397b3f534b755cfcebbfedb60608fd3327ae31e
-  data.tar.gz: 6932c9456a158bd2b32a805462b25037f54889399e1941779e8a2f17e08f8846195066701d37a55f46280728519506a687e4d0040113868b556527735d754379
+  metadata.gz: 0d755e26ff9c70c4b08615f051d25747d0f9268bf9c14cd2ef62261161a63d759e65d44045a9ec52ee373fd0ed2cb0c39d1eef54fa382570f94d6e205387df94
+  data.tar.gz: 4eeb678cf8030a172988142c77ec676ad9ebfc3944a548069f29c6c59398caaf9d7a0b8ca2a0955b00610e82734d6056045afb428dc4f22d217d8798d7573891

data/README.md

@@ -3,7 +3,7 @@ chef-provisioning-opennebula
 
 This is the implementation of the OpenNebula driver for chef-provisioning.  It also comes with additional chef resources to manage OpenNebula:
 
-* Template  (one_template)
+* Template (one_template)
 * Image (one_image)
 * VNET (one_vnet)
 * Lease (one_vnet_lease)
@@ -480,17 +480,8 @@ end
 
 ## Rspec Integration tests
 
-Run 'bundle exec rspec ./spec/integration/test_all_integration_spec.rb' in your chef-provisioning-opennebula folder 
-
-Set the following environment variables according to your needs:
-
-```ruby
-ENV['HOME']           - your home directory
-ENV['ONE_XMLRPC']     - this is the OpenNebula endpoint url
-ENV['ONE_AUTH']       - the path to your one_auth file 
-ENV['ONE_HTTPBASE']   - the base URL from which files are downloaded eg. chef-client.deb, init.sh, service.gz etc.
-ENV['CHEF_REPO_PATH'] - the path to your local chef repo
-```
+- Create and configure `spec/config.rb` from `spec/config_sample.rb`, be sure to **read the comments**
+- Run `bundle exec rspec ./spec/integration/test_all_integration_spec.rb` from your chef-provisioning-opennebula folder
 
 ## <a name="development"></a> Development
 
@@ -513,12 +504,11 @@ Created by [Bogdan Buczynski](https://github.com/bbuczynski) (<pikus1@gmail.com>
 
 ## <a name="maintainers"></a> Maintainers
 
-Maintained by
-  * [Andrew J. Brown](https://github.com/andrewjamesbrown) (<anbrown@blackberry.com>)
-  * [Bogdan Buczynski](https://github.com/bbuczynski) (<pikus1@gmail.com>)
-  * [Dongyu 'Gary' Zheng](https://github.com/dongyuzheng) (<garydzheng@gmail.com>)
-  * [Evgeny Yurchenko](https://github.com/EYurchenko) (<eyurchenko@blackberry.com>)
-  * [Phil Oliva](https://github.com/poliva83) (<philoliva8@gmail.com>)
+* [Andrew J. Brown](https://github.com/andrewjamesbrown) (<anbrown@blackberry.com>)
+* [Bogdan Buczynski](https://github.com/bbuczynski) (<pikus1@gmail.com>)
+* [Dongyu 'Gary' Zheng](https://github.com/dongyuzheng) (<garydzheng@gmail.com>)
+* [Evgeny Yurchenko](https://github.com/EYurchenko) (<eyurchenko@blackberry.com>)
+* [Phil Oliva](https://github.com/poliva83) (<philoliva8@gmail.com>)
 
 ## <a name="license"></a> License
 

data/lib/chef/provider/one_template.rb

@@ -50,9 +50,11 @@ class Chef
 
         return unless @current_resource.exists
 
-        new_resource_template = @new_resource.template_file.nil? ?
-            @new_resource.template :
-            driver.one.template_from_file(@new_resource.template_file)
+        new_resource_template = if @new_resource.template_file.nil?
+                                  convert_types(@new_resource.template)
+                                else
+                                  driver.one.template_from_file(@new_resource.template_file)
+                                end
 
         @current_id = template.to_hash['VMTEMPLATE']['ID'].to_i
         @current_resource.template(template.to_hash['VMTEMPLATE']['TEMPLATE'])
@@ -150,6 +152,20 @@ class Chef
         end
       end
 
+      def convert_types(hash)
+        tpl_str = driver.one.create_template(hash)
+        t_hash = nil
+        doc = OpenNebula::CustomObject.new(OpenNebula::CustomObject.build_xml, driver.one.client)
+        unless OpenNebula.is_error?(doc)
+          rc = doc.allocate(tpl_str)
+          fail "Failed to allocate OpenNebula document: #{rc.message}" if OpenNebula.is_error?(rc)
+          doc.info!
+          t_hash = doc.to_hash['DOCUMENT']['TEMPLATE']
+          doc.delete
+        end
+        t_hash
+      end
+
       def get_mode(template)
         perms = template.to_hash['VMTEMPLATE']['PERMISSIONS']
         mode = 0

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

@@ -470,10 +470,17 @@ DEV_PREFIX = #{img_config[:prefix]}
             else
               comma = (index < count) && level > 0
               level.times { tpl << "  " }
-              # Escape quotation marks to fix MAND-1394:
-              #    template does not support embedded quotation marks
-              # Escaping of " only happens if " is not already escaped, preceded by \\
-              tpl << "#{k} = \"#{v.gsub(/(?<!\\)\"/, '\"')}\"" << (comma ? ",\n" : "\n")
+              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
+              tpl << (comma ? ",\n" : "\n")
               index += 1
             end
           end

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

@@ -24,7 +24,7 @@ class Chef
     # Extending module.
     #
     module OpenNebulaDriver
-      VERSION = '0.4.3'
+      VERSION = '0.4.4'
     end
   end
 end

data/spec/config_sample.rb

@@ -0,0 +1,60 @@
+#######################################################
+## This is the config file used for the RSpec tests. ##
+## 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'
+
+# 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
+DATASTORE_ID = 103
+
+VM_TEMPLATE = {
+  # the base URL from which files are downloaded eg. chef-client.deb, init.sh, service.gz etc.
+  'HTTPBASE' => 'http://my.server.com',
+  # it is highly recommended to keep resources low for these tests
+  'MEMORY' => '256',
+  'CPU' => '1',
+  'VCPU' => '1',
+  'OS' => {
+    'ARCH' => 'x86_64'
+  },
+  'DISK' => {
+    'IMAGE' => 'Ubuntu-14.04.1-pre-prod-201411201',
+    'IMAGE_UNAME' => 'my_user',
+    'DRIVER' => 'qcow2'
+  },
+  'NIC' => {
+    'NETWORK' => 'my_network',
+    'NETWORK_UNAME' => 'my_network_user'
+  },
+  'GRAPHICS' => {
+    'LISTEN' => '0.0.0.0',
+    'TYPE' => 'vnc'
+  },
+  'CONTEXT' => {
+    'NETWORK' => 'YES',
+    'HOSTNAME' => '$NAME',
+    'INSTALL_CHEF_CLIENT_COMMAND' => 'dpkg -E -i /mnt/chef-client.deb',
+    'SSH_USERNAME' => 'local',
+    'SSH_PUBLIC_KEY' => File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").strip,
+    'FILES' => '$HTTPBASE/01_chef $HTTPBASE/../chef-client.deb'
+  }
+}
+
+MACHINE_OPTIONS = {
+  :ssh_username => 'local',
+  :ssh_options => {
+    :keys_only => false,
+    :forward_agent => true,
+    :use_agent => true,
+    :user_known_hosts_file => '/dev/null'
+  },
+  :ssh_execute_options => {
+    :prefix => 'sudo '
+  },
+  :cached_installer => true
+}

data/spec/integration/test_all_integration_spec.rb

@@ -1,102 +1,287 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry, Inc.
 #
-#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
+# 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.
+# 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 'spec_helper'
 require 'chef/provisioning/opennebula_driver'
 
-describe "create_one_template_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("create_one_template_spec.rb",
-    "Creating template OpenNebula-test-tpl",
-    "Template OpenNebula-test-tpl already exists") }
-end
+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
 
-describe "instantiate_one_template_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("instantiate_one_template_spec.rb",
-    "Creating instances from template",
-    "Instance with name 'OpenNebula-test-1-vm' already exists") }
-end
+  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 "create_bootstrap_vm_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("create_bootstrap_vm_spec.rb",
-    "Creating VM OpenNebula-bootstrap-vm",
-    "VM OpenNebula-bootstrap-vm exists. Rebooting...") }
-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_one_image_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("create_one_image_spec.rb",
-    "Waiting for image 'OpenNebula-bootstrap-img' to be READY",
-    "Image 'OpenNebula-bootstrap-img' is already in READY state") }
-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 "attach_one_image_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("attach_one_image_spec.rb",
-    "Disk not attached. Attaching...",
-    "Disk is already attached") }
-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 "snapshot_one_image_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("snapshot_one_image_spec.rb",
-    "Creating snapshot from 'OpenNebula-bootstrap-vm'",
-    "Snapshot image 'OpenNebula-snap-1-img' already exists") }
-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 "converge_bootstrap_vm_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("converge_bootstrap_vm_spec.rb") }
-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
 
-# deploys two test backend VM's
-describe "snapshot_two_image_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("snapshot_two_image_spec.rb",
-    "Creating snapshot from 'OpenNebula-bootstrap-vm'",
-    "Snapshot image 'OpenNebula-snap-1-img' already exists") }
-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
 
-describe "create_back_one_vm_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("create_back_one_vm_spec.rb",
-    "Creating VM OpenNebula-back-1-vm",
-    "VM OpenNebula-back-1-vm exists. Rebooting...") }
-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 "attach_back_one_vm_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("attach_back_one_vm_spec.rb",
-    "Disk not attached. Attaching...",
-    "Disk is already attached") }
-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 "converge_back_one_vm_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("converge_back_one_vm_spec.rb") }
-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 "create_back_two_vm_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("create_back_two_vm_spec.rb",
-    "Creating VM OpenNebula-back-2-vm",
-    "VM OpenNebula-back-2-vm exists. Rebooting...") }
-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 "attach_back_two_vm_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("attach_back_two_vm_spec.rb",
-    "Disk not attached. Attaching...",
-    "Disk is already attached") }
-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 "converge_back_two_vm_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("converge_back_two_vm_spec.rb") }
-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
 
-# cleans up all test VMs/templates/images after testing
-# assuming all other tests work as intended, this test will pass
-# in the event a previous test failed, this test will also fail
-describe "delete_all_spec.rb", :type => :recipe do
-  it { is_expected.to converge_test_recipe("delete_all_spec.rb", nil, "does not exist") }
+  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