vagrant-openstack-provider 0.2.0 → 0.3.0

data/spec/vagrant-openstack-provider/client/keystone_spec.rb

@@ -51,7 +51,6 @@ describe VagrantPlugins::Openstack::KeystoneClient do
     end
 
     context 'with good credentials' do
-
       it 'store token and tenant id' do
         stub_request(:post, 'http://keystoneAuthV2')
         .with(
@@ -66,52 +65,6 @@ describe VagrantPlugins::Openstack::KeystoneClient do
 
         session.token.should eq('0123456789')
         session.project_id.should eq('testTenantId')
-        session.endpoints[:compute].should eq('http://nova')
-        session.endpoints[:network].should eq('http://neutron')
-      end
-
-      context 'with compute endpoint override' do
-        it 'store token and tenant id' do
-          config.stub(:openstack_compute_url) { 'http://novaOverride' }
-
-          stub_request(:post, 'http://keystoneAuthV2')
-          .with(
-              body: keystone_request_body,
-              headers: keystone_request_headers)
-          .to_return(
-              status: 200,
-              body: keystone_response_body,
-              headers: keystone_request_headers)
-
-          @keystone_client.authenticate(env)
-
-          session.token.should eq('0123456789')
-          session.project_id.should eq('testTenantId')
-          session.endpoints[:compute].should eq('http://novaOverride')
-          session.endpoints[:network].should eq('http://neutron')
-        end
-      end
-
-      context 'with network endpoint override' do
-        it 'store token and tenant id' do
-          config.stub(:openstack_network_url) { 'http://neutronOverride' }
-
-          stub_request(:post, 'http://keystoneAuthV2')
-          .with(
-              body: keystone_request_body,
-              headers: keystone_request_headers)
-          .to_return(
-              status: 200,
-              body: keystone_response_body,
-              headers: keystone_request_headers)
-
-          @keystone_client.authenticate(env)
-
-          session.token.should eq('0123456789')
-          session.project_id.should eq('testTenantId')
-          session.endpoints[:compute].should eq('http://nova')
-          session.endpoints[:network].should eq('http://neutronOverride')
-        end
       end
     end
 
@@ -132,9 +85,40 @@ describe VagrantPlugins::Openstack::KeystoneClient do
               }',
             headers: keystone_request_headers)
 
-        expect { @keystone_client.authenticate(env) }.to raise_error(RestClient::Unauthorized)
+        expect { @keystone_client.authenticate(env) }.to raise_error(Errors::AuthenticationFailed)
+      end
+    end
+
+    context 'with bad endpoint' do
+      it 'raise a BadAuthenticationEndpoint error' do
+        stub_request(:post, 'http://keystoneAuthV2')
+        .with(
+            body: keystone_request_body,
+            headers: keystone_request_headers)
+        .to_return(
+            status: 404)
+
+        expect { @keystone_client.authenticate(env) }.to raise_error(Errors::BadAuthenticationEndpoint)
       end
     end
 
+    context 'with internal server error' do
+      it 'raise a VagrantOpenstackError error with response body as message' do
+        stub_request(:post, 'http://keystoneAuthV2')
+        .with(
+            body: keystone_request_body,
+            headers: keystone_request_headers)
+        .to_return(
+            status: 500,
+            body: 'Internal server error')
+
+        begin
+          @keystone_client.authenticate(env)
+          fail 'Expected Errors::VagrantOpenstackError'
+        rescue Errors::VagrantOpenstackError => e
+          e.message.should eq('Internal server error')
+        end
+      end
+    end
   end
 end

data/spec/vagrant-openstack-provider/client/neutron_spec.rb

@@ -43,10 +43,48 @@ describe VagrantPlugins::Openstack::NeutronClient do
         networks = @neutron_client.get_private_networks(env)
 
         expect(networks.length).to eq(2)
