vagrant-cloudstack 1.3.0 → 1.4.0

data/Rakefile

@@ -1,99 +1,106 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:functionaltest) do |t|
-  t.pattern = "*_spec.rb"
-  t.rspec_opts = "-fd"
-end
-
-# Immediately sync all stdout so that tools like buildbot can
-# immediately load in the output.
-$stdout.sync = true
-$stderr.sync = true
-
-# Change to the directory of this file.
-Dir.chdir(File.expand_path("../", __FILE__))
-
-# This installs the tasks that help with gem creation and
-# publishing.
-Bundler::GemHelper.install_tasks
-
-# Install the `spec` task so that we can run tests.
-RSpec::Core::RakeTask.new
-
-# Default task is to run the unit tests
-task :default => "spec"
-
-
-namespace :functional_tests do
-
-  # Name must match folder beneath functional-tests/
-  functional_test_names = %w(vmlifecycle networking rsync)
-  separate_test_names   = %w(basic)
-
-  desc "Check for required enviroment variables for functional testing"
-  task :check_environment do
-    [
-      'CLOUDSTACK_API_KEY',
-      'CLOUDSTACK_SECRET_KEY',
-      'CLOUDSTACK_HOST',
-      'PUBLIC_SOURCE_NAT_IP',
-      'NETWORK_NAME',
-      'SERVICE_OFFERING_NAME',
-      'ZONE_NAME',
-      'PUBLIC_WINRM_PORT',
-      'PRIVATE_WINRM_PORT',
-      'PUBLIC_SSH_PORT',
-      'PRIVATE_SSH_PORT',
-      'SOURCE_CIDR',
-      'LINUX_TEMPLATE_NAME',
-      'WINDOWS_TEMPLATE_NAME'
-    ].each do |var|
-      if ENV[var].nil?
-        puts "#{var} not set. Quitting"
-        exit 1
-      end
-    end
-  end
-
-  desc "Run all functional tests"
-  task :all => [ :check_environment ] do
-    functional_test_names.each do |test_name|
-      Rake::Task["functional_tests:#{test_name}"].invoke
-    end
-  end
-
-
-  functional_test_names.each do |test_dir_name|
-    desc "Run functional test: #{test_dir_name}"
-    task test_dir_name => [ :check_environment ] do
-      Dir.chdir("#{File.expand_path('../', __FILE__)}/functional-tests/#{test_dir_name}/")
-      Dir.glob("Vagrantfile*", File::FNM_CASEFOLD).each do |vagrant_file|
-
-        ENV['TEST_NAME'] = "vagrant_cloudstack_functional_test-#{test_dir_name}"
-        ENV['VAGRANT_VAGRANTFILE'] = vagrant_file
-        puts "Running RSpec tests in folder : #{test_dir_name}"
-        puts "Using Vagrant file            : #{ENV['VAGRANT_VAGRANTFILE']}"
-        Rake::Task[:functionaltest].execute
-      end
-    end
-  end
-
-  separate_test_names.each do |test_dir_name|
-    desc "Run functional test: #{test_dir_name}"
-    task test_dir_name => [ :check_environment ] do
-      Dir.chdir("#{File.expand_path('../', __FILE__)}/functional-tests/#{test_dir_name}/")
-      Dir.glob("Vagrantfile*", File::FNM_CASEFOLD).each do |vagrant_file|
-
-        ENV['TEST_NAME'] = "vagrant_cloudstack_functional_test-#{test_dir_name}"
-        ENV['VAGRANT_VAGRANTFILE'] = vagrant_file
-        puts "Running RSpec tests in folder : #{test_dir_name}"
-        puts "Using Vagrant file            : #{ENV['VAGRANT_VAGRANTFILE']}"
-        Rake::Task[:functionaltest].execute
-      end
-    end
-  end
-
-
-end
+require 'rubygems'
+require 'bundler/setup'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:functionaltest) do |t|
+  t.pattern = "*_spec.rb"
+  t.rspec_opts = "-fd"
+end
+
+# Immediately sync all stdout so that tools like buildbot can
+# immediately load in the output.
+$stdout.sync = true
+$stderr.sync = true
+
+# Change to the directory of this file.
+Dir.chdir(File.expand_path("../", __FILE__))
+
+# This installs the tasks that help with gem creation and
+# publishing.
+Bundler::GemHelper.install_tasks
+
+# Install the `spec` task so that we can run tests.
+RSpec::Core::RakeTask.new
+
+# Default task is to run the unit tests
+task :default => "spec"
+
+
+namespace :functional_tests do
+
+  # Name must match folder beneath functional-tests/
+  functional_test_names = %w(vmlifecycle networking rsync)
+  separate_test_names   = %w(basic)
+
+  desc "Check for required enviroment variables for functional testing"
+  task :check_environment do
+    missing_env=false
+    [
+      'CLOUDSTACK_API_KEY',
+      'CLOUDSTACK_SECRET_KEY',
+      'CLOUDSTACK_HOST',
+      'PUBLIC_SOURCE_NAT_IP',
+      'NETWORK_NAME',
+      'SERVICE_OFFERING_NAME',
+      'ZONE_NAME',
+      'PUBLIC_WINRM_PORT',
+      'PRIVATE_WINRM_PORT',
+      'PUBLIC_SSH_PORT',
+      'PRIVATE_SSH_PORT',
+      'SOURCE_CIDR',
+      'LINUX_TEMPLATE_NAME',
+      'WINDOWS_TEMPLATE_NAME',
+      'VPC_PUBLIC_IP',
+      'VPC_TIER_NAME',
+      'VR_PUBLIC_IP',
+      'VR_NETWORK_NAME',
+      'DISK_OFFERING_NAME'
+    ].each do |var|
+      if ENV[var].nil?
+        puts "Please set environment variable #{var}."
+        missing_env=true
+      end
+    end
+    exit 1 if missing_env
+  end
+
+  desc "Run all functional tests"
+  task :all => [ :check_environment ] do
+    functional_test_names.each do |test_name|
+      Rake::Task["functional_tests:#{test_name}"].invoke
+    end
+  end
+
+
+  functional_test_names.each do |test_dir_name|
+    desc "Run functional test: #{test_dir_name}"
+    task test_dir_name => [ :check_environment ] do
+      Dir.chdir("#{File.expand_path('../', __FILE__)}/functional-tests/#{test_dir_name}/")
+      Dir.glob("Vagrantfile*", File::FNM_CASEFOLD).each do |vagrant_file|
+
+        ENV['TEST_NAME'] = "vagrant_cloudstack_functional_test-#{test_dir_name}"
+        ENV['VAGRANT_VAGRANTFILE'] = vagrant_file
+        puts "Running RSpec tests in folder : #{test_dir_name}"
+        puts "Using Vagrant file            : #{ENV['VAGRANT_VAGRANTFILE']}"
+        Rake::Task[:functionaltest].execute
+      end
+    end
+  end
+
+  separate_test_names.each do |test_dir_name|
+    desc "Run functional test: #{test_dir_name}"
+    task test_dir_name => [ :check_environment ] do
+      Dir.chdir("#{File.expand_path('../', __FILE__)}/functional-tests/#{test_dir_name}/")
+      Dir.glob("Vagrantfile*", File::FNM_CASEFOLD).each do |vagrant_file|
+
+        ENV['TEST_NAME'] = "vagrant_cloudstack_functional_test-#{test_dir_name}"
+        ENV['VAGRANT_VAGRANTFILE'] = vagrant_file
+        puts "Running RSpec tests in folder : #{test_dir_name}"
+        puts "Using Vagrant file            : #{ENV['VAGRANT_VAGRANTFILE']}"
+        Rake::Task[:functionaltest].execute
+      end
+    end
+  end
+
+
+end

