vagrant-cloudstack 1.3.0 → 1.4.0

data/functional-tests/networking/networking_spec.rb

@@ -0,0 +1,14 @@
+describe 'Networking features' do
+  it 'creates firewall and portwarding rules for both Virtual Router and VPC' do
+    expect(`vagrant up`).to include(
+                                'VRbox1: Machine is booted and ready for use!',
+                                'VRbox2: Machine is booted and ready for use!',
+                                'VPCbox1: Machine is booted and ready for use!',
+                                'VPCbox2: Machine is booted and ready for use!'
+    )
+    expect($?.exitstatus).to eq(0)
+
+    expect(`vagrant destroy --force`).to include('Terminating the instance...')
+    expect($?.exitstatus).to eq(0)
+  end
+end

data/functional-tests/rsync/Vagrantfile.advanced_networking

@@ -1,56 +1,39 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = '2'
-
-Vagrant.require_version '>= 1.5.0'
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = ENV['LINUX_TEMPLATE_NAME']
-
-  config.vm.synced_folder ".", "/vagrant", type: "rsync",
-  rsync__exclude: [".git/", "vendor"]
-
-  config.vm.provider :cloudstack do |cloudstack, override|
-    cloudstack.display_name = ENV['TEST_NAME']
-
-    cloudstack.host       = ENV['CLOUDSTACK_HOST']
-    cloudstack.path       = '/client/api'
-    cloudstack.port       = '443'
-    cloudstack.scheme     = 'https'
-    cloudstack.api_key    = ENV['CLOUDSTACK_API_KEY']
-    cloudstack.secret_key = ENV['CLOUDSTACK_SECRET_KEY']
-
-    public_source_nat_ip = ENV['PUBLIC_SOURCE_NAT_IP']
-    public_ssh_port      = ENV['PUBLIC_SSH_PORT']
-    open_firewall        = ENV['OPEN_FIREWALL'] == "true"
-
-    cloudstack.zone_name             = ENV['ZONE_NAME']
-    cloudstack.network_name          = ENV['NETWORK_NAME']
-    cloudstack.service_offering_name = ENV['SERVICE_OFFERING_NAME']
-
-    cloudstack.pf_ip_address         = public_source_nat_ip
-    cloudstack.pf_public_port        = public_ssh_port
-    cloudstack.pf_private_port       = ENV['PRIVATE_SSH_PORT']
-    cloudstack.pf_open_firewall      = open_firewall
-
-    unless open_firewall
-      cloudstack.firewall_rules = [
-        {
-          ipaddress: public_source_nat_ip,
-          cidrlist:  ENV['SOURCE_CIDR'],
-          protocol:  'tcp',
-          startport: public_ssh_port.to_i,
-          endport:   public_ssh_port.to_i
-        }
-      ]
-    end
-
-    unless ENV['SSH_KEY'].nil?
-        cloudstack.ssh_key               = ENV['SSH_KEY']
-        cloudstack.ssh_user              = ENV['SSH_USER']
-    end
-  end
-
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = '2'
+
+Vagrant.require_version '>= 1.5.0'
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = ENV['LINUX_TEMPLATE_NAME']
+
+  config.vm.synced_folder ".", "/vagrant", type: "rsync",
+  rsync__exclude: [".git/", "vendor"]
+
+  config.vm.provider :cloudstack do |cloudstack, override|
+    cloudstack.display_name = ENV['TEST_NAME']
+
+    cloudstack.host       = ENV['CLOUDSTACK_HOST']
+    cloudstack.path       = '/client/api'
+    cloudstack.port       = '443'
+    cloudstack.scheme     = 'https'
+    cloudstack.api_key    = ENV['CLOUDSTACK_API_KEY']
+    cloudstack.secret_key = ENV['CLOUDSTACK_SECRET_KEY']
+
+    cloudstack.zone_name             = ENV['ZONE_NAME']
+    cloudstack.network_name          = ENV['NETWORK_NAME']
+    cloudstack.service_offering_name = ENV['SERVICE_OFFERING_NAME']
+
+    cloudstack.pf_ip_address         = ENV['PUBLIC_SOURCE_NAT_IP']
+    cloudstack.pf_trusted_networks   = ENV['SOURCE_CIDR']
+    cloudstack.pf_open_firewall      = false
+
+    unless ENV['SSH_KEY'].nil?
+        cloudstack.ssh_key               = ENV['SSH_KEY']
+        cloudstack.ssh_user              = ENV['SSH_USER']
+    end
+  end
+
+end