-        expect(networks[0][:id]).to eq('net-1')
-        expect(networks[0][:name]).to eq('net1')
-        expect(networks[1][:id]).to eq('net-2')
-        expect(networks[1][:name]).to eq('net2')
+        expect(networks[0].id).to eq('net-1')
+        expect(networks[0].name).to eq('net1')
+        expect(networks[1].id).to eq('net-2')
+        expect(networks[1].name).to eq('net2')
+      end
+    end
+  end
+
+  describe 'get_api_version_list' do
+    context 'basic' do
+      it 'returns version list' do
+        stub_request(:get, 'http://neutron/')
+        .with(header: { 'Accept' => 'application/json' })
+        .to_return(
+          status: 200,
+          body: '{
+            "versions": [
+              {
+                "status": "...",
+                "id": "v1.0",
+                "links": [
+                  {
+                    "href": "http://neutron/v1.0",
+                    "rel": "self"
+                  }
+                ]
+              },
+              {
+                "status": "CURRENT",
+                "id": "v2.0",
+                "links": [
+                  {
+                    "href": "http://neutron/v2.0",
+                    "rel": "self"
+                  }
+                ]
+              }
+            ]}')
+
+        versions = @neutron_client.get_api_version_list(env)
+
+        expect(versions.size).to eq(2)
       end
     end
   end

data/spec/vagrant-openstack-provider/client/nova_spec.rb

@@ -1,6 +1,10 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::NovaClient do
+  include FakeFS::SpecHelpers::All
+
+  let(:filename) { 'key.pub' }
+  let(:ssh_key_content) { 'my public key' }
 
   let(:config) do
     double('config').tap do |config|
@@ -12,6 +16,12 @@ describe VagrantPlugins::Openstack::NovaClient do
     end
   end
 
+  let(:file) do
+    double('file').tap do |file|
+      file.stub(:read) { ssh_key_content }
+    end
+  end
+
   let(:env) do
     Hash.new.tap do |env|
       env[:ui] = double('ui')
@@ -97,7 +107,7 @@ describe VagrantPlugins::Openstack::NovaClient do
               })
             .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
 
-        instance_id = @nova_client.create_server(env, 'inst', 'img', 'flav', nil, 'key')
+        instance_id = @nova_client.create_server(env, name: 'inst', image_ref: 'img', flavor_ref: 'flav', networks: nil, keypair: 'key')
 
         expect(instance_id).to eq('o1o2o3')
       end
@@ -116,7 +126,27 @@ describe VagrantPlugins::Openstack::NovaClient do
                   })
           .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
 
-          instance_id = @nova_client.create_server(env, 'inst', 'img', 'flav', %w(net1 net2), 'key')
+          instance_id = @nova_client.create_server(env, name: 'inst', image_ref: 'img', flavor_ref: 'flav', networks: %w(net1 net2), keypair: 'key')
+
+          expect(instance_id).to eq('o1o2o3')
+        end
+      end
+
+      context 'with availability_zone' do
+        it 'returns new instance id' do
+
+          stub_request(:post, 'http://nova/a1b2c3/servers')
+          .with(
+              body: '{"server":{"name":"inst","imageRef":"img","flavorRef":"flav","key_name":"key","availability_zone":"avz"}}',
+              headers:
+                  {
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json',
+                    'X-Auth-Token' => '123456'
+                  })
+          .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
+
+          instance_id = @nova_client.create_server(env, name: 'inst', image_ref: 'img', flavor_ref: 'flav', keypair: 'key', availability_zone: 'avz')
 
           expect(instance_id).to eq('o1o2o3')
         end
@@ -143,13 +173,88 @@ describe VagrantPlugins::Openstack::NovaClient do
     end
   end
 