data/bootstrap.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAyxoANMip0RrJ9YeBHrw9J6zEcHtY06I930mV5Jj0qQh4xY+x
+t2ra2GZFGYBHDqp8akIgm5wXsBUXX1KoP2DsURyKTeo4UrXG+KAaVziTKqbPxGHO
+1HxZ1xkEifW1+UlC9Ghu2klI2MyedgpVwsEvT6JYyu7UJeklE3DrWkQHOFN7J/IL
+XtuP7PvSYVC+5TUgyCC1n0KJLixjFgCPZl+5xpY3oM5gU9jVWOXGwUPt3d2/RgnF
+0XLeGlm0TbibVX+Po5OEmC3c8cccBg5JIOVUZ8Yq6EuejjfFYkMET5B2MLTDdrl0
+pzv9EIVsGuQ5jQCzrMkiSz9ExTU6OPKJZWTRUwIBIwKCAQEAnK2oYzu2M5hSp3cp
+F7XIxtW8HEHlcA9xjv5AboSfexUp9316d4zx92TWOD5is4rVAYN4PYcK9YydAGRV
+57/MPpJcEDhXVb9tmzmt64NqNth0ZEtzqztbP4hT9WXG5OC+n0k/knMMT3lHCppC
+KIZmU1/7Wrg9QdEcmfgGA84UMsKstkmyZQvNoxEDnLV3u0e6dLv1lrSnn2wuJl6u
+eEcGq119wW/xKV5wgjgE7G8SDQ4DwFLaRUNA3GEeIYdXU1v5AI+5HjR+/VCa89GM
+qb8mfUZjf1sxYW2s8kxxusAgMq/H2SRLekg8TwlzF3xHlPTxxOVnmV9/zQ3e9Fik
+RTNumwKBgQD94SNYdhX7m2qg+GNHKn00qSMQJOEYCKxmac3fwFdqQxibGXiFDrrL
+w/n44QoRwP2v5/byxChYVD6ART0SLuclKXMsOH35ht2W6DJltALFZp8upVk1ZSah
+zfotISXcYxaCnIugG7QfQdyeFSA3uN9vH7FEze0v9DTPXTIrPJvqWwKBgQDMzEk9
+b0SARUu68x6tHUf6azlnH1FVfMRYjWwZVfgXdfF0xXjlBgJuQXPHflSL0xBDZMPe
+CNbl19Yy5oA94HaGguFL9il3sMNm60eCaurFaD2Ew8gMtECYuQIwyo3+SYr7a12Y
+oSo6S8J7Myxiqr3SQgFzo4pvJgFmSaxG2I+2aQKBgQCuFrkmt1+H9YryCWil0/4V
+e0s+RSyixB5yHKptizSgowmO7OTthnF1yDZhhF6tFp9UDMaX1vcX/0DM/EciaU4K
+2pgeUp+GiF1uyxs+bM6zPw4RW3BfIMoIjT3VzZZN+s2bZAf4wookD+e820lKx+mr
+SO6VlIVithWVgbwAZBMkWwKBgEY3aZFn+jqbamv7lX0unFXbnqcDbFfTAX1yUPK+
+Y7BFsd7knnpoddyouftBQY8GiTuthPurQl1ukpUb1DJ42C4ePp2ze+6Fv1Z8jYvM
+4sdW8IVKcHliX0pOD2EvgSP79SMAPVjmzKZF3Ed/Qmr4thwz4z2XKCYbqLVbFn6w
+pk0rAoGBAJWNcH9WB5itvwRrfn0G+Q1reH/8rc59QkU+XfDnJadBcvDc41bGiUM1
+ynlE1/1emU3L2syZrT7Wuob1wNzMfeHLIASuIjYt337bHfWsT8qI4BekhZf/PoNx
+eYhpBXmesWJWksYOuMt+/cFus+59Rm6cFrLrp1bgzzqDPNGaslyD
+-----END RSA PRIVATE KEY-----

