vagrant-cloudstack 1.4.0 → 1.5.0

data/spec/vagrant-cloudstack/action/terminate_instance_spec.rb

@@ -0,0 +1,248 @@
+require 'spec_helper'
+require 'vagrant-cloudstack/action/terminate_instance'
+require 'vagrant-cloudstack/config'
+
+require 'vagrant'
+require 'fog'
+
+describe VagrantPlugins::Cloudstack::Action::TerminateInstance do
+  let(:action) { VagrantPlugins::Cloudstack::Action::TerminateInstance.new(app, env) }
+
+  let(:destroy_server_response) { { id: JOB_ID } }
+
+  let(:cs_job) { double('Fog::Compute::Cloudstack::Job') }
+
+  let(:fake_job_result) do
+    {
+      'queryasyncjobresultresponse' => {
+        'jobstatus' => 1,
+        'jobresult' => {
+          'portforwardingrule' => {
+            'id' => PORT_FORWARDING_RULE_ID
+          },
+          'networkacl' => {
+            'id' => ACL_ID
+          },
+          'virtualmachine' => {
+            'password' => GENERATED_PASSWORD
+          }
+        }
+      }
+    }
+  end
+
+  describe '#terminate_instance in advanced zone' do
+    subject { action.call(env) }
+    let(:app) { double('Vagrant::Action::Warden') }
+
+    let(:provider_config) do
+      config = VagrantPlugins::Cloudstack::Config.new
+
+      config.finalize!
+      config.get_domain_config(:cloudstack)
+    end
+
+    let(:machine) { double('Vagrant::Machine') }
+    let(:data_dir) { double('Pathname') }
+    let(:a_path) { double('Pathname') }
+    let(:file) { double('File') }
+
+    let(:cloudstack_compute) { double('Fog::Compute::Cloudstack') }
+    let(:servers) { double('Fog::Compute::Cloudstack::Servers') }
+    let(:server) { double('Fog::Compute::Cloudstack::Server') }
+    let(:ui) { double('Vagrant::UI::Prefixed') }
+    let(:root_path) { double('Pathname') }
+    let(:env) do
+      {
+        root_path: root_path,
+        ui: ui,
+        machine: machine,
+        cloudstack_compute: cloudstack_compute
+      }
+    end
+
+    before(:each) do
+      allow(app).to receive(:call).and_return(true)
+
+      allow(ui).to receive(:info)
+      expect(ui).not_to receive(:warn)
+      allow(ui).to receive(:detail)
+
+      allow(machine).to receive(:provider_config).and_return(provider_config)
+      allow(machine).to receive(:data_dir).and_return(data_dir)
+
+      allow(data_dir).to receive(:join).and_return(a_path)
+      allow(a_path).to receive(:file?).and_return(false)
+
+      expect(cloudstack_compute).to receive(:servers).and_return(servers)
+      expect(servers).to receive(:get).with(SERVER_ID).and_return(server)
+      expect(server).to receive(:destroy).with('expunge' => false).and_return(cs_job)
+      expect(cs_job).to receive(:id).and_return(JOB_ID)
+
+      allow(cloudstack_compute).to receive(:query_async_job_result).with(jobid: JOB_ID).and_return(fake_job_result)
+      allow(machine).to receive(:id).and_return(SERVER_ID)
+      expect(machine).to receive(:id=).with(nil)
+    end
+
+    context 'destroys a simple VM' do
+      it 'destroys a vm' do
+        should eq true
+      end
+
+      context 'with firewall rules removal' do
+        let(:firewall_path) { double('Pathname') }
+        let(:file_content) { double }
+        let(:firewall_rule) { 'UUID of Firewall rule' }
+        let(:network_acl) { 'UUID of ACL' }
+
+        before(:each) do
+          expect(data_dir).to receive(:join).with('firewall').and_return(firewall_path)
+          expect(firewall_path).to receive(:file?).and_return(true)
+          # A VM will never belong to both a VPC and regular router, but allowed for this test
+          allow(File).to receive(:read).and_return("#{network_acl},networkacl\n" + "#{firewall_rule},firewallrule\n")
+
+          expect(cloudstack_compute).to receive(:request)
+            .with(command: 'deleteNetworkACL', id: network_acl)
+            .and_return('deletenetworkaclresponse' => { 'jobid' => JOB_ID })
+
+          expect(cloudstack_compute).to receive(:request)
+            .with(command: 'deleteFirewallRule', id: 'UUID of Firewall rule')
+            .and_return('deletefirewallruleresponse' => { 'jobid' => JOB_ID })
+
+          expect(firewall_path).to receive(:delete).and_return(true)
+        end
+
+        it 'destroys a vm' do
+          should eq true
+        end
+      end
+
+      context 'with port forwarding removal' do
+        let(:port_forwarding_path) { double('Pathname') }
+
+        before(:each) do
+          expect(data_dir).to receive(:join).with('port_forwarding').and_return(port_forwarding_path)
+          expect(port_forwarding_path).to receive(:file?).and_return(true)
+          allow(File).to receive(:read)
+            .and_return("#{PORT_FORWARDING_RULE_ID}\n#{PORT_FORWARDING_RULE_ID}_2\n#{PORT_FORWARDING_RULE_ID}_3")
+
+          [PORT_FORWARDING_RULE_ID, "#{PORT_FORWARDING_RULE_ID}_2", "#{PORT_FORWARDING_RULE_ID}_3"]
+            .each do |port_forwarding_rule_id|
+
+            expect(cloudstack_compute).to receive(:delete_port_forwarding_rule)
+              .with(id: port_forwarding_rule_id)
+              .and_return('deleteportforwardingruleresponse' => { 'jobid' => JOB_ID })
+          end
+          expect(port_forwarding_path).to receive(:delete).and_return(true)
+        end
+
+        it 'destroys a vm' do
+          should eq true
+        end
+      end
+
+      context 'with volume removal' do
+        let(:volumes_path) { double('Pathname') }
+
+        before(:each) do
+          expect(data_dir).to receive(:join).with('volumes').and_return(volumes_path)
+          expect(volumes_path).to receive(:file?).and_return(true)
+          allow(File).to receive(:read)
+            .and_return("#{VOLUME_ID}\n#{VOLUME_ID}_2\n#{VOLUME_ID}_3")
+
+          [VOLUME_ID, "#{VOLUME_ID}_2", "#{VOLUME_ID}_3"]
+            .each do |volume_id|
+
+            expect(cloudstack_compute).to receive(:detach_volume)
+              .with(id: volume_id)
+              .and_return('detachvolumeresponse' => { 'jobid' => JOB_ID })
+            expect(cloudstack_compute).to receive(:delete_volume)
+              .with(id: volume_id)
+              .and_return('deletevolumeresponse' => { 'success' => 'true' })
+          end
+          expect(volumes_path).to receive(:delete).and_return(true)
+        end
+
+        it 'destroys a vm' do
+          should eq true
+        end
+      end
+
+      context 'with credentials file removal' do
+        let(:credentials_path) { double('Pathname') }
+
+        before(:each) do
+          expect(data_dir).to receive(:join).with('vmcredentials').and_return(credentials_path)
+          expect(credentials_path).to receive(:file?).and_return(true)
+          expect(credentials_path).to receive(:delete).and_return(true)
+        end
+
+        it 'destroys a vm' do
+          should eq true
+        end
+      end
+
+      context 'with generated SSH key removal' do
+        let(:ssh_key_path) { double('Pathname') }
+
+        before(:each) do
+          expect(data_dir).to receive(:join).with('sshkeyname').and_return(ssh_key_path)
+          expect(ssh_key_path).to receive(:file?).and_return(true)
+          allow(File).to receive(:read)
+            .and_return("#{SSH_GENERATED_KEY_NAME}\n")
+
+          expect(cloudstack_compute).to receive(:delete_ssh_key_pair)
+            .with(name: SSH_GENERATED_KEY_NAME)
+            .and_return('deletesshkeypairresponse' => { 'success' => 'true' })
+
+          expect(ssh_key_path).to receive(:delete).and_return(true)
+        end
+
+        it 'destroys a vm' do
+          should eq true
+        end
+      end
+
+      context 'with security groups removal' do
+        let(:security_group_path) { double('Pathname') }
+        let(:cloudstack_securitygroups) { double('Fog::Compute::Cloudstack::SecurityGroups') }
+        let(:cloudstack_securitygroup) { double('Fog::Compute::Cloudstack::SecurityGroup') }
+        RULE_ID_INGRESS = 'UUID of Ingress Rule'.freeze
+        RULE_ID_EGRESS = 'UUID of Egress Rule'.freeze
+
+        before(:each) do
+          expect(data_dir).to receive(:join).with('security_groups').and_return(security_group_path)
+          expect(security_group_path).to receive(:file?).and_return(true)
+          allow(File).to receive(:read)
+            .and_return("#{SECURITY_GROUP_ID}\n")
+
+          expect(cloudstack_compute).to receive(:security_groups).and_return(cloudstack_securitygroups)
+          expect(cloudstack_securitygroups).to receive(:get)
+            .with(SECURITY_GROUP_ID)
+            .and_return(cloudstack_securitygroup)
+
+          expect(cloudstack_securitygroup).to receive(:ingress_rules)
+            .and_return([{ 'ruleid' => RULE_ID_INGRESS }])
+          expect(cloudstack_compute).to receive(:revoke_security_group_ingress)
+            .with(id: RULE_ID_INGRESS)
+            .and_return('revokesecuritygroupingressresponse' => { 'jobid' => JOB_ID })
+
+          expect(cloudstack_securitygroup).to receive(:egress_rules)
+            .and_return([{ 'ruleid' => RULE_ID_EGRESS }])
+          expect(cloudstack_compute).to receive(:revoke_security_group_egress)
+            .with(id: RULE_ID_EGRESS)
+            .and_return('revokesecuritygroupegressresponse' => { 'jobid' => JOB_ID })
+
+          expect(cloudstack_compute).to receive(:delete_security_group)
+            .with(id: SECURITY_GROUP_ID)
+
+          expect(security_group_path).to receive(:delete).and_return(true)
+        end
+
+        it 'destroys a vm' do
+          should eq true
+        end
+      end
+    end
+  end
+end

