vagrant-cloudstack 0.10.0 → 1.0.0

data/lib/vagrant-cloudstack/config.rb

@@ -106,11 +106,21 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :keypair
 
+      # Paramters for Static NAT
+      #
+      # @return [String]
+      attr_accessor :static_nat
+
       # IP address id to use for port forwarding rule
       #
       # @return [String]
       attr_accessor :pf_ip_address_id
 
+      # IP address to use for port forwarding rule
+      #
+      # @return [String]
+      attr_accessor :pf_ip_address
+
       # public port to use for port forwarding rule
       #
       # @return [String]
@@ -121,6 +131,23 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :pf_private_port
 
+      # flag to enable/disable automatic open firewall rule
+      #
+      # @return [Boolean]
+      attr_accessor :pf_open_firewall
+
+      # comma separated list of port forwarding rules
+      # (hash with rule parameters)
+      #
+      # @return [Array]
+      attr_accessor :port_forwarding_rules
+
+      # comma separated list of firewall rules
+      # (hash with rule parameters)
+      #
+      # @return [Array]
+      attr_accessor :firewall_rules
+
       # comma separated list of security groups id that going
       # to be applied to the virtual machine.
       #
@@ -155,6 +182,16 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :user_data
 
+      # The key to be used when loging in to the vm via ssh
+      #
+      # @return [String]
+      attr_accessor :ssh_key
+
+      # The username to be used when loging in to the vm via ssh
+      #
+      # @return [String]
+      attr_accessor :ssh_user
+
 
       def initialize(domain_specific=false)
         @host                      = UNSET_VALUE
@@ -177,16 +214,22 @@ module VagrantPlugins
         @zone_id                   = UNSET_VALUE
         @zone_name                 = UNSET_VALUE
         @keypair                   = UNSET_VALUE
+        @static_nat                = UNSET_VALUE
         @pf_ip_address_id          = UNSET_VALUE
+        @pf_ip_address             = UNSET_VALUE
         @pf_public_port            = UNSET_VALUE
         @pf_private_port           = UNSET_VALUE
+        @pf_open_firewall          = UNSET_VALUE
+        @port_forwarding_rules     = UNSET_VALUE
+        @firewall_rules            = UNSET_VALUE
         @security_group_ids        = UNSET_VALUE
         @display_name              = UNSET_VALUE
         @group                     = UNSET_VALUE
         @security_group_names      = UNSET_VALUE
         @security_groups           = UNSET_VALUE
         @user_data                 = UNSET_VALUE
-
+        @ssh_key                   = UNSET_VALUE
+        @ssh_user                  = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -317,15 +360,30 @@ module VagrantPlugins
         # Keypair defaults to nil
         @keypair                = nil if @keypair == UNSET_VALUE
 
+        # Static NAT must be empty array
+        @static_nat             = [] if @static_nat == UNSET_VALUE
+
         # IP address id must be nil, since we can't default that
         @pf_ip_address_id       = nil if @pf_ip_address_id == UNSET_VALUE
 
+        # IP address must be nil, since we can't default that
+        @pf_ip_address          = nil if @pf_ip_address == UNSET_VALUE
+
         # Public port must be nil, since we can't default that
         @pf_public_port         = nil if @pf_public_port == UNSET_VALUE
 
         # Private port must be nil, since we can't default that
         @pf_private_port        = nil if @pf_private_port == UNSET_VALUE
 
+        # Open firewall is true by default (for backwards compatibility)
+        @pf_open_firewall       = true if @pf_open_firewall == UNSET_VALUE
+
+        # Port forwarding rules  must be empty array
+        @port_forwarding_rules  = [] if @port_forwarding_rules == UNSET_VALUE
+
+        # Firewall rules  must be empty array
+        @firewall_rules         = [] if @firewall_rules == UNSET_VALUE
+
         # Security Group IDs must be nil, since we can't default that
         @security_group_ids     = [] if @security_group_ids == UNSET_VALUE
 
@@ -344,6 +402,12 @@ module VagrantPlugins
         # User Data is nil by default
         @user_data              = nil if @user_data == UNSET_VALUE
 
+        # ssh key is nil by default
+        @ssh_key                = nil if @ssh_key == UNSET_VALUE
+
+        # ssh key is nil by default
+        @ssh_user               = nil if @ssh_user == UNSET_VALUE
+
         # Compile our domain specific configurations only within
         # NON-DOMAIN-SPECIFIC configurations.
         if !@__domain_specific

data/lib/vagrant-cloudstack/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cloudstack
-    VERSION = "0.10.0"
+    VERSION = '1.0.0'
   end
 end

data/locales/en.yml