data/build_rpm.sh

@@ -1,7 +1,7 @@
-#!/bin/bash
-VERSION=1.3.0
-mkdir -p /tmp/vagrant-cloudstack-build_rpm.$$/vagrant-cloudstack-$VERSION
-cp -r . /tmp/vagrant-cloudstack-build_rpm.$$/vagrant-cloudstack-$VERSION/
-tar -C /tmp/vagrant-cloudstack-build_rpm.$$/ -czf ~/rpmbuild/SOURCES/vagrant-cloudstack-$VERSION.tar.gz vagrant-cloudstack-$VERSION
-rpmbuild --define "gemver $VERSION" -bb vagrant-cloudstack.spec
-rm -rf /tmp/vagrant-cloudstack-build_rpm.$$
+#!/bin/bash
+VERSION=1.4.0
+mkdir -p /tmp/vagrant-cloudstack-build_rpm.$$/vagrant-cloudstack-$VERSION
+cp -r . /tmp/vagrant-cloudstack-build_rpm.$$/vagrant-cloudstack-$VERSION/
+tar -C /tmp/vagrant-cloudstack-build_rpm.$$/ -czf ~/rpmbuild/SOURCES/vagrant-cloudstack-$VERSION.tar.gz vagrant-cloudstack-$VERSION
+rpmbuild --define "gemver $VERSION" -bb vagrant-cloudstack.spec
+rm -rf /tmp/vagrant-cloudstack-build_rpm.$$