+  describe 'import_keypair_from_file' do
+    context 'with token and project_id acquainted' do
+      it 'returns newly created keypair name' do
+        File.should_receive(:exist?).with(filename).and_return(true)
+        File.should_receive(:open).with(filename).and_return(file)
+        Kernel.stub!(:rand).and_return(2_036_069_739_008)
+
+        stub_request(:post, 'http://nova/a1b2c3/os-keypairs')
+            .with(
+              body: "{\"keypair\":{\"name\":\"vagrant-generated-pzcvcpa8\",\"public_key\":\"#{ssh_key_content}\"}}",
+              headers: {
+                'Accept' => 'application/json',
+                'Content-Type' => 'application/json',
+                'X-Auth-Token' => '123456' })
+              .to_return(status: 200, body: '
+              {
+                "keypair": {
+                  "name": "created_key_name"
+                }
+              }')
+
+        @nova_client.import_keypair_from_file(env, filename)
+
+      end
+    end
+  end
+
+  describe 'delete_keypair_if_vagrant' do
+    context 'with token and project_id acquainted' do
+      context 'with keypair not generated by vagrant' do
+        it 'do nothing' do
+          stub_request(:get, 'http://nova/a1b2c3/servers/o1o2o3')
+              .with(headers:
+                {
+                  'Accept' => 'application/json',
+                  'X-Auth-Token' => '123456'
+                })
+              .to_return(status: 200, body: '
+                {
+                  "server": {
+                     "id": "o1o2o3",
+                     "key_name": "other_key"
+                  }
+                }
+              ')
+
+          @nova_client.delete_keypair_if_vagrant(env, 'o1o2o3')
+        end
+      end
+      context 'with keypair generated by vagrant' do
+        it 'deletes the key on nova' do
+          stub_request(:delete, 'http://nova/a1b2c3/os-keypairs/vagrant-generated-1234')
+                .with(headers: { 'X-Auth-Token' => '123456' })
+                .to_return(status: 202)
+          stub_request(:get, 'http://nova/a1b2c3/servers/o1o2o3')
+              .with(headers:
+                {
+                  'Accept' => 'application/json',
+                  'X-Auth-Token' => '123456'
+                })
+              .to_return(status: 200, body: '
+                {
+                  "server": {
+                     "id": "o1o2o3",
+                     "key_name": "vagrant-generated-1234"
+                  }
+                }
+              ')
+
+          @nova_client.delete_keypair_if_vagrant(env, 'o1o2o3')
+        end
+      end
+    end
+  end
+
   describe 'suspend_server' do
     context 'with token and project_id acquainted' do
       it 'returns new instance id' do
 
         stub_request(:post, 'http://nova/a1b2c3/servers/o1o2o3/action')
             .with(
-              body: '{ "suspend": null }',
+              body: '{"suspend":null}',
               headers:
               {
                 'Accept' => 'application/json',
@@ -169,7 +274,7 @@ describe VagrantPlugins::Openstack::NovaClient do
 
         stub_request(:post, 'http://nova/a1b2c3/servers/o1o2o3/action')
             .with(
-              body: '{ "resume": null }',
+              body: '{"resume":null}',
               headers:
               {
                 'Accept' => 'application/json',
@@ -189,7 +294,7 @@ describe VagrantPlugins::Openstack::NovaClient do
 
         stub_request(:post, 'http://nova/a1b2c3/servers/o1o2o3/action')
             .with(
-              body: '{ "os-stop": null }',
+              body: '{"os-stop":null}',
               headers:
               {
                 'Accept' => 'application/json',
@@ -210,7 +315,7 @@ describe VagrantPlugins::Openstack::NovaClient do
 
         stub_request(:post, 'http://nova/a1b2c3/servers/o1o2o3/action')
             .with(
-              body: '{ "os-start": null }',
+              body: '{"os-start":null}',
               headers:
               {
                 'Accept' => 'application/json',
@@ -225,6 +330,76 @@ describe VagrantPlugins::Openstack::NovaClient do
     end
   end
 
+  describe 'get_all_floating_ips' do
+    context 'with token and project_id acquainted' do
+      it 'returns all floating ips' do
+        stub_request(:get, 'http://nova/a1b2c3/os-floating-ips')
+         .with(headers:
+          {
+            'Accept' => 'application/json',
+            'Accept-Encoding' => 'gzip, deflate',
+            'User-Agent' => 'Ruby',
+            'X-Auth-Token' => '123456'
+          })
+         .to_return(status: 200, body: '
+         {
+           "floating_ips": [
+             {"instance_id": "1234",
+              "ip": "185.39.216.45",
+              "fixed_ip": "192.168.0.54",
+              "id": "2345",
+              "pool": "PublicNetwork-01"
+             },
+             {
+               "instance_id": null,
+               "ip": "185.39.216.95",
+               "fixed_ip": null,
+               "id": "3456",
+               "pool": "PublicNetwork-02"
+             }]
+          }')
+
+        floating_ips = @nova_client.get_all_floating_ips(env)
+
+        expect(floating_ips).to have(2).items
+        expect(floating_ips[0].ip).to eql('185.39.216.45')
+        expect(floating_ips[0].instance_id).to eql('1234')
+        expect(floating_ips[0].pool).to eql('PublicNetwork-01')
+        expect(floating_ips[1].ip).to eql('185.39.216.95')
+        expect(floating_ips[1].instance_id).to be(nil)
+        expect(floating_ips[1].pool).to eql('PublicNetwork-02')
+      end
+    end
+  end
+
+  describe 'get_all_floating_ips' do
+    context 'with token and project_id acquainted' do
+      it 'return newly allocated floating_ip' do
+        stub_request(:post, 'http://nova/a1b2c3/os-floating-ips')
+         .with(body: '{"pool":"pool-1"}',
+               headers: {
+                 'Accept' => 'application/json',
+                 'Content-Type' => 'application/json',
+                 'X-Auth-Token' => '123456' })
+         .to_return(status: 200, body: '
+         {
+           "floating_ip": {
+              "instance_id": null,
+              "ip": "183.45.67.89",
+              "fixed_ip": null,
+              "id": "o1o2o3",
+              "pool": "pool-1"
+           }
+         }')
+        floating_ip = @nova_client.allocate_floating_ip(env, 'pool-1')
+
+        expect(floating_ip.ip).to eql('183.45.67.89')
+        expect(floating_ip.instance_id).to be(nil)
+        expect(floating_ip.pool).to eql('pool-1')
+      end
+    end
+  end
+
   describe 'get_server_details' do
     context 'with token and project_id acquainted' do
       it 'returns server details' do
@@ -368,6 +543,72 @@ describe VagrantPlugins::Openstack::NovaClient do
         expect { @nova_client.add_floating_ip(env, 'o1o2o3', '1.2.3.4') }.to raise_error(RuntimeError)
       end
     end
+  end
+
+  describe 'get_floating_ip_pools' do
+    context 'with token and project_id acquainted' do
+      it 'should return floating ip pool' do
+
+        stub_request(:get, 'http://nova/a1b2c3/os-floating-ip-pools')
+          .with(headers: { 'Accept' => 'application/json', 'X-Auth-Token' => '123456' })
+          .to_return(status: 200, body: '
+            {
+              "floating_ip_pools": [
+                {
+                  "name": "pool1"
+                },
+                {
+                  "name": "pool2"
+                }
+              ]
+            }
+          ')
+
+        pools = @nova_client.get_floating_ip_pools(env)
+
+        expect(pools[0]['name']).to eq('pool1')
+        expect(pools[1]['name']).to eq('pool2')
+      end
+    end
+  end
 
+  describe 'get_floating_ips' do
+    context 'with token and project_id acquainted' do
+      it 'should return floating ip list' do
+
+        stub_request(:get, 'http://nova/a1b2c3/os-floating-ips')
+          .with(headers: { 'Accept' => 'application/json', 'X-Auth-Token' => '123456' })
+          .to_return(status: 200, body: '
+            {
+              "floating_ips": [
+                {
+                  "fixed_ip": null,
+                  "id": 1,
+                  "instance_id": null,
+                  "ip": "10.10.10.1",
+                  "pool": "pool1"
+                },
+                {
+                  "fixed_ip": null,
+                  "id": 2,
+                  "instance_id": "inst001",
+                  "ip": "10.10.10.2",
+                  "pool": "pool2"
+                }
+              ]
+            }
+          ')
+
+        ips = @nova_client.get_floating_ips(env)
+
+        expect(ips[0]['ip']).to eq('10.10.10.1')
+        expect(ips[0]['instance_id']).to eq(nil)
+        expect(ips[0]['pool']).to eq('pool1')
+
+        expect(ips[1]['ip']).to eq('10.10.10.2')
+        expect(ips[1]['instance_id']).to eq('inst001')
+        expect(ips[1]['pool']).to eq('pool2')
+      end
+    end
   end
 end