@@ -31,10 +31,18 @@ en:
       Waiting for instance to become "ready"...
     waiting_for_ssh: |-
       Waiting for SSH to become available...
+    enabling_static_nat: |-
+      Enabling Static NAT for this instance ...
+    disabling_static_nat: |-
+      Disabling Static NAT ...
     creating_port_forwarding_rule: |-
       Creating a port forwarding rule for this instance ...
     deleting_port_forwarding_rule: |-
       Deleting the port forwarding rule ...
+    creating_firewall_rule: |-
+      Creating a firewall rule ...
+    deleting_firewall_rule: |-
+      Deleting the firewall rule ...
     warn_networks: |-
       Warning! The Cloudstack provider doesn't support any of the Vagrant
       high-level network configurations (`config.vm.network`). They
@@ -42,6 +50,8 @@ en:
     will_not_destroy: |-
       The instance '%{name}' will not be destroyed, since the confirmation
       was declined.
+    no_instance_found : |-
+      No instance found, already destroyed?
 
     config:
       api_key_required: |-

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.start
+Coveralls.wear!

data/spec/vagrant-cloudstack/config_spec.rb

@@ -1,8 +1,6 @@
+require "spec_helper"
 require "vagrant-cloudstack/config"
 
-require 'coveralls'
-Coveralls.wear!
-
 describe VagrantPlugins::Cloudstack::Config do
   let(:instance) { described_class.new }
 
@@ -18,29 +16,36 @@ describe VagrantPlugins::Cloudstack::Config do
       end
     end
 
-    its("host")                   { should be_nil }
-    its("path")                   { should be_nil }
-    its("port")                   { should be_nil }
-    its("scheme")                 { should be_nil }
-    its("api_key")                { should be_nil }
-    its("secret_key")             { should be_nil }
-    its("instance_ready_timeout") { should == 120 }
-    its("domain_id")              { should be_nil }
-    its("network_id")             { should be_nil }
-    its("project_id")             { should be_nil }
-    its("service_offering_id")    { should be_nil }
-    its("template_id")            { should be_nil }
-    its("zone_id")                { should be_nil }
-    its("keypair")                { should be_nil }
-    its("pf_ip_address_id")       { should be_nil }
-    its("pf_public_port")         { should be_nil }
-    its("pf_private_port")        { should be_nil }
-    its("security_group_ids")     { should == []  }
-    its("display_name")           { should be_nil }
-    its("group")                  { should be_nil }
-    its("security_group_names")   { should == []  }
-    its("security_groups")        { should == []  }
-    its("user_data")              { should be_nil }
+    its("host")                   { should be_nil  }
+    its("path")                   { should be_nil  }
+    its("port")                   { should be_nil  }
+    its("scheme")                 { should be_nil  }
+    its("api_key")                { should be_nil  }
+    its("secret_key")             { should be_nil  }
+    its("instance_ready_timeout") { should == 120  }
+    its("domain_id")              { should be_nil  }
+    its("network_id")             { should be_nil  }
+    its("project_id")             { should be_nil  }
+    its("service_offering_id")    { should be_nil  }
+    its("template_id")            { should be_nil  }
+    its("zone_id")                { should be_nil  }
+    its("keypair")                { should be_nil  }
+    its("static_nat")             { should == []   }
+    its("pf_ip_address_id")       { should be_nil  }
+    its("pf_ip_address")          { should be_nil  }
+    its("pf_public_port")         { should be_nil  }
+    its("pf_private_port")        { should be_nil  }
+    its("pf_open_firewall")       { should == true }
+    its("port_forwarding_rules")  { should == []   }
+    its("firewall_rules")         { should == []   }
+    its("security_group_ids")     { should == []   }
+    its("display_name")           { should be_nil  }
+    its("group")                  { should be_nil  }
+    its("security_group_names")   { should == []   }
+    its("security_groups")        { should == []   }
+    its("user_data")              { should be_nil  }
+    its("ssh_key")                { should be_nil  }
+    its("ssh_user")               { should be_nil  }
   end
 
   describe "getting credentials from environment" do
@@ -86,6 +91,14 @@ describe VagrantPlugins::Cloudstack::Config do
         instance.finalize!
         instance.send(attribute).should == "foo"
       end
+
+    end
+
+    it 'should not default pf_open_firewall if overridden' do
+      instance.pf_open_firewall = false
+      instance.finalize!
+
+      instance.pf_open_firewall.should == false
     end
   end
 
@@ -118,14 +131,21 @@ describe VagrantPlugins::Cloudstack::Config do
     let(:config_template_id)            { "foo" }
     let(:config_zone_id)                { "foo" }
     let(:config_keypair)                { "foo" }
