vagrant-openstack-provider 0.6.1 → 0.7.0

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

@@ -22,7 +22,7 @@ describe VagrantPlugins::Openstack::NovaClient do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui')
       env[:ui].stub(:info).with(anything)
       env[:machine] = double('machine')
@@ -45,19 +45,18 @@ describe VagrantPlugins::Openstack::NovaClient do
     context 'stack not found' do
       it 'raise an StackNotFound error' do
         stub_request(:get, 'http://heat/a1b2c3/stacks/stack_name/stack_id')
-            .with(
-              headers:
-              {
-                'Accept' => 'application/json',
-                'Accept-Encoding' => 'gzip, deflate',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(
-              status: 404,
-              body: '{"itemNotFound": {"message": "Stack could not be found", "code": 404}}')
+          .with(
+            headers:
+            {
+              'Accept' => 'application/json',
+              'Accept-Encoding' => 'gzip, deflate',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(
+            status: 404,
+            body: '{"itemNotFound": {"message": "Stack could not be found", "code": 404}}')
 
         expect { @heat_client.get_stack_details(env, 'stack_name', 'stack_id') }.to raise_error(VagrantPlugins::Openstack::Errors::StackNotFound)
-
       end
     end
   end
@@ -65,17 +64,16 @@ describe VagrantPlugins::Openstack::NovaClient do
   describe 'create_stack' do
     context 'with token and project_id acquainted' do
       it 'returns new stack id' do
-
         stub_request(:post, 'http://heat/a1b2c3/stacks')
-            .with(
-              body: '{"stack_name":"stck","template":"toto"}',
-              headers:
-              {
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(status: 202, body: '{ "stack": { "id": "o1o2o3" } }')
+          .with(
+            body: '{"stack_name":"stck","template":"toto"}',
+            headers:
+            {
+              'Accept' => 'application/json',
+              'Content-Type' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(status: 202, body: '{ "stack": { "id": "o1o2o3" } }')
 
         stack_id = @heat_client.create_stack(env, name: 'stck', template: 'toto')
 
@@ -87,14 +85,13 @@ describe VagrantPlugins::Openstack::NovaClient do
   describe 'get_stack_details' do
     context 'with token and project_id acquainted' do
       it 'returns stack details' do
-
         stub_request(:get, 'http://heat/a1b2c3/stacks/stack_id/stack_name')
-            .with(headers:
+          .with(headers:
               {
                 'Accept' => 'application/json',
                 'X-Auth-Token' => '123456'
               })
-            .to_return(status: 200, body: '
+          .to_return(status: 200, body: '
             {
                 "stack": {
                     "description": "sample stack",
@@ -116,14 +113,13 @@ describe VagrantPlugins::Openstack::NovaClient do
   describe 'delete_stack' do
     context 'with token and project_id acquainted' do
       it 'deletes the stack' do
-
         stub_request(:delete, 'http://heat/a1b2c3/stacks/stack_id/stack_name')
-            .with(headers:
+          .with(headers:
               {
                 'Accept' => 'application/json',
                 'X-Auth-Token' => '123456'
               })
-            .to_return(status: 204)
+          .to_return(status: 204)
 
         @heat_client.delete_stack(env, 'stack_id', 'stack_name')
       end

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::KeystoneClient do
-
   let(:http) do
     double('http').tap do |http|
       http.stub(:read_timeout) { 42 }
@@ -11,7 +10,7 @@ describe VagrantPlugins::Openstack::KeystoneClient do
 
   let(:config) do
     double('config').tap do |config|
-      config.stub(:openstack_auth_url) { 'http://keystoneAuthV2' }
+      config.stub(:openstack_auth_url) { 'http://keystoneAuthV2/tokens' }
       config.stub(:openstack_compute_url) { nil }
       config.stub(:openstack_network_url) { nil }
       config.stub(:tenant_name) { 'testTenant' }
@@ -22,7 +21,7 @@ describe VagrantPlugins::Openstack::KeystoneClient do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui')
       env[:ui].stub(:info).with(anything)
       env[:machine] = double('machine')
@@ -35,7 +34,6 @@ describe VagrantPlugins::Openstack::KeystoneClient do
   end
 
   describe 'authenticate' do
-
     let(:keystone_request_headers) do
       {
         'Accept' => 'application/json',
@@ -60,11 +58,11 @@ describe VagrantPlugins::Openstack::KeystoneClient do
 
     context 'with good credentials' do
       it 'store token and tenant id' do
-        stub_request(:post, 'http://keystoneAuthV2')
-        .with(
+        stub_request(:post, 'http://keystoneAuthV2/tokens')
+          .with(
             body: keystone_request_body,
             headers: keystone_request_headers)
-        .to_return(
+          .to_return(
             status: 200,
             body: keystone_response_body,
             headers: keystone_request_headers)
@@ -78,11 +76,11 @@ describe VagrantPlugins::Openstack::KeystoneClient do
 
     context 'with wrong credentials' do
       it 'raise an unauthorized error' do
-        stub_request(:post, 'http://keystoneAuthV2')
-        .with(
+        stub_request(:post, 'http://keystoneAuthV2/tokens')
+          .with(
             body: keystone_request_body,
             headers: keystone_request_headers)
-        .to_return(
+          .to_return(
             status: 401,
             body: '{
                 "error": {
@@ -99,24 +97,44 @@ describe VagrantPlugins::Openstack::KeystoneClient do
 
     context 'with bad endpoint' do
       it 'raise a BadAuthenticationEndpoint error' do
-        stub_request(:post, 'http://keystoneAuthV2')
-        .with(
+        stub_request(:post, 'http://keystoneAuthV2/tokens')
+          .with(
             body: keystone_request_body,
             headers: keystone_request_headers)
-        .to_return(
+          .to_return(
             status: 404)
 
         expect { @keystone_client.authenticate(env) }.to raise_error(Errors::BadAuthenticationEndpoint)
       end
     end
 
+    context 'with /tokens suffix missing in URL' do
+      it 'raise add the suffix' do
+        config.stub(:openstack_auth_url) { 'http://keystoneAuthV2' }
+
+        stub_request(:post, 'http://keystoneAuthV2/tokens')
+          .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')
+      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(
+        stub_request(:post, 'http://keystoneAuthV2/tokens')
+          .with(
             body: keystone_request_body,
             headers: keystone_request_headers)
-        .to_return(
+          .to_return(
             status: 500,
             body: 'Internal server error')
 

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::NeutronClient do
-
   let(:http) do
     double('http').tap do |http|
       http.stub(:read_timeout) { 42 }
@@ -16,7 +15,7 @@ describe VagrantPlugins::Openstack::NeutronClient do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:machine] = double('machine')
       env[:machine].stub(:provider_config) { config }
     end
@@ -36,25 +35,24 @@ describe VagrantPlugins::Openstack::NeutronClient do
   describe 'get_private_networks' do
     context 'with token' do
       it 'returns only private networks for project in session' do
-
         stub_request(:get, 'http://neutron/networks')
-            .with(
-              headers:
+          .with(
+            headers:
+            {
+              'Accept' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(
+            status: 200,
+            body: '
               {
-                'Accept' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(
-              status: 200,
-              body: '
-                {
-                  "networks": [
-                    { "name": "PublicNetwork", "tenant_id": "admin-tenant-id", "id": "net-pub" },
-                    { "name": "net1", "tenant_id": "a1b2c3", "id": "net-1" },
-                    { "name": "net2", "tenant_id": "a1b2c3", "id": "net-2" }
-                  ]
-                }
-              ')
+                "networks": [
+                  { "name": "PublicNetwork", "tenant_id": "admin-tenant-id", "id": "net-pub" },
+                  { "name": "net1", "tenant_id": "a1b2c3", "id": "net-1" },
+                  { "name": "net2", "tenant_id": "a1b2c3", "id": "net-2" }
+                ]
+              }
+            ')
 
         networks = @neutron_client.get_private_networks(env)
 
@@ -70,25 +68,24 @@ describe VagrantPlugins::Openstack::NeutronClient do
   describe 'get_all_networks' do
     context 'with token' do
       it 'returns all networks for project in session' do
-
         stub_request(:get, 'http://neutron/networks')
-            .with(
-              headers:
+          .with(
+            headers:
+            {
+              'Accept' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(
+            status: 200,
+            body: '
               {
-                'Accept' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(
-              status: 200,
-              body: '
-                {
-                  "networks": [
-                    { "name": "PublicNetwork", "tenant_id": "admin-tenant-id", "id": "net-pub" },
-                    { "name": "net1", "tenant_id": "a1b2c3", "id": "net-1" },
-                    { "name": "net2", "tenant_id": "a1b2c3", "id": "net-2" }
-                  ]
-                }
-              ')
+                "networks": [
+                  { "name": "PublicNetwork", "tenant_id": "admin-tenant-id", "id": "net-pub" },
+                  { "name": "net1", "tenant_id": "a1b2c3", "id": "net-1" },
+                  { "name": "net2", "tenant_id": "a1b2c3", "id": "net-2" }
+                ]
+              }
+            ')
 
         networks = @neutron_client.get_all_networks(env)
 
@@ -106,25 +103,24 @@ describe VagrantPlugins::Openstack::NeutronClient do
   describe 'get_subnets' do
     context 'with token' do
       it 'returns all available subnets' do
-
         stub_request(:get, 'http://neutron/subnets')
-        .with(
-          headers:
-            {
-              'Accept' => 'application/json',
-              'X-Auth-Token' => '123456'
-            })
-        .to_return(
-          status: 200,
-          body: '
-                {
-                  "subnets": [
-                    { "id": "subnet-01", "name": "Subnet 1", "cidr": "192.168.1.0/24", "enable_dhcp": true, "network_id": "net-01" },
-                    { "id": "subnet-02", "name": "Subnet 2", "cidr": "192.168.2.0/24", "enable_dhcp": false, "network_id": "net-01" },
-                    { "id": "subnet-03", "name": "Subnet 3", "cidr": "192.168.100.0/24", "enable_dhcp": true, "network_id": "net-02" }
-                  ]
-                }
-                ')
+          .with(
+            headers:
+              {
+                'Accept' => 'application/json',
+                'X-Auth-Token' => '123456'
+              })
+          .to_return(
+            status: 200,
+            body: '
+                  {
+                    "subnets": [
+                      { "id": "subnet-01", "name": "Subnet 1", "cidr": "192.168.1.0/24", "enable_dhcp": true, "network_id": "net-01" },
+                      { "id": "subnet-02", "name": "Subnet 2", "cidr": "192.168.2.0/24", "enable_dhcp": false, "network_id": "net-01" },
+                      { "id": "subnet-03", "name": "Subnet 3", "cidr": "192.168.100.0/24", "enable_dhcp": true, "network_id": "net-02" }
+                    ]
+                  }
+                  ')
 
         networks = @neutron_client.get_subnets(env)
 
@@ -139,32 +135,32 @@ describe VagrantPlugins::Openstack::NeutronClient 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"
-                  }
-                ]
-              }
-            ]}')
+          .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, :network)
 

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

@@ -31,7 +31,7 @@ describe VagrantPlugins::Openstack::NovaClient do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui')
       env[:ui].stub(:info).with(anything)
       env[:machine] = double('machine')
@@ -54,20 +54,19 @@ describe VagrantPlugins::Openstack::NovaClient do
     context 'instance not found' do
       it 'raise an InstanceNotFound error' do
         stub_request(:post, 'http://nova/a1b2c3/servers/o1o2o3/action')
-            .with(
-              body: '{"os-start":null}',
-              headers:
-              {
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(
-              status: 404,
-              body: '{"itemNotFound": {"message": "Instance could not be found", "code": 404}}')
+          .with(
+            body: '{"os-start":null}',
+            headers:
+            {
+              'Accept' => 'application/json',
+              'Content-Type' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(
+            status: 404,
+            body: '{"itemNotFound": {"message": "Instance could not be found", "code": 404}}')
 
         expect { @nova_client.start_server(env, 'o1o2o3') }.to raise_error(VagrantPlugins::Openstack::Errors::InstanceNotFound)
-
       end
     end
   end
@@ -76,19 +75,19 @@ describe VagrantPlugins::Openstack::NovaClient do
     context 'with token and project_id acquainted' do
       it 'returns all flavors' do
         stub_request(:get, 'http://nova/a1b2c3/flavors/detail')
-            .with(
-              headers:
-              {
-                'Accept' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(
-              status: 200,
-              body: '{
-                "flavors": [
-                  { "id": "f1", "name": "flavor1", "vcpus":"1", "ram": "1024", "disk": "10"},
-                  { "id": "f2", "name": "flavor2", "vcpus":"2", "ram": "2048", "disk": "20"}
-                ]}')
+          .with(
+            headers:
+            {
+              'Accept' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(
+            status: 200,
+            body: '{
+              "flavors": [
+                { "id": "f1", "name": "flavor1", "vcpus":"1", "ram": "1024", "disk": "10"},
+                { "id": "f2", "name": "flavor2", "vcpus":"2", "ram": "2048", "disk": "20"}
+              ]}')
 
         flavors = @nova_client.get_all_flavors(env)
 
@@ -103,15 +102,15 @@ describe VagrantPlugins::Openstack::NovaClient do
     context 'with token and project_id acquainted' do
       it 'returns all images' do
         stub_request(:get, 'http://nova/a1b2c3/images')
-            .with(
-              headers:
-              {
-                'Accept' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(
-              status: 200,
-              body: '{ "images": [ { "id": "i1", "name": "image1"}, { "id": "i2", "name": "image2"} ] }')
+          .with(
+            headers:
+            {
+              'Accept' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(
+            status: 200,
+            body: '{ "images": [ { "id": "i1", "name": "image1"}, { "id": "i2", "name": "image2"} ] }')
 
         images = @nova_client.get_all_images(env)
 
@@ -127,17 +126,16 @@ describe VagrantPlugins::Openstack::NovaClient do
   describe 'create_server' do
     context 'with token and project_id acquainted' 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"}}',
-              headers:
-              {
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
+          .with(
+            body: '{"server":{"name":"inst","imageRef":"img","flavorRef":"flav","key_name":"key"}}',
+            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', networks: nil, keypair: 'key')
 
@@ -147,17 +145,17 @@ describe VagrantPlugins::Openstack::NovaClient do
       context 'with all options specified' 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",'\
-                '"security_groups":[{"name":"default"}],"user_data":"dXNlcl9kYXRhX3Rlc3Q=\n","metadata":"metadata_test"},'\
-                '"scheduler_hints":"sched_hints_test"}',
-                headers:
-                {
-                  'Accept' => 'application/json',
-                  'Content-Type' => 'application/json',
-                  'X-Auth-Token' => '123456'
-                })
-              .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
+            .with(
+              body: '{"server":{"name":"inst","imageRef":"img","flavorRef":"flav","key_name":"key",'\
+              '"security_groups":[{"name":"default"}],"user_data":"dXNlcl9kYXRhX3Rlc3Q=\n","metadata":"metadata_test"},'\
+              '"os:scheduler_hints":"sched_hints_test"}',
+              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,
@@ -177,9 +175,8 @@ describe VagrantPlugins::Openstack::NovaClient do
 
       context 'with two networks' do
         it 'returns new instance id' do
-
           stub_request(:post, 'http://nova/a1b2c3/servers')
-          .with(
+            .with(
               body: '{"server":{"name":"inst","imageRef":"img","flavorRef":"flav","key_name":"key","networks":[{"uuid":"net1"},{"uuid":"net2"}]}}',
               headers:
                   {
@@ -187,7 +184,7 @@ describe VagrantPlugins::Openstack::NovaClient do
                     'Content-Type' => 'application/json',
                     'X-Auth-Token' => '123456'
                   })
-          .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
+            .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
 
           instance_id = @nova_client.create_server(env, name: 'inst', image_ref: 'img', flavor_ref: 'flav',
                                                         networks: [{ uuid: 'net1' }, { uuid: 'net2' }], keypair: 'key')
@@ -198,9 +195,8 @@ describe VagrantPlugins::Openstack::NovaClient do
 
       context 'with availability_zone' do
         it 'returns new instance id' do
-
           stub_request(:post, 'http://nova/a1b2c3/servers')
-          .with(
+            .with(
               body: '{"server":{"name":"inst","imageRef":"img","flavorRef":"flav","key_name":"key","availability_zone":"avz"}}',
               headers:
                   {
@@ -208,7 +204,7 @@ describe VagrantPlugins::Openstack::NovaClient do
                     'Content-Type' => 'application/json',
                     'X-Auth-Token' => '123456'
                   })
-          .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
+            .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')
 
@@ -216,22 +212,51 @@ describe VagrantPlugins::Openstack::NovaClient do
         end
       end
 
-      context 'with volume_boot' do
-        it 'returns new instance id' do
-
+      context 'with volume_boot creating volume' do
+        it 'create bootable volume and returns new instance id' do
           stub_request(:post, 'http://nova/a1b2c3/servers')
-          .with(
-              body: '{"server":{"name":"inst","block_device_mapping":[{"volume_id":"vol","device_name":"vda"}],"flavorRef":"flav","key_name":"key"}}',
+            .with(
+              body: '{"server":{"name":"inst","block_device_mapping_v2":[{"boot_index":"0","volume_size":"10","uuid":"image_id",'\
+              '"device_name":"vda","source_type":"image","destination_type":"volume","delete_on_termination":"false"}],'\
+              '"flavorRef":"flav","key_name":"key"}}',
               headers:
-                  {
-                    'Accept' => 'application/json',
-                    'Content-Type' => 'application/json',
-                    'X-Auth-Token' => '123456'
-                  })
-          .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
+              {
+                '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: nil,
+                                                   volume_boot: { image: 'image_id', device: 'vda', size: '10',
+                                                                  delete_on_destroy: 'false' },
+                                                   flavor_ref: 'flav',
+                                                   keypair: 'key')
+          expect(instance_id).to eq('o1o2o3')
+        end
+      end
 
-          instance_id = @nova_client.create_server(env, name: 'inst', volume_boot: { id: 'vol', device: 'vda' }, flavor_ref: 'flav', keypair: 'key')
+      context 'with volume_boot id' do
+        it 'returns new instance id' do
+          stub_request(:post, 'http://nova/a1b2c3/servers')
+            .with(
+              body: '{"server":{"name":"inst","block_device_mapping":[{"volume_id":"vol","device_name":"vda"}],'\
+              '"flavorRef":"flav","key_name":"key"}}',
+              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',
+                                                   volume_boot: { id: 'vol', device: 'vda' },
+                                                   flavor_ref: 'flav',
+                                                   keypair: 'key')
           expect(instance_id).to eq('o1o2o3')
         end
       end
@@ -241,17 +266,15 @@ describe VagrantPlugins::Openstack::NovaClient do
   describe 'delete_server' do
     context 'with token and project_id acquainted' do
       it 'returns new instance id' do
-
         stub_request(:delete, 'http://nova/a1b2c3/servers/o1o2o3')
-            .with(
-              headers: {
-                'Accept' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(status: 204)
+          .with(
+            headers: {
+              'Accept' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(status: 204)
 
         @nova_client.delete_server(env, 'o1o2o3')
-
       end
     end
   end
@@ -264,13 +287,13 @@ describe VagrantPlugins::Openstack::NovaClient do
         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: '
+          .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"
@@ -278,7 +301,6 @@ describe VagrantPlugins::Openstack::NovaClient do
               }')
 
         @nova_client.import_keypair_from_file(env, filename)
-
       end
     end
   end
@@ -288,12 +310,12 @@ describe VagrantPlugins::Openstack::NovaClient do
       context 'with keypair not generated by vagrant' do
         it 'do nothing' do
           stub_request(:get, 'http://nova/a1b2c3/servers/o1o2o3')
-              .with(headers:
+            .with(headers:
                 {
                   'Accept' => 'application/json',
                   'X-Auth-Token' => '123456'
                 })
-              .to_return(status: 200, body: '
+            .to_return(status: 200, body: '
                 {
                   "server": {
                      "id": "o1o2o3",
@@ -308,15 +330,15 @@ describe VagrantPlugins::Openstack::NovaClient do
       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)
+            .with(headers: { 'X-Auth-Token' => '123456' })
+            .to_return(status: 202)
           stub_request(:get, 'http://nova/a1b2c3/servers/o1o2o3')
-              .with(headers:
+            .with(headers:
                 {
                   'Accept' => 'application/json',
                   'X-Auth-Token' => '123456'
                 })
-              .to_return(status: 200, body: '
+            .to_return(status: 200, body: '
                 {
                   "server": {
                      "id": "o1o2o3",
@@ -328,23 +350,44 @@ describe VagrantPlugins::Openstack::NovaClient do
           @nova_client.delete_keypair_if_vagrant(env, 'o1o2o3')
         end
       end
+      context 'with keypair generated by vagrant and missing in server details' do
+        it 'do nothing' 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"
+                  }
+                }
+              ')
+
+          @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}',
-              headers:
-              {
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(status: 202)
+          .with(
+            body: '{"suspend":null}',
+            headers:
+            {
+              'Accept' => 'application/json',
+              'Content-Type' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(status: 202)
 
         @nova_client.suspend_server(env, 'o1o2o3')
       end
@@ -354,17 +397,16 @@ describe VagrantPlugins::Openstack::NovaClient do
   describe 'resume_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: '{"resume":null}',
-              headers:
-              {
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(status: 202)
+          .with(
+            body: '{"resume":null}',
+            headers:
+            {
+              'Accept' => 'application/json',
+              'Content-Type' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(status: 202)
 
         @nova_client.resume_server(env, 'o1o2o3')
       end
@@ -374,20 +416,18 @@ describe VagrantPlugins::Openstack::NovaClient do
   describe 'stop_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: '{"os-stop":null}',
-              headers:
-              {
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(status: 202)
+          .with(
+            body: '{"os-stop":null}',
+            headers:
+            {
+              'Accept' => 'application/json',
+              'Content-Type' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(status: 202)
 
         @nova_client.stop_server(env, 'o1o2o3')
-
       end
     end
   end
@@ -395,20 +435,18 @@ describe VagrantPlugins::Openstack::NovaClient do
   describe 'start_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: '{"os-start":null}',
-              headers:
-              {
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => '123456'
-              })
-            .to_return(status: 202)
+          .with(
+            body: '{"os-start":null}',
+            headers:
+            {
+              'Accept' => 'application/json',
+              'Content-Type' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+          .to_return(status: 202)
 
         @nova_client.start_server(env, 'o1o2o3')
-
       end
     end
   end
@@ -417,14 +455,14 @@ describe VagrantPlugins::Openstack::NovaClient 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:
+          .with(headers:
           {
             'Accept' => 'application/json',
             'Accept-Encoding' => 'gzip, deflate',
             'User-Agent' => 'Ruby',
             'X-Auth-Token' => '123456'
           })
-         .to_return(status: 200, body: '
+          .to_return(status: 200, body: '
          {
            "floating_ips": [
              {"instance_id": "1234",
@@ -460,12 +498,12 @@ describe VagrantPlugins::Openstack::NovaClient 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: '
+          .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,
@@ -487,14 +525,13 @@ describe VagrantPlugins::Openstack::NovaClient do
   describe 'get_server_details' do
     context 'with token and project_id acquainted' do
       it 'returns server details' do
-
         stub_request(:get, 'http://nova/a1b2c3/servers/o1o2o3')
-            .with(headers:
+          .with(headers:
               {
                 'Accept' => 'application/json',
                 'X-Auth-Token' => '123456'
               })
-            .to_return(status: 200, body: '
+          .to_return(status: 200, body: '
               {
                 "server": {
                    "addresses": { "private": [ { "addr": "192.168.0.3", "version": 4 } ] },
@@ -519,23 +556,20 @@ describe VagrantPlugins::Openstack::NovaClient do
         expect(server['tenant_id']).to eq('openstack')
         expect(server['image']['id']).to eq('i1')
         expect(server['flavor']['id']).to eq('1')
-
       end
     end
   end
 
   describe 'add_floating_ip' do
-
     context 'with token and project_id acquainted and IP available' do
       it 'returns server details' do
-
         stub_request(:get, 'http://nova/a1b2c3/os-floating-ips')
-            .with(headers:
+          .with(headers:
               {
                 'Accept' => 'application/json',
                 'X-Auth-Token' => '123456'
               })
-            .to_return(status: 200, body: '
+          .to_return(status: 200, body: '
               {
                   "floating_ips": [
                       {
@@ -556,14 +590,14 @@ describe VagrantPlugins::Openstack::NovaClient do
               }')
 
         stub_request(:post, 'http://nova/a1b2c3/servers/o1o2o3/action')
-            .with(body: '{"addFloatingIp":{"address":"1.2.3.4"}}',
-                  headers:
+          .with(body: '{"addFloatingIp":{"address":"1.2.3.4"}}',
+                headers:
                   {
                     'Accept' => 'application/json',
                     'Content-Type' => 'application/json',
                     'X-Auth-Token' => '123456'
                   })
-            .to_return(status: 202)
+          .to_return(status: 202)
 
         @nova_client.add_floating_ip(env, 'o1o2o3', '1.2.3.4')
       end
@@ -571,14 +605,13 @@ describe VagrantPlugins::Openstack::NovaClient do
 
     context 'with token and project_id acquainted and IP already in use' do
       it 'raise an error' do
-
         stub_request(:get, 'http://nova/a1b2c3/os-floating-ips')
-            .with(headers:
+          .with(headers:
               {
                 'Accept' => 'application/json',
                 'X-Auth-Token' => '123456'
               })
-            .to_return(status: 200, body: '
+          .to_return(status: 200, body: '
               {
                   "floating_ips": [
                       {
@@ -604,14 +637,13 @@ describe VagrantPlugins::Openstack::NovaClient do
 
     context 'with token and project_id acquainted and IP not allocated' do
       it 'raise an error' do
-
         stub_request(:get, 'http://nova/a1b2c3/os-floating-ips')
-            .with(headers:
+          .with(headers:
               {
                 'Accept' => 'application/json',
                 'X-Auth-Token' => '123456'
               })
-            .to_return(status: 200, body: '
+          .to_return(status: 200, body: '
               {
                   "floating_ips": [
                       {
@@ -632,7 +664,6 @@ describe VagrantPlugins::Openstack::NovaClient do
   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: '
@@ -659,7 +690,6 @@ describe VagrantPlugins::Openstack::NovaClient do
   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: '
@@ -701,13 +731,13 @@ describe VagrantPlugins::Openstack::NovaClient do
       context 'with volume id and device' do
         it 'call the nova api' do
           stub_request(:post, 'http://nova/a1b2c3/servers/9876/os-volume_attachments')
-          .with(headers:
+            .with(headers:
                   {
                     'Accept' => 'application/json',
                     'X-Auth-Token' => '123456'
                   },
-                body: '{"volumeAttachment":{"volumeId":"n1n2","device":"/dev/vdg"}}')
-          .to_return(status: 200, body: '
+                  body: '{"volumeAttachment":{"volumeId":"n1n2","device":"/dev/vdg"}}')
+            .to_return(status: 200, body: '
                   {
                     "volumeAttachment": {
                       "device": "/dev/vdg",