data/functional-tests/basic/Vagrantfile.basic_networking

@@ -1,45 +1,45 @@
-# -*- 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.synced_folder ".", "/vagrant", disabled: true, type: 'rsync' # if Vagrant::Util::Platform.windows?
-  config.vm.box = ENV['LINUX_TEMPLATE_NAME']
-
-  config.vm.provider :cloudstack do |cloudstack, override|
-    cloudstack.display_name = ENV['TEST_NAME']
-
-    cloudstack.host       = ENV['CLOUDSTACK_HOST']
-    cloudstack.path       = '/client/api'
-    cloudstack.port       = '8080'
-    cloudstack.scheme     = 'http'
-    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.expunge_on_destroy    = ENV['CS_EXPUNGE'] == "true"
-    cloudstack.network_type          = "Ignored"
-    cloudstack.ssh_key               = ENV['SSH_KEY'] unless ENV['SSH_KEY'].nil?
-    cloudstack.ssh_user              = ENV['SSH_USER'] unless ENV['SSH_USER'].nil?
-
-    cloudstack.security_groups       = [{
-                                                :name         => "Awesome_security_group1",
-                                                :description  => "Created from the Vagrantfile",
-                                                :rules        => [{:type => "ingress", :protocol => "TCP", :startport => 23, :endport => 23, :cidrlist => "0.0.0.0/0"}]
-                                        },
-                                        {
-                                                :name         => "Awesome_security_group2",
-                                                :description  => "Created from the Vagrantfile",
-                                                :rules        => [{:type => "ingress", :protocol => "TCP", :startport => 22, :endport => 22, :cidrlist => "0.0.0.0/0"}]
-                                        }]
-  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.synced_folder ".", "/vagrant", disabled: true, type: 'rsync' # if Vagrant::Util::Platform.windows?
+  config.vm.box = ENV['LINUX_TEMPLATE_NAME']
+
+  config.vm.provider :cloudstack do |cloudstack, override|
+    cloudstack.display_name = ENV['TEST_NAME']
+
+    cloudstack.host       = ENV['CLOUDSTACK_HOST']
+    cloudstack.path       = '/client/api'
+    cloudstack.port       = '8080'
+    cloudstack.scheme     = 'http'
+    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.expunge_on_destroy    = ENV['CS_EXPUNGE'] == "true"
+    cloudstack.network_type          = "Ignored"
+    cloudstack.ssh_key               = ENV['SSH_KEY'] unless ENV['SSH_KEY'].nil?
+    cloudstack.ssh_user              = ENV['SSH_USER'] unless ENV['SSH_USER'].nil?
+
+    cloudstack.security_groups       = [{
+                                                :name         => "Awesome_security_group1",
+                                                :description  => "Created from the Vagrantfile",
+                                                :rules        => [{:type => "ingress", :protocol => "TCP", :startport => 23, :endport => 23, :cidrlist => "0.0.0.0/0"}]
+                                        },
+                                        {
+                                                :name         => "Awesome_security_group2",
+                                                :description  => "Created from the Vagrantfile",
+                                                :rules        => [{:type => "ingress", :protocol => "TCP", :startport => 22, :endport => 22, :cidrlist => "0.0.0.0/0"}]
+                                        }]
+  end
+end

data/functional-tests/basic/basic_spec.rb