data/functional-tests/rsync/rsync_spec.rb

@@ -1,9 +1,9 @@
-describe 'VM RSync' do
-  it 'does rsync to the VM' do
-    expect(`vagrant up`).to include('Machine is booted and ready for use!')
-    expect($?.exitstatus).to eq(0)
-    expect(`vagrant ssh -c "ls /vagrant; echo;"`).to include('Vagrantfile.advanced_networking')
-    expect(`vagrant destroy --force`).to include('Terminating the instance...')
-    expect($?.exitstatus).to eq(0)
-  end
-end
+describe 'VM RSync' do
+  it 'does rsync to the VM' do
+    expect(`vagrant up`).to include('Machine is booted and ready for use!')
+    expect($?.exitstatus).to eq(0)
+    expect(`vagrant ssh -c "ls /vagrant; echo;"`).to include('Vagrantfile.advanced_networking')
+    expect(`vagrant destroy --force`).to include('Terminating the instance...')
+    expect($?.exitstatus).to eq(0)
+  end
+end

data/functional-tests/vmlifecycle/Vagrantfile.advanced_networking

@@ -1,82 +1,66 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = '2'
-
-Vagrant.require_version '>= 1.5.0'
-
-machines = {
-  'linux-box' => {
-    'public_port'    => ENV['PUBLIC_SSH_PORT'],
-    'private_port'   => ENV['PRIVATE_SSH_PORT'],
-    'template'       => ENV['LINUX_TEMPLATE_NAME'],
-    'communicator'   => 'ssh',
-    'rsync_disabled' => true
-  },
-  'windows-box' => {
-    'public_port'    => ENV['PUBLIC_WINRM_PORT'],
-    'private_port'   => ENV['PRIVATE_WINRM_PORT'],
-    'template'       => ENV['WINDOWS_TEMPLATE_NAME'],
-    'communicator'   => 'winrm',
-    'rsync_disabled' => true
-  }
-}
-
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |global_config|
-  machines.each_pair do |name, options|
-    global_config.vm.define name do |config|
-      config.vm.box = options['template']
-
-      config.vm.communicator = options['communicator']
-      config.vm.synced_folder ".", "/vagrant", type: "rsync",
-        rsync__exclude: [".git/", "vendor"], disabled: options['rsync_disabled']
-      config.vm.provider :cloudstack do |cloudstack, override|
-
-        cloudstack.display_name = ENV['TEST_NAME']
-
-        cloudstack.host       = ENV['CLOUDSTACK_HOST']
-        cloudstack.path       = '/client/api'
-        cloudstack.port       = '443'
-        cloudstack.scheme     = 'https'
-        cloudstack.api_key    = ENV['CLOUDSTACK_API_KEY']
-        cloudstack.secret_key = ENV['CLOUDSTACK_SECRET_KEY']
-
-        public_source_nat_ip = ENV['PUBLIC_SOURCE_NAT_IP']
-        open_firewall        = ENV['OPEN_FIREWALL'] == "true"
-
-        cloudstack.zone_name             = ENV['ZONE_NAME']
-        cloudstack.network_name          = ENV['NETWORK_NAME']
-        cloudstack.service_offering_name = ENV['SERVICE_OFFERING_NAME']
-
-        cloudstack.pf_ip_address         = public_source_nat_ip
-
-        cloudstack.pf_public_port        = options['public_port']
-        cloudstack.pf_private_port       = options['private_port']
-        cloudstack.pf_open_firewall      = open_firewall
-
-        unless open_firewall
-          cloudstack.firewall_rules = [
-            {
-              ipaddress: public_source_nat_ip,
-              cidrlist:  ENV['SOURCE_CIDR'],
-              protocol:  'tcp',
-              startport: options['public_port'].to_i,
-              endport:   options['public_port'].to_i
-            }
-          ]
-        end
-
-        unless ENV['SSH_KEY'].nil?
-            cloudstack.ssh_key               = ENV['SSH_KEY']
-            cloudstack.ssh_user              = ENV['SSH_USER']
-        end
-
-        unless ENV['WINDOWS_USER'].nil?
-            cloudstack.vm_user = ENV['WINDOWS_USER']
-        end
-      end
-    end
-  end
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = '2'
+
+Vagrant.require_version '>= 1.5.0'
+
+machines = {
+  'linux-box' => {
+    'template'       => ENV['LINUX_TEMPLATE_NAME'],
+    'communicator'   => 'ssh',
+    'rsync_disabled' => true
+  },
+  'windows-box' => {
+    'template'       => ENV['WINDOWS_TEMPLATE_NAME'],
+    'communicator'   => 'winrm',
+    'rsync_disabled' => true
+  }
+}
+
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |global_config|
+  machines.each_pair do |name, options|
+    global_config.vm.define name do |config|
+      config.vm.box = options['template']
+
+      config.vm.communicator = options['communicator']
+      config.vm.synced_folder ".", "/vagrant", type: "rsync",
+        rsync__exclude: [".git/", "vendor"], disabled: options['rsync_disabled']
+      config.vm.provider :cloudstack do |cloudstack, override|
+
+        cloudstack.display_name = ENV['TEST_NAME']
+
+        cloudstack.host       = ENV['CLOUDSTACK_HOST']
+        cloudstack.path       = '/client/api'
+        cloudstack.port       = '443'
+        cloudstack.scheme     = 'https'
+        cloudstack.api_key    = ENV['CLOUDSTACK_API_KEY']
+        cloudstack.secret_key = ENV['CLOUDSTACK_SECRET_KEY']
+        cloudstack.expunge_on_destroy = ENV['EXPUNGE_ON_DESTROY']=="true"
+
+        cloudstack.zone_name             = ENV['ZONE_NAME']
+        cloudstack.network_name          = ENV['NETWORK_NAME']
+        cloudstack.service_offering_name = ENV['SERVICE_OFFERING_NAME']
+        cloudstack.disk_offering_name    = ENV['DISK_OFFERING_NAME']
+
+        cloudstack.pf_ip_address         = ENV['PUBLIC_SOURCE_NAT_IP']
+
+        cloudstack.pf_public_port        = options['public_port']
+        cloudstack.pf_private_port       = options['private_port']
+        cloudstack.pf_trusted_networks   = ENV['SOURCE_CIDR']
+        cloudstack.pf_open_firewall      = false
+
+        unless ENV['SSH_KEY'].nil?
+            cloudstack.ssh_key               = ENV['SSH_KEY']
+            cloudstack.ssh_user              = ENV['SSH_USER']
+        end
+
+        unless ENV['WINDOWS_USER'].nil?
+            cloudstack.vm_user = ENV['WINDOWS_USER']
+        end
+      end
+    end
+  end
+end