data/spec/vagrant-cloudstack/config_spec.rb

@@ -6,7 +6,7 @@ describe VagrantPlugins::Cloudstack::Config do
 
   # Ensure tests are not affected by Cloudstack credential environment variables
   before :each do
-    ENV.stub(:[] => nil)
+    allow(ENV).to receive_messages(:[] => nil)
   end
 
   describe "defaults" do
@@ -37,7 +37,7 @@ describe VagrantPlugins::Cloudstack::Config do
     its("pf_public_port")         { should be_nil  }
     its("pf_public_rdp_port")     { should be_nil  }
     its("pf_private_rdp_port")    { should == 3389 }
-    its("pf_public_port_randomrange") { should == {:start=>49160, :end=>49200} }
+    its("pf_public_port_randomrange") { should == {:start=>49152, :end=>65535} }
     its("pf_private_port")        { should be_nil  }
     its("pf_open_firewall")       { should == true }
     its("pf_trusted_networks")    { should be_nil  }
@@ -71,8 +71,8 @@ describe VagrantPlugins::Cloudstack::Config do
 
     context "with CloudStack credential variables" do
       before :each do
-        ENV.stub(:[]).with("CLOUDSTACK_API_KEY").and_return("api_key")
-        ENV.stub(:[]).with("CLOUDSTACK_SECRET_KEY").and_return("secret_key")
+        allow(ENV).to receive(:[]).with("CLOUDSTACK_API_KEY").and_return("api_key")
+        allow(ENV).to receive(:[]).with("CLOUDSTACK_SECRET_KEY").and_return("secret_key")
       end
 
       subject do