@@ -1,21 +1,21 @@
-describe 'Basic Network' do
-  it 'starts Linux VM with security groups' do
-    expect(`vagrant up`).to include(
-      'Security Group Awesome_security_group1 created with ID',
-      'Security Group Awesome_security_group2 created with ID',
-      'Security Group: Awesome_security_group1 (',
-      'Security Group: Awesome_security_group2 (',
-      'Network name or id will be ignored',
-      'Machine is booted and ready for use!'
-    )
-    expect($?.exitstatus).to eq(0)
-  end
-  it 'destroys Linux with security groups' do
-    expect(`vagrant destroy --force`).to include(
-      'Terminating the instance...',
-      'Deleted ingress rules',
-      'Deleted egress rules'
-    )
-    expect($?.exitstatus).to eq(0)
-  end
-end
+describe 'Basic Network' do
+  it 'starts Linux VM with security groups' do
+    expect(`vagrant up`).to include(
+      'Security Group Awesome_security_group1 created with ID',
+      'Security Group Awesome_security_group2 created with ID',
+      'Security Group: Awesome_security_group1 (',
+      'Security Group: Awesome_security_group2 (',
+      'Network name or id will be ignored',
+      'Machine is booted and ready for use!'
+    )
+    expect($?.exitstatus).to eq(0)
+  end
+  it 'destroys Linux with security groups' do
+    expect(`vagrant destroy --force`).to include(
+      'Terminating the instance...',
+      'Deleted ingress rules',
+      'Deleted egress rules'
+    )
+    expect($?.exitstatus).to eq(0)
+  end
+end

data/functional-tests/networking/Vagrantfile.advanced_networking

