vagrant_abiquo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b30bdcf2e2b2ca6263318614c9b5b34b377e8045
-  data.tar.gz: 5d1c21fe38e675aed1f3fed59a5e886f921072ed
+  metadata.gz: e84c1cada8bf45ee196f4eff05307c2dbf2da31a
+  data.tar.gz: b4a7b2e211ac6b4e481b1d274e8f39a811f7a62e
 SHA512:
-  metadata.gz: e0bfc80826dd892710b037763e4519c888bdccacc68f74c74a5cc2d6dfc2903f9aaa6c921a31f26aaea2cf1065362eb179678ecd9570b962c257a3c5add4ac00
-  data.tar.gz: eddf98c1af5b58a3f969f26403395e79adf6f06789f7d82b837a5ab502bf25e34a616c3c170af7bc094ff057620436dccaca3b6dad12f192c8191835cc198dfb
+  metadata.gz: 2e93e8bf38d815fc94c4ed68669c7db0a9b48b2b397c02ed7d4e88512eb8efa4d1acf39e9dcac099cb623e58e3591693b6fe6cdc29f2c7c99d863028ef081ccf
+  data.tar.gz: 573c0fefd59d85790c4606511d3636760e9c2b050bbbd08f6720c7ca06c90ea89d8b2d82648e4b48fceb9eca511093205edd236a392f7ee9a0b79dfbb3ddaff8

data/Gemfile.lock

@@ -24,7 +24,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant_abiquo (0.0.3)
+    vagrant_abiquo (0.0.4)
       abiquo-api (~> 0.1.2)
       log4r
 

data/README.md

@@ -72,6 +72,8 @@ The following attributes are available to further configure the provider:
 - `user_data` - An optional user data script to be passed on to the VM. If not
    specified, the plugin adds a simple provision script to ensure SSH keys are
    injected to the VM.
+- `hwprofile` - If the VDC where you are going to deploy uses hardware profiles,
+   specify the one to use by name. Either this or CPU/RAM pair is required.
 
 Run
 ---

data/Vagrantfile

@@ -3,11 +3,7 @@ VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder ".", "/vagrant", type: "rsync"
 
-  (1..5).each do |index|
-    config.vm.define "abiquotesting#{index}" do |t|
-      t.vm.hostname = "abiquotesting#{index}"
-    end
-  end
+  config.vm.define "abiquotesting"
   
   config.vm.provider :abiquo do |provider, override|
     override.vm.box = 'abiquo'
@@ -24,16 +20,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         }
       }
     }
-    provider.cpu_cores = 2
-    provider.ram_mb = 2048
-    provider.virtualdatacenter = 'ESX_VDC'
+    #provider.cpu_cores = 2
+    #provider.ram_mb = 2048
+    provider.hwprofile = '4gb'
+    provider.virtualdatacenter = 'VDC'
     provider.virtualappliance = 'Vagrant Tests'
-    provider.template = 'Centos 7 x86_64'
+    provider.template = 'CentOS 7.3.1611 x64'
 
-    provider.network = {
-      'private_dnsmasq' => nil
-    }
     override.ssh.private_key_path = '~/.ssh/id_rsa'
-    override.ssh.username = 'centos'
   end
 end

data/lib/vagrant_abiquo/actions/create.rb

@@ -22,6 +22,14 @@ module VagrantPlugins
           vdc = get_vdc(@machine.provider_config.virtualdatacenter)
           raise Abiquo::Errors::VDCNotFound, vdc: @machine.provider_config.virtualdatacenter if vdc.nil?
           
+          # Check if we have to use hwprofiles
+          lim = vdc.link(:enterprise).get.link(:limits).get.select {|l| l.link(:location).title == vdc.link(:location).title }.first
+          if lim.enabledHardwareProfiles
+            if @machine.provider_config.hwprofile.nil?
+              raise Abiquo::Errors::HWprofileEnabled, vdc: @machine.provider_config.virtualdatacenter
+            end
+          end
+
           # Find for selected virtual appliance
           vname = vapp_name(@machine)
           vapp = get_vapp(vdc, vname)
@@ -35,17 +43,28 @@ module VagrantPlugins
           tmpl_link = template.link(:edit).clone.to_hash
           tmpl_link['rel'] = "virtualmachinetemplate"
           
-          # Configured CPU and RAM
-          cpu_cores = @machine.provider_config.cpu_cores
-          ram_mb = @machine.provider_config.ram_mb
-
           # VM entity
           vm_definition = {}