+    let(:config_static_nat)             { [{:foo => "bar"}, {:bar => "foo"}] }
     let(:config_pf_ip_address_id)       { "foo" }
+    let(:config_pf_ip_address)          { "foo" }
     let(:config_pf_public_port)         { "foo" }
     let(:config_pf_private_port)        { "foo" }
+    let(:config_pf_open_firewall)       { false }
+    let(:config_port_forwarding_rules)  { [{:foo => "bar"}, {:bar => "foo"}] }
+    let(:config_firewall_rules)         { [{:foo => "bar"}, {:bar => "foo"}] }
     let(:config_security_group_ids)     { ["foo", "bar"] }
     let(:config_display_name)           { "foo" }
     let(:config_group)                  { "foo" }
     let(:config_security_group_names)   { ["foo", "bar"] }
     let(:config_security_groups)        { [{:foo => "bar"}, {:bar => "foo"}] }
+    let(:config_ssh_key)                { "./foo.pem" }
+    let(:config_ssh_user)               { "foo" }
 
     def set_test_values(instance)
       instance.host                   = config_host
@@ -142,14 +162,21 @@ describe VagrantPlugins::Cloudstack::Config do
       instance.template_id            = config_template_id
       instance.zone_id                = config_zone_id
       instance.keypair                = config_keypair
+      instance.static_nat             = config_static_nat
       instance.pf_ip_address_id       = config_pf_ip_address_id
+      instance.pf_ip_address          = config_pf_ip_address
       instance.pf_public_port         = config_pf_public_port
       instance.pf_private_port        = config_pf_private_port
+      instance.pf_open_firewall       = config_pf_open_firewall
+      instance.port_forwarding_rules  = config_port_forwarding_rules
+      instance.firewall_rules         = config_firewall_rules
       instance.security_group_ids     = config_security_group_ids
       instance.display_name           = config_display_name
       instance.group                  = config_group
       instance.security_group_names   = config_security_group_names
       instance.security_groups        = config_security_groups
+      instance.ssh_key                = config_ssh_key
+      instance.ssh_user               = config_ssh_user
     end
 
     it "should raise an exception if not finalized" do
@@ -183,14 +210,21 @@ describe VagrantPlugins::Cloudstack::Config do
       its("template_id")            { should == config_template_id }
       its("zone_id")                { should == config_zone_id }
       its("keypair")                { should == config_keypair }
+      its("static_nat")             { should == config_static_nat }
       its("pf_ip_address_id")       { should == config_pf_ip_address_id }
+      its("pf_ip_address")          { should == config_pf_ip_address }
       its("pf_public_port")         { should == config_pf_public_port }
       its("pf_private_port")        { should == config_pf_private_port }
+      its("pf_open_firewall")       { should == config_pf_open_firewall }
+      its("port_forwarding_rules")  { should == config_port_forwarding_rules }
+      its("firewall_rules")         { should == config_firewall_rules }
       its("security_group_ids")     { should == config_security_group_ids }
       its("display_name")           { should == config_display_name }
       its("group")                  { should == config_group }
       its("security_group_names")   { should == config_security_group_names }
       its("security_groups")        { should == config_security_groups }
+      its("ssh_key")                { should == config_ssh_key }
+      its("ssh_user")               { should == config_ssh_user }
     end
 
     context "with a specific config set" do
@@ -223,14 +257,21 @@ describe VagrantPlugins::Cloudstack::Config do
       its("template_id")            { should == config_template_id }
       its("zone_id")                { should == config_zone_id }
       its("keypair")                { should == config_keypair }
+      its("static_nat")             { should == config_static_nat }
       its("pf_ip_address_id")       { should == config_pf_ip_address_id }
+      its("pf_ip_address")          { should == config_pf_ip_address }
       its("pf_public_port")         { should == config_pf_public_port }
       its("pf_private_port")        { should == config_pf_private_port }
+      its("pf_open_firewall")       { should == config_pf_open_firewall }
+      its("port_forwarding_rules")  { should == config_port_forwarding_rules }
+      its("firewall_rules")         { should == config_firewall_rules }
       its("security_group_ids")     { should == config_security_group_ids }
       its("display_name")           { should == config_display_name }
       its("group")                  { should == config_group }
       its("security_group_names")   { should == config_security_group_names }
       its("security_groups")        { should == config_security_groups }
+      its("ssh_key")                { should == config_ssh_key }
+      its("ssh_user")               { should == config_ssh_user }
     end
 
     describe "inheritance of parent config" do

data/vagrant-cloudstack.gemspec

@@ -6,9 +6,9 @@ Gem::Specification.new do |s|
   s.version       = VagrantPlugins::Cloudstack::VERSION
   s.platform      = Gem::Platform::RUBY
   s.license       = "MIT"