@@ -1,102 +1,119 @@
-# -*- 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'
-cloudstack_pf_ip_address = ENV['PUBLIC_SOURCE_NAT_IP']
-machines = {
-  box1: {
-    # Test fixed public port
-    pf_public_port:   ENV['PUBLIC_SSH_PORT'],
-    # Test fixed private port
-    pf_private_port:  ENV['PRIVATE_SSH_PORT'],
-    firewall_rules: [
-        # Full Firewall rule
-        {:ipaddress => cloudstack_pf_ip_address, :protocol => 'tcp', :startport => 1111, :endport => 1111},
-        # Firewall rule without ':ipaddress' which defaults to 'cloudstack_pf_ip_address'
-        {:protocol => 'tcp', :startport => 1122, :endport => 1122},
-        # Firewall rule without ':protocol', which defaults to 'tcp'
-        {:startport => 1133, :endport => 1133},
-        # Firewall rule without ':endport', which defaults to ':startport' if present
-        {:startport => 1144},
-        # Firewall rule without ':start', which defaults to ':endport' if present
-        {:endport => 22}
-    ],
-    port_forwarding_rules: [
-        # Full portforwarding rule
-        {:ipaddress => cloudstack_pf_ip_address, :protocol => "tcp", :publicport => 1111, :privateport => 22, :openfirewall => false},
-        # Portforwarding rule without ':ipaddress' which defaults to 'cloudstack_pf_ip_address'
-        {:protocol => "tcp", :publicport => 1122, :privateport => 22, :openfirewall => false},
-        # Portforwarding rule without ':protocol', which defaults to 'tcp'
-        {:publicport => 1133, :privateport => 22, :openfirewall => false},
-        # Portforwarding rule without ':openfirewall', which defaults to 'cloudstack.pf_open_firewall'
-        {:publicport => 1144, :privateport => 22},
-        # Portforwarding rule without ':publicport', which defaults to ':privateport'
-        {:privateport => 22},
-        # Portforwarding rule with ':generate_firewall', which generates an apropriate
-        # Firewall rule based ':publicport' => ':startport', and other defaults
-        {:publicport => 1155, :privateport => 22, :generate_firewall => true},
-        # Portforwarding rule which instructs CloudStack to create a Firewall rule
-        {:publicport => 1166, :privateport => 22, :openfirewall => true},
-    ],
-    # Trusted network as array, instead of string. Add some networks to make sure it's an (multi element) Array
-    pf_trusted_networks: [ENV['SOURCE_CIDR'], ',172.31.1.172/32', '172.31.1.173/32'],
-    # Ignore security groups
-    security_groups: [{
-                          :name => "Awesome_security_group",
-                          :description => "Created from the Vagrantfile",
-                          :rules => [{:type => "ingress", :protocol => "TCP", :startport => 22, :endport => 22, :cidrlist => "0.0.0.0/0"}]
-                      }],
-    # Ignore security groups
-    security_group_names: ['default', 'Awesome_security_group'],
-  },
-  box2: {
-    # NO pf_public_port; test auto generated public port
-    # NO pf_private_port; test detection of Communicator port (SSH/Winrm)
-    # NO firewall rules for Communicator (SSH/WinRM), test auto generation
-    # Trusted networks as string instead of array. Add some networks to make sure it supports multiple network-string
-    pf_trusted_networks: ENV['SOURCE_CIDR'] + ',172.31.1.172/32,172.31.1.173/32'
-  }
-}
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |global_config|
-  machines.each_pair do |name, options|
-    global_config.vm.define name do |config|
-      config.vm.box = ENV['LINUX_TEMPLATE_NAME']
-
-      config.vm.synced_folder ".", "/vagrant", type: "rsync",
-                              rsync__exclude: [".git/", "vendor"], disabled: true
-
-      config.vm.provider :cloudstack do |cloudstack, override|
-        cloudstack.display_name = "#{name}-#{ENV['TEST_NAME']}"
-
-        cloudstack.host = ENV['CLOUDSTACK_HOST']
-        # Use default path, port and scheme
-        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.ssh_key = ENV['SSH_KEY'] unless ENV['SSH_KEY'].nil?
-        cloudstack.ssh_user = ENV['SSH_USER'] unless ENV['SSH_USER'].nil?
-        cloudstack.expunge_on_destroy == true
-
-        cloudstack.pf_ip_address = cloudstack_pf_ip_address
-        cloudstack.pf_public_port = options[:pf_public_port]    unless options[:pf_public_port].nil?
-        cloudstack.pf_private_port = options[:pf_private_port]  unless options[:pf_private_port].nil?
-        cloudstack.pf_open_firewall = false
-
-        # With Advanced networking, following Basic networking features should be ignored
-        cloudstack.security_groups = options[:security_groups]            unless options[:security_groups].nil?
-        cloudstack.security_group_names = options[:security_group_names]  unless options[:security_group_names].nil?
-        # With Advanced networking, following Basic networking features should be ignored
-
-        cloudstack.pf_trusted_networks = options[:pf_trusted_networks]      unless options[:pf_trusted_networks].nil?
-        cloudstack.firewall_rules = options[:firewall_rules]                unless options[:firewall_rules].nil?
-        cloudstack.port_forwarding_rules = options[:port_forwarding_rules]  unless options[:port_forwarding_rules].nil?
-      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'
+networks = {
+    VR: {
+        network_name: ENV['VR_NETWORK_NAME'],
+        public_ip: ENV['VR_PUBLIC_IP']
+    },
+    VPC: {
+        network_name: ENV['VPC_TIER_NAME'],
+        public_ip: ENV['VPC_PUBLIC_IP']
+    }
+}
+machines = {}
+networks.each_pair do |net_name, net_options|
+    box_number = 0
+    machines["#{net_name}box#{box_number+=1}"] = {
+      # Test fixed public port
+      pf_public_port:   ENV['PUBLIC_SSH_PORT'],
+      # Test fixed private port
+      pf_private_port:  ENV['PRIVATE_SSH_PORT'],
+      #
+      pf_ip_address: net_options[:public_ip],
+      network_name: net_options[:network_name],
+      firewall_rules: [
+          # Full Firewall rule
+          {:ipaddress => net_options[:public_ip], :protocol => 'tcp', :startport => 1111, :endport => 1111},
+          # Firewall rule without ':ipaddress' which defaults to 'cloudstack_pf_ip_address'
+          {:protocol => 'tcp', :startport => 1122, :endport => 1122},
+          # Firewall rule without ':protocol', which defaults to 'tcp'
+          {:startport => 1133, :endport => 1133},
+          # Firewall rule without ':endport', which defaults to ':startport' if present
+          {:startport => 1144},
+          # Firewall rule without ':start', which defaults to ':endport' if present
+          {:endport => 22}
+      ],
+      port_forwarding_rules: [
+          # Full portforwarding rule
+          {:ipaddress => net_options[:public_ip], :protocol => "tcp", :publicport => 1111, :privateport => 22, :openfirewall => false},
+          # Portforwarding rule without ':ipaddress' which defaults to 'cloudstack_pf_ip_address'
+          {:protocol => "tcp", :publicport => 1122, :privateport => 22, :openfirewall => false},
+          # Portforwarding rule without ':protocol', which defaults to 'tcp'
+          {:publicport => 1133, :privateport => 22, :openfirewall => false},
+          # Portforwarding rule without ':openfirewall', which defaults to 'cloudstack.pf_open_firewall'
+          {:publicport => 1144, :privateport => 22},
+          # Portforwarding rule without ':publicport', which defaults to ':privateport'
+          {:privateport => 22},
+          # Portforwarding rule with ':generate_firewall', which generates an apropriate
+          # Firewall rule based ':publicport' => ':startport', and other defaults
+          {:publicport => 1155, :privateport => 22, :generate_firewall => true},
+          # Portforwarding rule which instructs CloudStack to create a Firewall rule
+          {:publicport => 1166, :privateport => 22, :openfirewall => true},
+      ],
+      # Trusted network as array, instead of string. Add some networks to make sure it's an (multi element) Array
+      pf_trusted_networks: [ENV['SOURCE_CIDR'], ',172.31.1.172/32', '172.31.1.173/32'],
+      # Ignore security groups
+      security_groups: [{
+                            :name => "Awesome_security_group",
+                            :description => "Created from the Vagrantfile",
+                            :rules => [{:type => "ingress", :protocol => "TCP", :startport => 22, :endport => 22, :cidrlist => "0.0.0.0/0"}]
+                        }],
+      # Ignore security groups
+      security_group_names: ['default', 'Awesome_security_group'],
+    }
+
+    machines["#{net_name}box#{box_number+=1}"] = {
+      network_name: net_options[:network_name],
+      pf_ip_address: net_options[:public_ip],
+      # NO pf_public_port; test auto generated public port
+      # NO pf_private_port; test detection of Communicator port (SSH/Winrm)
+      # NO firewall rules for Communicator (SSH/WinRM), test auto generation
+      # Trusted networks as string instead of array. Add some networks to make sure it supports multiple network-string
+      pf_trusted_networks: ENV['SOURCE_CIDR'] + ',172.31.1.172/32,172.31.1.173/32'
+    }
+end
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |global_config|
+  machines.each_pair do |name, options|
+    global_config.vm.define name do |config|
+      config.vm.box = ENV['LINUX_TEMPLATE_NAME']
+
+      config.vm.synced_folder ".", "/vagrant", type: "rsync",
+                              rsync__exclude: [".git/", "vendor"], disabled: true
+
+      config.vm.provider :cloudstack do |cloudstack, override|
+        cloudstack.display_name = "#{name}-#{ENV['TEST_NAME']}"
+
+        cloudstack.host = ENV['CLOUDSTACK_HOST']
+        # Use default path, port and scheme
+        cloudstack.api_key = ENV['CLOUDSTACK_API_KEY']
+        cloudstack.secret_key = ENV['CLOUDSTACK_SECRET_KEY']
+        cloudstack.zone_name = ENV['ZONE_NAME']
+        cloudstack.network_name = options[:network_name]
+        cloudstack.service_offering_name = ENV['SERVICE_OFFERING_NAME']
+        cloudstack.ssh_key = ENV['SSH_KEY'] unless ENV['SSH_KEY'].nil?
+        cloudstack.ssh_user = ENV['SSH_USER'] unless ENV['SSH_USER'].nil?
+        cloudstack.expunge_on_destroy = ENV['EXPUNGE_ON_DESTROY']=="true"
+
+        cloudstack.pf_ip_address = options[:pf_ip_address]
+        cloudstack.pf_public_port = options[:pf_public_port]    unless options[:pf_public_port].nil?
+        cloudstack.pf_private_port = options[:pf_private_port]  unless options[:pf_private_port].nil?
+        cloudstack.pf_open_firewall = false
+
+        # With Advanced networking, following Basic networking features should be ignored
+        cloudstack.security_groups = options[:security_groups]            unless options[:security_groups].nil?
+        cloudstack.security_group_names = options[:security_group_names]  unless options[:security_group_names].nil?
+        # With Advanced networking, following Basic networking features should be ignored
+
+        cloudstack.pf_trusted_networks = options[:pf_trusted_networks]      unless options[:pf_trusted_networks].nil?
+        cloudstack.firewall_rules = options[:firewall_rules]                unless options[:firewall_rules].nil?
+        cloudstack.port_forwarding_rules = options[:port_forwarding_rules]  unless options[:port_forwarding_rules].nil?
+      end
+    end
+  end
+end