data/functional-tests/vmlifecycle/vmlifecycle_spec.rb

@@ -1,13 +1,13 @@
-describe 'VM Life Cycle' do
-  it 'starts Linux and Windows VM' do
-    expect(`vagrant up`).to include(
-      'linux-box: Machine is booted and ready for use!',
-      'windows-box: Machine is booted and ready for use!'
-    )
-    expect($?.exitstatus).to eq(0)
-  end
-  it 'destroys Linux and Windows VM' do
-    expect(`vagrant destroy --force`).to include('Terminating the instance...')
-    expect($?.exitstatus).to eq(0)
-  end
-end
+describe 'VM Life Cycle' do
+  it 'starts Linux and Windows VM' do
+    expect(`vagrant up`).to include(
+      'linux-box: Machine is booted and ready for use!',
+      'windows-box: Machine is booted and ready for use!'
+    )
+    expect($?.exitstatus).to eq(0)
+  end
+  it 'destroys Linux and Windows VM' do
+    expect(`vagrant destroy --force`).to include('Done removing resources')
+    expect($?.exitstatus).to eq(0)
+  end
+end

data/lib/vagrant-cloudstack/action/connect_cloudstack.rb

@@ -1,47 +1,47 @@
-require 'fog'
-require 'log4r'
-
-module VagrantPlugins
-  module Cloudstack
-    module Action
-      # This action connects to Cloudstack, verifies credentials work, and
-      # puts the Cloudstack connection object into the
-      # `:cloudstack_compute` key in the environment.
-      class ConnectCloudstack
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new('vagrant_cloudstack::action::connect_cloudstack')
-        end
-
-        def call(env)
-          # Get the domain we're going to booting up in
-          domain        = env[:machine].provider_config.domain_id
-
-          # Get the configs
-          domain_config = env[:machine].provider_config.get_domain_config(domain)
-
-          # Build the fog config
-          fog_config    = {
-              :provider => :cloudstack
-              #:domain        => domain_config
-          }
-
-          if domain_config.api_key
-            fog_config[:cloudstack_api_key]           = domain_config.api_key
-            fog_config[:cloudstack_secret_access_key] = domain_config.secret_key
-          end
-
-          fog_config[:cloudstack_host]   = domain_config.host if domain_config.host
-          fog_config[:cloudstack_path]   = domain_config.path if domain_config.path
-          fog_config[:cloudstack_port]   = domain_config.port if domain_config.port
-          fog_config[:cloudstack_scheme] = domain_config.scheme if domain_config.scheme
-
-          @logger.info('Connecting to Cloudstack...')
-          env[:cloudstack_compute] = Fog::Compute.new(fog_config)
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+require 'fog'
+require 'log4r'
+
+module VagrantPlugins
+  module Cloudstack
+    module Action
+      # This action connects to Cloudstack, verifies credentials work, and
+      # puts the Cloudstack connection object into the
+      # `:cloudstack_compute` key in the environment.
+      class ConnectCloudstack
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new('vagrant_cloudstack::action::connect_cloudstack')
+        end
+
+        def call(env)
+          # Get the domain we're going to booting up in
+          domain        = env[:machine].provider_config.domain_id
+
+          # Get the configs
+          domain_config = env[:machine].provider_config.get_domain_config(domain)
+
+          # Build the fog config
+          fog_config    = {
+              :provider => :cloudstack
+              #:domain        => domain_config
+          }
+
+          if domain_config.api_key
+            fog_config[:cloudstack_api_key]           = domain_config.api_key
+            fog_config[:cloudstack_secret_access_key] = domain_config.secret_key
+          end
+
+          fog_config[:cloudstack_host]   = domain_config.host if domain_config.host
+          fog_config[:cloudstack_path]   = domain_config.path if domain_config.path
+          fog_config[:cloudstack_port]   = domain_config.port if domain_config.port
+          fog_config[:cloudstack_scheme] = domain_config.scheme if domain_config.scheme
+
+          @logger.info('Connecting to Cloudstack...')
+          env[:cloudstack_compute] = Fog::Compute.new(fog_config)
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cloudstack/action/is_created.rb

@@ -1,18 +1,18 @@
-module VagrantPlugins
-  module Cloudstack
-    module Action
-      # This can be used with "Call" built-in to check if the machine
-      # is created and branch in the middleware.
-      class IsCreated
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:result] = env[:machine].state.id != :not_created
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module Cloudstack
+    module Action
+      # This can be used with "Call" built-in to check if the machine
+      # is created and branch in the middleware.
+      class IsCreated
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:result] = env[:machine].state.id != :not_created
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cloudstack/action/is_stopped.rb

@@ -1,18 +1,18 @@
-module VagrantPlugins
-  module Cloudstack
-    module Action
-      # This can be used with "Call" built-in to check if the machine
-      # is stopped and branch in the middleware.
-      class IsStopped
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:result] = env[:machine].state.id == :stopped
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module Cloudstack
+    module Action
+      # This can be used with "Call" built-in to check if the machine
+      # is stopped and branch in the middleware.
+      class IsStopped
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:result] = env[:machine].state.id == :stopped
+          @app.call(env)
+        end
+      end
+    end
+  end
+end