@@ -98,7 +98,7 @@ describe VagrantPlugins::Cloudstack::Config do
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
         instance.finalize!
-        instance.send(attribute).should == "foo"
+        expect(instance.send(attribute)).to be =='foo'
       end
 
     end
@@ -107,7 +107,7 @@ describe VagrantPlugins::Cloudstack::Config do
       instance.pf_open_firewall = false
       instance.finalize!
 
-      instance.pf_open_firewall.should == false
+      expect(instance.pf_open_firewall).to be false
     end
   end
 
@@ -208,7 +208,7 @@ describe VagrantPlugins::Cloudstack::Config do
 
     it "should raise an exception if not finalized" do
       expect { instance.get_domain_config("default") }.
-        to raise_error
+        to raise_error(RuntimeError)
     end
 
     context "with no specific config set" do

data/vagrant-cloudstack.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project         = 'vagrant-cloudstack'
 
-  s.add_runtime_dependency 'fog', '~> 1.32', '>= 1.32.0'
+  s.add_runtime_dependency 'fog', '>= 1.32.0'
+  s.add_runtime_dependency 'fog-xml', '>= 0.1.2'
 
   s.add_development_dependency 'rake',                '>= 10.4', '~> 10.5'
   s.add_development_dependency 'rspec-core',          '~> 2.14', '>= 2.14.7'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cloudstack
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -22,15 +22,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.32'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.32.0
@@ -38,12 +35,23 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.32'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.32.0
+- !ruby/object:Gem::Dependency
+  name: fog-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -143,10 +151,10 @@ files:
 - Docker/vac.ps1
 - Docker/vac.sh
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- bootstrap.key
 - build_rpm.sh
 - functional-tests/basic/Vagrantfile.basic_networking
 - functional-tests/basic/basic_spec.rb
@@ -167,6 +175,7 @@ files:
 - lib/vagrant-cloudstack/action/read_rdp_info.rb
 - lib/vagrant-cloudstack/action/read_ssh_info.rb
 - lib/vagrant-cloudstack/action/read_state.rb
+- lib/vagrant-cloudstack/action/read_transport_info.rb
 - lib/vagrant-cloudstack/action/read_winrm_info.rb
 - lib/vagrant-cloudstack/action/run_instance.rb
 - lib/vagrant-cloudstack/action/start_instance.rb
@@ -189,6 +198,9 @@ files:
 - locales/en.yml
 - spec/spec_helper.rb
 - spec/vagrant-cloudstack/action/read_ssh_info_spec.rb
+- spec/vagrant-cloudstack/action/retrieve_public_ip_port_spec.rb
+- spec/vagrant-cloudstack/action/run_instance_spec.rb
+- spec/vagrant-cloudstack/action/terminate_instance_spec.rb
 - spec/vagrant-cloudstack/config_spec.rb
 - spec/vagrant-cloudstack/model/cloudstack_resource_spec.rb
 - spec/vagrant-cloudstack/service/cloudstack_resource_service_spec.rb
@@ -215,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-cloudstack
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in Cloudstack.

data/bootstrap.key

@@ -1,27 +0,0 @@
------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-----