-          vm_definition['cpu'] = cpu_cores || template.cpuRequired
-          vm_definition['ram'] = ram_mb || template.ramRequired
+          
+          # Configured CPU and RAM
+          if lim.enabledHardwareProfiles
+            # lookup the hwprofile link
+            hwprofile = vdc.link(:location).get.link(:hardwareprofiles).get
+                              .select {|h| h.name == @machine.provider_config.hwprofile }.first
+            raise Abiquo::Errors::HWProfileNotFound, hwprofile: @machine.provider_config.hwprofile, vdc: vdc.name if hwprofile.nil?
+            hwprofile_lnk = hwprofile.link(:self).clone.to_hash
+            hwprofile_lnk['rel'] = 'hardwareprofile'
+
+            vm_definition['links'] = [ tmpl_link, hwprofile_lnk ]
+          else
+            cpu_cores = @machine.provider_config.cpu_cores
+            ram_mb = @machine.provider_config.ram_mb
+            vm_definition['cpu'] = cpu_cores || template.cpuRequired
+            vm_definition['ram'] = ram_mb || template.ramRequired
+          end
+
           vm_definition['label'] = @machine.name
           vm_definition['vdrpEnabled'] = true
-          vm_definition['links'] = [ tmpl_link ]
 
           # Create VM
           env[:ui].info I18n.t('vagrant_abiquo.info.create')

data/lib/vagrant_abiquo/config.rb

@@ -6,6 +6,7 @@ module VagrantPlugins
       attr_accessor :virtualappliance
       attr_accessor :cpu_cores
       attr_accessor :ram_mb
+      attr_accessor :hwprofile
       attr_accessor :template
       attr_accessor :network
       attr_accessor :user_data
@@ -17,6 +18,7 @@ module VagrantPlugins
         @template               = UNSET_VALUE
         @cpu_cores              = 0
         @ram_mb                 = 0
+        @hwprofile              = UNSET_VALUE
         @network                = UNSET_VALUE
         @user_data              = UNSET_VALUE
       end
@@ -33,6 +35,7 @@ module VagrantPlugins
         @cpu_cores = ENV['ABQ_CPU'] if @cpu_cores == 0
         @ram_mb = ENV['ABQ_RAM'] if @ram_mb == 0
         @ram_mb = nil if @ram_mb == 0
+        @hwprofile = ENV['ABQ_HWPROFILE'] if @hwprofile == UNSET_VALUE
 
         @network = { ENV['ABQ_NET'] => ENV['ABQ_IP'] } if @network == UNSET_VALUE
 
@@ -47,6 +50,7 @@ module VagrantPlugins
         errors << I18n.t('vagrant_abiquo.config.abiquo_connection_data') if !@abiquo_connection_data
         errors << I18n.t('vagrant_abiquo.config.virtualdatacenter') if !@virtualdatacenter
         errors << I18n.t('vagrant_abiquo.config.template') if !@template
+        errors << I18n.t('vagrant_abiquo.config.cpuhwprofile') if @cpu_cores.nil? and @hwprofile.nil?
 
         { 'Abiquo Provider' => errors }
       end

data/lib/vagrant_abiquo/errors.rb

@@ -21,6 +21,14 @@ module VagrantPlugins
         error_key(:network_error)
       end
 
+      class HWprofileEnabled < AbiquoError
+        error_key(:hwprofile_enabled)
+      end
+
+      class HWProfileNotFound < AbiquoError
+        error_key(:hwprofile_not_found)
+      end
+
       class APIStatusError < AbiquoError
         error_key(:api_status)
       end

data/lib/vagrant_abiquo/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Abiquo
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/locales/en.yml

@@ -26,10 +26,10 @@ en:
       rsyncing: Rsyncing folder %{hostpath} => %{guestpath}...
       rsync_missing: The rsync executable was not found in the current path.
     config:
-      client_id: Client ID is required
-      api_key: API key is required"
-      private_key: SSH private key path is required
-      public_key: SSH public key not found %{key}
+      abiquo_connection_data: Abiquo connection data not found in config!
+      virtualdatacenter: Abiquo virtualdatacenter not found in config!
+      template: Abiquo template not found in config!
+      cpuhwprofile: Either hardware profile or cpu core count is required!
     errors:
       vdc_not_found: Virtual datacenter '%{vdc}' not found
       template_not_found: Template %{template} not found in VDC '%{vdc}'
@@ -37,6 +37,11 @@ en:
       network_error: |-
         A network error has ocurred. The process of assigning the VM to the
         designated networks has failed. Please review the network configuration.
+      hwprofile_enabled: |-
+        The virtualdatacenter '%{vdc}' requires the use of hardware profiles.
+        Correct the Abiquo provider config so it points to a valid hardware
+        profile instead of specifying CPU cores and RAM.
+      hwprofile_not_found: Hardware profile '%{hwprofile}' not found in VDC '%{vdc}'
       public_key: |-
         There was an issue reading the public key at:
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_abiquo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Daniel Beneyto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abiquo-api