-  s.authors       = ["Mitchell Hashimoto", "Carl Loa Odin", "Tor-Åke Fransson", "Olle Lundberg", "Roeland Kuipers", "Yuichi Uemura", "Atsushi Sasaki", "Nicolas Brechet", "Peter Jönsson", "Christophe Roux", "Andrei Chiriaev"]
-  s.email         = "engineering.support@klarna.com"
-  s.homepage      = "https://github.com/klarna/vagrant-cloudstack/"
+  s.authors       = ["Mitchell Hashimoto", "Carl Loa Odin", "Tor-Åke Fransson", "Olle Lundberg", "Roeland Kuipers", "Yuichi Uemura", "Atsushi Sasaki", "Nicolas Brechet", "Peter Jönsson", "Christophe Roux", "Andrei Chiriaev", "Miguel Ferreira", "Timothy van Zadelhoff"]
+  s.email         = "int-toolkit@schubergphilis.com"
+  s.homepage      = "https://github.com/schubergphilis/vagrant-cloudstack/"
   s.summary       = "Enables Vagrant to manage machines in Cloudstack."
   s.description   = "Enables Vagrant to manage machines in Cloudstack."
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -15,93 +15,131 @@ authors:
 - Peter Jönsson
 - Christophe Roux
 - Andrei Chiriaev
+- Miguel Ferreira
+- Timothy van Zadelhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.7
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.4
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.4
 description: Enables Vagrant to manage machines in Cloudstack.
-email: engineering.support@klarna.com
+email: int-toolkit@schubergphilis.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- build_rpm.sh
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- build_rpm.sh
+- coverage/.last_run.json
+- coverage/.resultset.json
+- coverage/.resultset.json.lock
+- coverage/assets/0.10.0/application.css
+- coverage/assets/0.10.0/application.js
+- coverage/assets/0.10.0/colorbox/border.png
+- coverage/assets/0.10.0/colorbox/controls.png
+- coverage/assets/0.10.0/colorbox/loading.gif
+- coverage/assets/0.10.0/colorbox/loading_background.png
+- coverage/assets/0.10.0/favicon_green.png
+- coverage/assets/0.10.0/favicon_red.png
+- coverage/assets/0.10.0/favicon_yellow.png
+- coverage/assets/0.10.0/loading.gif
+- coverage/assets/0.10.0/magnify.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_222222_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_2e83ff_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_454545_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_888888_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_cd0a0a_256x240.png
+- coverage/index.html
 - dummy.box
-- example_box/metadata.json
 - example_box/README.md
-- Gemfile
+- example_box/metadata.json
+- lib/vagrant-cloudstack.rb
+- lib/vagrant-cloudstack/action.rb
 - lib/vagrant-cloudstack/action/connect_cloudstack.rb
 - lib/vagrant-cloudstack/action/is_created.rb
 - lib/vagrant-cloudstack/action/is_stopped.rb
@@ -113,30 +151,22 @@ files:
 - lib/vagrant-cloudstack/action/run_instance.rb
 - lib/vagrant-cloudstack/action/start_instance.rb
 - lib/vagrant-cloudstack/action/stop_instance.rb
-- lib/vagrant-cloudstack/action/sync_folders.rb
 - lib/vagrant-cloudstack/action/terminate_instance.rb
 - lib/vagrant-cloudstack/action/timed_provision.rb
 - lib/vagrant-cloudstack/action/wait_for_state.rb
 - lib/vagrant-cloudstack/action/warn_networks.rb
-- lib/vagrant-cloudstack/action.rb
 - lib/vagrant-cloudstack/config.rb
 - lib/vagrant-cloudstack/errors.rb
 - lib/vagrant-cloudstack/plugin.rb
 - lib/vagrant-cloudstack/provider.rb
 - lib/vagrant-cloudstack/util/timer.rb
 - lib/vagrant-cloudstack/version.rb
-- lib/vagrant-cloudstack.rb
-- LICENSE
 - locales/en.yml
-- Rakefile
-- README.md
+- spec/spec_helper.rb
 - spec/vagrant-cloudstack/config_spec.rb
 - vagrant-cloudstack.gemspec
 - vagrant-cloudstack.spec
-- .gitignore
-- .ruby-version
-- .travis.yml
-homepage: https://github.com/klarna/vagrant-cloudstack/
+homepage: https://github.com/schubergphilis/vagrant-cloudstack/
 licenses:
 - MIT
 metadata: {}
@@ -146,18 +176,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-cloudstack
-rubygems_version: 2.0.14
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in Cloudstack.
 test_files: []
+has_rdoc: