knife-openstack 1.3.2.pre → 1.3.2.pre.1

data/spec/functional/server_delete_func_spec.rb

@@ -22,16 +22,15 @@ require 'chef/knife/openstack_server_delete'
 require 'chef/knife/cloud/openstack_service'
 
 describe Chef::Knife::Cloud::OpenstackServerDelete do
-
   before do
     @openstack_connection = double(Fog::Compute::OpenStack)
     @chef_node = double(Chef::Node)
     @chef_client = double(Chef::ApiClient)
     @knife_openstack_delete = Chef::Knife::Cloud::OpenstackServerDelete.new
     {
-      :openstack_username => 'openstack_username',
-      :openstack_password => 'openstack_password',
-      :openstack_auth_url => 'openstack_auth_url'
+      openstack_username: 'openstack_username',
+      openstack_password: 'openstack_password',
+      openstack_auth_url: 'openstack_auth_url'
     }.each do |key, value|
       Chef::Config[:knife][key] = value
     end
@@ -41,16 +40,16 @@ describe Chef::Knife::Cloud::OpenstackServerDelete do
     allow(@knife_openstack_delete).to receive(:create_service_instance).and_return(@openstack_service)
     allow(@knife_openstack_delete.ui).to receive(:warn)
     allow(@knife_openstack_delete.ui).to receive(:confirm)
-    @openstack_servers = double()
-    @running_openstack_server = double()
-    @openstack_server_attribs = { :name => 'Mock Server',
-                                  :id => 'id-123456',
-                                  :flavor => 'flavor_id',
-                                  :image => 'image_id',
-                                  :addresses => {
-                                    'public' => [{'addr' => '75.101.253.10'}],
-                                    'private' => [{'addr' => '10.251.75.20'}]
-                                    }
+    @openstack_servers = double
+    @running_openstack_server = double
+    @openstack_server_attribs = { name: 'Mock Server',
+                                  id: 'id-123456',
+                                  flavor: 'flavor_id',
+                                  image: 'image_id',
+                                  addresses: {
+                                    'public' => [{ 'addr' => '75.101.253.10' }],
+                                    'private' => [{ 'addr' => '10.251.75.20' }]
+                                  }
                                 }
 
     @openstack_server_attribs.each_pair do |attrib, value|
@@ -59,8 +58,8 @@ describe Chef::Knife::Cloud::OpenstackServerDelete do
     @knife_openstack_delete.name_args = ['test001']
   end
 
-  describe "run" do
-    it "deletes an OpenStack instance." do
+  describe 'run' do
+    it 'deletes an OpenStack instance.' do
       expect(@openstack_servers).to receive(:get).and_return(@running_openstack_server)
       expect(@openstack_connection).to receive(:servers).and_return(@openstack_servers)
       expect(Fog::Compute::OpenStack).to receive(:new).and_return(@openstack_connection)
@@ -68,7 +67,7 @@ describe Chef::Knife::Cloud::OpenstackServerDelete do
       @knife_openstack_delete.run
     end
 
-    it "deletes the instance along with the node and client on the chef-server when --purge is given as an option." do
+    it 'deletes the instance along with the node and client on the chef-server when --purge is given as an option.' do
       @knife_openstack_delete.config[:purge] = true
       expect(Chef::Node).to receive(:load).and_return(@chef_node)
       expect(@chef_node).to receive(:destroy)

data/spec/functional/server_list_func_spec.rb

@@ -23,72 +23,72 @@ require 'chef/knife/openstack_server_list'
 require 'chef/knife/cloud/openstack_service'
 
 describe Chef::Knife::Cloud::OpenstackServerList do
-  let (:instance) {Chef::Knife::Cloud::OpenstackServerList.new}
+  let (:instance) { Chef::Knife::Cloud::OpenstackServerList.new }
 
-  context "functionality" do
+  context 'functionality' do
     before do
-      @resources = [ TestResource.new({:id => "resource-1", :name => "ubuntu01", :availability_zone => "test zone", :addresses => {"public"=>[{"version"=>4, "addr"=>"172.31.6.132"}], "private"=>[{"version"=>4, "addr"=>"172.31.6.133"}]}, :flavor => {"id" => "1"}, :image => {"id" => "image1"}, :key_name => "keypair", :state => "ACTIVE"}),
-                     TestResource.new({:id => "resource-2", :name => "windows2008",:availability_zone => "test zone", :addresses => {"public"=>[{"version"=>4, "addr"=>"172.31.6.132"}]}, :flavor => {"id" => "id2"}, :image => {"id" => "image2"}, :key_name => "keypair", :state => "ACTIVE"}),
-                     TestResource.new({:id => "resource-3-err", :name => "windows2008", :availability_zone => "test zone", :addresses => {"public"=>[], "private"=>[]}, :flavor => {"id" => "id2"}, :image => {"id" => "image2"}, :key_name => "keypair", :state => "ERROR"})
+      @resources = [TestResource.new(id: 'resource-1', name: 'ubuntu01', availability_zone: 'test zone', addresses: { 'public' => [{ 'version' => 4, 'addr' => '172.31.6.132' }], 'private' => [{ 'version' => 4, 'addr' => '172.31.6.133' }] }, flavor: { 'id' => '1' }, image: { 'id' => 'image1' }, key_name: 'keypair', state: 'ACTIVE'),
+                    TestResource.new(id: 'resource-2', name: 'windows2008', availability_zone: 'test zone', addresses: { 'public' => [{ 'version' => 4, 'addr' => '172.31.6.132' }] }, flavor: { 'id' => 'id2' }, image: { 'id' => 'image2' }, key_name: 'keypair', state: 'ACTIVE'),
+                    TestResource.new(id: 'resource-3-err', name: 'windows2008', availability_zone: 'test zone', addresses: { 'public' => [], 'private' => [] }, flavor: { 'id' => 'id2' }, image: { 'id' => 'image2' }, key_name: 'keypair', state: 'ERROR')
                    ]
       allow(instance).to receive(:query_resource).and_return(@resources)
       allow(instance).to receive(:puts)
       allow(instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::FogService.new)
       allow(instance).to receive(:validate!)
-      instance.config[:format] = "summary"
+      instance.config[:format] = 'summary'
     end
 
-    it "lists formatted list of resources" do
-      expect(instance.ui).to receive(:list).with(["Name", "Instance ID", "Public IP", "Private IP", "Flavor", "Image", "Keypair", "State", "Availability Zone",
-                                              "ubuntu01", "resource-1", "172.31.6.132", "172.31.6.133", "1", "image1", "keypair", "ACTIVE", "test zone",
-                                              "windows2008", "resource-2", "172.31.6.132", nil, "id2", "image2", "keypair", "ACTIVE", "test zone", "windows2008", "resource-3-err", nil, nil, "id2", "image2", "keypair", "ERROR", "test zone"], :uneven_columns_across, 9)
+    it 'lists formatted list of resources' do
+      expect(instance.ui).to receive(:list).with(['Name', 'Instance ID', 'Public IP', 'Private IP', 'Flavor', 'Image', 'Keypair', 'State', 'Availability Zone',
+                                                  'ubuntu01', 'resource-1', '172.31.6.132', '172.31.6.133', '1', 'image1', 'keypair', 'ACTIVE', 'test zone',
+                                                  'windows2008', 'resource-2', '172.31.6.132', nil, 'id2', 'image2', 'keypair', 'ACTIVE', 'test zone', 'windows2008', 'resource-3-err', nil, nil, 'id2', 'image2', 'keypair', 'ERROR', 'test zone'], :uneven_columns_across, 9)
       instance.run
     end
 
-    context "when chef-data and chef-node-attribute set" do
+    context 'when chef-data and chef-node-attribute set' do
       before(:each) do
-        @resources.push(TestResource.new({:id => "server-4", :name => "server-4", :availability_zone => "test zone", :addresses => {"public"=>[{"version"=>4, "addr"=>"172.31.6.132"}], "private"=>[{"version"=>4, "addr"=>"172.31.6.133"}]}, :flavor => {"id" => "1"}, :image => {"id" => "image1"}, :key_name => "keypair", :state => "ACTIVE"}))
-        @node = TestResource.new({:id => "server-4", :name => "server-4", :chef_environment => "_default", :fqdn => "testfqdnnode.us", :run_list => [], :tags => [], :platform => "ubuntu", :platform_family => "debian"})
-        allow(Chef::Node).to receive(:list).and_return({"server-4" => @node})
+        @resources.push(TestResource.new(id: 'server-4', name: 'server-4', availability_zone: 'test zone', addresses: { 'public' => [{ 'version' => 4, 'addr' => '172.31.6.132' }], 'private' => [{ 'version' => 4, 'addr' => '172.31.6.133' }] }, flavor: { 'id' => '1' }, image: { 'id' => 'image1' }, key_name: 'keypair', state: 'ACTIVE'))
+        @node = TestResource.new(id: 'server-4', name: 'server-4', chef_environment: '_default', fqdn: 'testfqdnnode.us', run_list: [], tags: [], platform: 'ubuntu', platform_family: 'debian')
+        allow(Chef::Node).to receive(:list).and_return('server-4' => @node)
         instance.config[:chef_data] = true
       end
 
-      it "lists formatted list of resources on chef data option set" do
-        expect(instance.ui).to receive(:list).with(["Name", "Instance ID", "Public IP", "Private IP", "Flavor", "Image", "Keypair", "State", "Availability Zone", "Chef Node Name", "Environment", "FQDN", "Runlist", "Tags", "Platform",
-                                                "server-4", "server-4", "172.31.6.132", "172.31.6.133", "1", "image1", "keypair", "ACTIVE", "test zone", "server-4", "_default", "testfqdnnode.us", "[]", "[]", "ubuntu",
-                                                "ubuntu01", "resource-1", "172.31.6.132", "172.31.6.133", "1", "image1", "keypair", "ACTIVE", "test zone", "", "", "", "", "", "",
-                                                "windows2008", "resource-2", "172.31.6.132", nil, "id2", "image2", "keypair", "ACTIVE", "test zone", "", "", "", "", "", "",
-                                                "windows2008", "resource-3-err", nil, nil, "id2", "image2", "keypair", "ERROR", "test zone", "", "", "", "", "", ""], :uneven_columns_across, 15)
+      it 'lists formatted list of resources on chef data option set' do
+        expect(instance.ui).to receive(:list).with(['Name', 'Instance ID', 'Public IP', 'Private IP', 'Flavor', 'Image', 'Keypair', 'State', 'Availability Zone', 'Chef Node Name', 'Environment', 'FQDN', 'Runlist', 'Tags', 'Platform',
+                                                    'server-4', 'server-4', '172.31.6.132', '172.31.6.133', '1', 'image1', 'keypair', 'ACTIVE', 'test zone', 'server-4', '_default', 'testfqdnnode.us', '[]', '[]', 'ubuntu',
+                                                    'ubuntu01', 'resource-1', '172.31.6.132', '172.31.6.133', '1', 'image1', 'keypair', 'ACTIVE', 'test zone', '', '', '', '', '', '',
+                                                    'windows2008', 'resource-2', '172.31.6.132', nil, 'id2', 'image2', 'keypair', 'ACTIVE', 'test zone', '', '', '', '', '', '',
+                                                    'windows2008', 'resource-3-err', nil, nil, 'id2', 'image2', 'keypair', 'ERROR', 'test zone', '', '', '', '', '', ''], :uneven_columns_across, 15)
         instance.run
       end
 
-      it "lists formatted list of resources on chef-data and chef-node-attribute option set" do
-        instance.config[:chef_node_attribute] = "platform_family"
-        expect(@node).to receive(:attribute?).with("platform_family").and_return(true)
-        expect(instance.ui).to receive(:list).with(["Name", "Instance ID", "Public IP", "Private IP", "Flavor", "Image", "Keypair", "State", "Availability Zone", "Chef Node Name", "Environment", "FQDN", "Runlist", "Tags", "Platform", "platform_family",
-                                                "server-4", "server-4", "172.31.6.132", "172.31.6.133", "1", "image1", "keypair", "ACTIVE", "test zone", "server-4", "_default", "testfqdnnode.us", "[]", "[]", "ubuntu", "debian",
-                                                "ubuntu01", "resource-1", "172.31.6.132", "172.31.6.133", "1", "image1", "keypair", "ACTIVE", "test zone", "", "", "", "", "", "", "",
-                                                "windows2008", "resource-2", "172.31.6.132", nil, "id2", "image2", "keypair", "ACTIVE", "test zone", "", "", "", "", "", "", "",
-                                                "windows2008", "resource-3-err", nil, nil, "id2", "image2", "keypair", "ERROR", "test zone", "", "", "", "", "", "", ""], :uneven_columns_across, 16)
+      it 'lists formatted list of resources on chef-data and chef-node-attribute option set' do
+        instance.config[:chef_node_attribute] = 'platform_family'
+        expect(@node).to receive(:attribute?).with('platform_family').and_return(true)
+        expect(instance.ui).to receive(:list).with(['Name', 'Instance ID', 'Public IP', 'Private IP', 'Flavor', 'Image', 'Keypair', 'State', 'Availability Zone', 'Chef Node Name', 'Environment', 'FQDN', 'Runlist', 'Tags', 'Platform', 'platform_family',
+                                                    'server-4', 'server-4', '172.31.6.132', '172.31.6.133', '1', 'image1', 'keypair', 'ACTIVE', 'test zone', 'server-4', '_default', 'testfqdnnode.us', '[]', '[]', 'ubuntu', 'debian',
+                                                    'ubuntu01', 'resource-1', '172.31.6.132', '172.31.6.133', '1', 'image1', 'keypair', 'ACTIVE', 'test zone', '', '', '', '', '', '', '',
+                                                    'windows2008', 'resource-2', '172.31.6.132', nil, 'id2', 'image2', 'keypair', 'ACTIVE', 'test zone', '', '', '', '', '', '', '',
+                                                    'windows2008', 'resource-3-err', nil, nil, 'id2', 'image2', 'keypair', 'ERROR', 'test zone', '', '', '', '', '', '', ''], :uneven_columns_across, 16)
         instance.run
       end
 
-      it "raise error on invalid chef-node-attribute set" do
-        instance.config[:chef_node_attribute] = "invalid_attribute"
+      it 'raise error on invalid chef-node-attribute set' do
+        instance.config[:chef_node_attribute] = 'invalid_attribute'
         expect(instance.ui).to receive(:fatal)
-        expect(@node).to receive(:attribute?).with("invalid_attribute").and_return(false)
-        expect(instance.ui).to receive(:error).with("The Node does not have a invalid_attribute attribute.")
+        expect(@node).to receive(:attribute?).with('invalid_attribute').and_return(false)
+        expect(instance.ui).to receive(:error).with('The Node does not have a invalid_attribute attribute.')
         expect { instance.run }.to raise_error
       end
 
-      it "not display chef-data on chef-node-attribute set but chef-data option missing" do
+      it 'not display chef-data on chef-node-attribute set but chef-data option missing' do
         instance.config[:chef_data] = false
-        instance.config[:chef_node_attribute] = "platform_family"
-        expect(instance.ui).to receive(:list).with(["Name", "Instance ID", "Public IP", "Private IP", "Flavor", "Image", "Keypair", "State", "Availability Zone",
-                                                "server-4", "server-4", "172.31.6.132", "172.31.6.133", "1", "image1", "keypair", "ACTIVE", "test zone",
-                                                "ubuntu01", "resource-1", "172.31.6.132", "172.31.6.133", "1", "image1", "keypair", "ACTIVE", "test zone",
-                                                "windows2008", "resource-2", "172.31.6.132", nil, "id2", "image2", "keypair", "ACTIVE", "test zone",
-                                                "windows2008", "resource-3-err", nil, nil, "id2", "image2", "keypair", "ERROR", "test zone"], :uneven_columns_across, 9)
+        instance.config[:chef_node_attribute] = 'platform_family'
+        expect(instance.ui).to receive(:list).with(['Name', 'Instance ID', 'Public IP', 'Private IP', 'Flavor', 'Image', 'Keypair', 'State', 'Availability Zone',
+                                                    'server-4', 'server-4', '172.31.6.132', '172.31.6.133', '1', 'image1', 'keypair', 'ACTIVE', 'test zone',
+                                                    'ubuntu01', 'resource-1', '172.31.6.132', '172.31.6.133', '1', 'image1', 'keypair', 'ACTIVE', 'test zone',
+                                                    'windows2008', 'resource-2', '172.31.6.132', nil, 'id2', 'image2', 'keypair', 'ACTIVE', 'test zone',
+                                                    'windows2008', 'resource-3-err', nil, nil, 'id2', 'image2', 'keypair', 'ERROR', 'test zone'], :uneven_columns_across, 9)
         instance.run
       end
     end

data/spec/functional/server_show_func_spec.rb

@@ -20,18 +20,17 @@ require 'chef/knife/openstack_server_show'
 require 'chef/knife/cloud/openstack_service'
 
 describe Chef::Knife::Cloud::OpenstackServerShow do
-
-  context "functionality" do
+  context 'functionality' do
     before do
       @instance = Chef::Knife::Cloud::OpenstackServerShow.new
-      Chef::Config[:knife][:instance_id] = "instance_id"
+      Chef::Config[:knife][:instance_id] = 'instance_id'
       @openstack_service = Chef::Knife::Cloud::OpenstackService.new
       allow(@openstack_service).to receive(:msg_pair)
       allow(@openstack_service).to receive(:print)
       allow_message_expectations_on_nil
       server = Object.new
       conn = Object.new
-      conn.define_singleton_method(:servers){ }
+      conn.define_singleton_method(:servers) {}
       allow(@openstack_service).to receive(:connection).and_return(conn)
       expect(@openstack_service.connection.servers).to receive(:get).and_return(server)
       allow(@instance).to receive(:create_service_instance).and_return(@openstack_service)
@@ -39,7 +38,7 @@ describe Chef::Knife::Cloud::OpenstackServerShow do
       expect(@openstack_service).to receive(:server_summary)
     end
 
-    it "runs server show successfully" do
+    it 'runs server show successfully' do
       @instance.run
     end
   end

data/spec/functional/volume_list_func_spec.rb

@@ -22,23 +22,23 @@ require 'chef/knife/cloud/openstack_service'
 require 'support/shared_examples_for_command'
 
 describe Chef::Knife::Cloud::OpenstackVolumeList do
-  let (:instance) {Chef::Knife::Cloud::OpenstackVolumeList.new}
+  let (:instance) { Chef::Knife::Cloud::OpenstackVolumeList.new }
 
-  context "functionality" do
+  context 'functionality' do
     before do
-      resources = [ TestResource.new({:id => "volume-1", :name => "big-disk-volume", :status => "available", :size => 1024, :description => "This is the big disk"}),
-                     TestResource.new({:id => "volume-2", :name => "little-disk-volume", :status => "in-use", :size => 8, :description => "This is the little disk"})
-                   ]
+      resources = [TestResource.new(id: 'volume-1', name: 'big-disk-volume', status: 'available', size: 1024, description: 'This is the big disk'),
+                   TestResource.new(id: 'volume-2', name: 'little-disk-volume', status: 'in-use', size: 8, description: 'This is the little disk')
+                  ]
       allow(instance).to receive(:query_resource).and_return(resources)
       allow(instance).to receive(:puts)
       allow(instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::Service.new)
       allow(instance).to receive(:validate!)
     end
 
-    it "lists formatted list of resources" do
-      expect(instance.ui).to receive(:list).with(["Name", "ID", "Status", "Size", "Description",
-                                              "big-disk-volume", "volume-1", "available", "1024 GB", "This is the big disk",
-                                              "little-disk-volume", "volume-2", "in-use", "8 GB", "This is the little disk"], :uneven_columns_across, 5)
+    it 'lists formatted list of resources' do
+      expect(instance.ui).to receive(:list).with(['Name', 'ID', 'Status', 'Size', 'Description',
+                                                  'big-disk-volume', 'volume-1', 'available', '1024 GB', 'This is the big disk',
+                                                  'little-disk-volume', 'volume-2', 'in-use', '8 GB', 'This is the little disk'], :uneven_columns_across, 5)
       instance.run
     end
   end

data/spec/integration/cleanup.rb

@@ -23,14 +23,12 @@ module CleanupTestResources
 
     # OPENSTACK_USERNAME, OPENSTACK_PASSWORD and OPENSTACK_AUTH_URL are mandatory params to run knife openstack commands.
     %w(OPENSTACK_USERNAME OPENSTACK_PASSWORD OPENSTACK_AUTH_URL).each do |os_env_var|
-      if ENV[os_env_var].nil?
-        unset_env_var << os_env_var
-      end
+      unset_env_var << os_env_var if ENV[os_env_var].nil?
     end
 
     err_msg = "\nPlease set #{unset_env_var.join(', ')} environment"
-    err_msg = err_msg + ( unset_env_var.length > 1 ? " variables " : " variable " ) + "to cleanup test resources."
-    if ! unset_env_var.empty?
+    err_msg = err_msg + (unset_env_var.length > 1 ? ' variables ' : ' variable ') + 'to cleanup test resources.'
+    unless unset_env_var.empty?
       puts err_msg
       exit 1
     end
@@ -38,15 +36,14 @@ module CleanupTestResources
 
   # Use Mixlib::ShellOut to run knife openstack commands.
   def self.run(command_line)
-    shell_out = Mixlib::ShellOut.new("#{command_line}") 
+    shell_out = Mixlib::ShellOut.new("#{command_line}")
     shell_out.timeout = 3000
     shell_out.run_command
-    return shell_out
+    shell_out
   end
 
   # Use knife openstack to delete servers.
   def self.cleanup_resources
-
     delete_resources = []
 
     # Openstack credentials use during knife openstack command run.
@@ -66,9 +63,9 @@ module CleanupTestResources
 
     # We use "os-integration-test-<platform>-<randomNumber>" pattern for server name during integration tests run. So use "os-integration-test-" pattern to find out servers created during integration tests run.
     servers.each_line do |line|
-      if line.include?("os-integration-test-") || (line.include?("openstack-") && line.include?("opscode-ci-ssh"))
+      if line.include?('os-integration-test-') || (line.include?('openstack-') && line.include?('opscode-ci-ssh'))
         # Extract and add instance id of server to delete_resources list.
-        delete_resources << {"id" => line.split(" ").first, "name" => line.split(" ")[1]}
+        delete_resources << { 'id' => line.split(' ').first, 'name' => line.split(' ')[1] }
       end
     end
 
@@ -88,4 +85,4 @@ module CleanupTestResources
 end
 
 CleanupTestResources.validate_params
-CleanupTestResources.cleanup_resources
+CleanupTestResources.cleanup_resources

data/spec/integration/openstack_spec.rb

@@ -21,40 +21,40 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 def append_openstack_creds(is_list_cmd = false)
   openstack_creds_cmd = " --openstack-username '#{ENV['OPENSTACK_USERNAME']}' --openstack-password '#{ENV['OPENSTACK_PASSWORD']}' --openstack-api-endpoint #{ENV['OPENSTACK_AUTH_URL']}"
-  openstack_creds_cmd = openstack_creds_cmd + " -c #{temp_dir}/knife.rb"
-  if(!is_list_cmd)
-    openstack_creds_cmd = openstack_creds_cmd + " --openstack-tenant #{ENV['OPENSTACK_TENANT']}"
+  openstack_creds_cmd += " -c #{temp_dir}/knife.rb"
+  unless is_list_cmd
+    openstack_creds_cmd += " --openstack-tenant #{ENV['OPENSTACK_TENANT']}"
   end
   openstack_creds_cmd
 end
 
 def append_openstack_creds_for_windows
-  openstack_creds_cmd = " --openstack-username '#{ENV['OPENSTACK_USERNAME']}' --openstack-password '#{ENV['OPENSTACK_PASSWORD']}' --openstack-api-endpoint #{ENV['OPENSTACK_AUTH_URL']} "   
-  openstack_creds_cmd = openstack_creds_cmd + " -c #{temp_dir}/knife.rb"
-  openstack_creds_cmd = openstack_creds_cmd + " --openstack-tenant #{ENV['OPENSTACK_TENANT']}"
+  openstack_creds_cmd = " --openstack-username '#{ENV['OPENSTACK_USERNAME']}' --openstack-password '#{ENV['OPENSTACK_PASSWORD']}' --openstack-api-endpoint #{ENV['OPENSTACK_AUTH_URL']} "
+  openstack_creds_cmd += " -c #{temp_dir}/knife.rb"
+  openstack_creds_cmd += " --openstack-tenant #{ENV['OPENSTACK_TENANT']}"
   openstack_creds_cmd
 end
 
 def get_ssh_credentials
-  " --ssh-user #{@os_ssh_user}"+
+  " --ssh-user #{@os_ssh_user}"\
   " --openstack-ssh-key-id #{@openstack_key_pair}"
 end
 
 def get_ssh_credentials_for_windows_image
-  " --ssh-user #{@os_windows_ssh_user}"+
-  " --ssh-password #{@os_windows_ssh_password}"+
+  " --ssh-user #{@os_windows_ssh_user}"\
+  " --ssh-password #{@os_windows_ssh_password}"\
   " --openstack-ssh-key-id #{@openstack_key_pair}"
 end
 
 def get_winrm_credentials
-  " --winrm-user #{@os_winrm_user}"+
-  " --winrm-password #{@os_winrm_password}"+
+  " --winrm-user #{@os_winrm_user}"\
+  " --winrm-password #{@os_winrm_password}"\
   " --openstack-ssh-key-id #{@openstack_key_pair}"
 end
 
 # get openstack active instance_id for knife openstack show command run
 def get_active_instance_id
-  server_list_output = run("knife openstack server list " + append_openstack_creds(is_list_cmd = true))
+  server_list_output = run('knife openstack server list ' + append_openstack_creds(is_list_cmd = true))
   # Check command exitstatus. Non zero exitstatus indicates command execution fails.
   if server_list_output.exitstatus != 0
     puts "Please check Openstack user name, password and auth url are correct. Error: #{list_output.stderr}."
@@ -62,17 +62,17 @@ def get_active_instance_id
   else
     servers = server_list_output.stdout
   end
-  
+
   servers.each_line do |line|
-    if line.include?("ACTIVE")
-      instance_id = line.split(" ").first
+    if line.include?('ACTIVE')
+      instance_id = line.split(' ').first
       return instance_id
     end
   end
-  return false
+  false
 end
 
-describe 'knife-openstack integration test' , :if => is_config_present do
+describe 'knife-openstack integration test', if: is_config_present do
   include KnifeTestBed
   include RSpec::KnifeTestUtils
 
@@ -88,61 +88,61 @@ describe 'knife-openstack integration test' , :if => is_config_present do
   end
 
   describe 'display help for command' do
-    %w{flavor\ list server\ create server\ delete server\ list group\ list image\ list network\ list }.each do |command|
+    %w(flavor\ list server\ create server\ delete server\ list group\ list image\ list network\ list ).each do |command|
       context "when --help option used with #{command} command" do
         let(:command) { "knife openstack #{command} --help" }
-        run_cmd_check_stdout("--help")
+        run_cmd_check_stdout('--help')
       end
     end
   end
 
   describe 'display server list' do
     context 'when standard options specified' do
-      let(:command) { "knife openstack server list" + append_openstack_creds(is_list_cmd = true) }
-      run_cmd_check_status_and_output("succeed", "Instance ID")
+      let(:command) { 'knife openstack server list' + append_openstack_creds(is_list_cmd = true) }
+      run_cmd_check_status_and_output('succeed', 'Instance ID')
     end
 
     context 'when --chef-data CLI option specified' do
-      let(:command) { "knife openstack server list" + append_openstack_creds(is_list_cmd = true) + " --chef-data" }
-      it {skip('setup a chef-zero on workspace node')}
+      let(:command) { 'knife openstack server list' + append_openstack_creds(is_list_cmd = true) + ' --chef-data' }
+      it { skip('setup a chef-zero on workspace node') }
     end
 
     context 'when --chef-data and valid --chef-node-attribute CLI option specified' do
-      let(:command) { "knife openstack server list" + append_openstack_creds(is_list_cmd = true) + " --chef-data --chef-node-attribute platform_family" }
-      it {skip('setup a chef-zero on workspace node')}
+      let(:command) { 'knife openstack server list' + append_openstack_creds(is_list_cmd = true) + ' --chef-data --chef-node-attribute platform_family' }
+      it { skip('setup a chef-zero on workspace node') }
     end
 
     context 'when --chef-data and In valid --chef-node-attribute CLI option specified' do
-      let(:command) { "knife openstack server list" + append_openstack_creds(is_list_cmd = true) + " --chef-data --chef-node-attribute invalid" }
-      it {skip('setup a chef-zero on workspace node')}
-    end    
+      let(:command) { 'knife openstack server list' + append_openstack_creds(is_list_cmd = true) + ' --chef-data --chef-node-attribute invalid' }
+      it { skip('setup a chef-zero on workspace node') }
+    end
   end
 
   describe 'display flavor list' do
     context 'when standard options specified' do
-      let(:command) { "knife openstack flavor list" + append_openstack_creds(is_list_cmd = true) }
-      run_cmd_check_status_and_output("succeed", "ID")
+      let(:command) { 'knife openstack flavor list' + append_openstack_creds(is_list_cmd = true) }
+      run_cmd_check_status_and_output('succeed', 'ID')
     end
   end
 
   describe 'display image list' do
     context 'when standard options specified' do
-      let(:command) { "knife openstack image list" + append_openstack_creds(is_list_cmd = true) }
-      run_cmd_check_status_and_output("succeed", "ID")
+      let(:command) { 'knife openstack image list' + append_openstack_creds(is_list_cmd = true) }
+      run_cmd_check_status_and_output('succeed', 'ID')
     end
   end
 
   describe 'display group list' do
     context 'when standard options specified' do
-      let(:command) { "knife openstack group list" + append_openstack_creds(is_list_cmd = true) }
-      run_cmd_check_status_and_output("succeed", "Name")
+      let(:command) { 'knife openstack group list' + append_openstack_creds(is_list_cmd = true) }
+      run_cmd_check_status_and_output('succeed', 'Name')
     end
   end
 
   describe 'display network list' do
     context 'when standard options specified' do
-      let(:command) { "knife openstack network list" + append_openstack_creds(is_list_cmd = true) }
-      it {skip 'Chef openstack setup not support this functionality'}
+      let(:command) { 'knife openstack network list' + append_openstack_creds(is_list_cmd = true) }
+      it { skip 'Chef openstack setup not support this functionality' }
     end
   end
 
@@ -152,268 +152,285 @@ describe 'knife-openstack integration test' , :if => is_config_present do
         @instance_id = get_active_instance_id
       end
       let(:command) { "knife openstack server show #{@instance_id}" + append_openstack_creds(is_list_cmd = true) }
-      run_cmd_check_status_and_output("succeed", "Instance ID")
+      run_cmd_check_status_and_output('succeed', 'Instance ID')
     end
 
     context 'with invalid instance_id' do
-      let(:command) { "knife openstack server show invalid_instance_id" + append_openstack_creds(is_list_cmd = true) }
-      
-      run_cmd_check_status_and_output("fail", "ERROR: Server doesn't exists for this invalid_instance_id instance id")
+      let(:command) { 'knife openstack server show invalid_instance_id' + append_openstack_creds(is_list_cmd = true) }
+
+      run_cmd_check_status_and_output('fail', "ERROR: Server doesn't exists for this invalid_instance_id instance id")
     end
   end
 
-  describe 'create and bootstrap Linux Server'  do
-    before(:each) {rm_known_host}
+  describe 'create and bootstrap Linux Server' do
+    before(:each) { rm_known_host }
     context 'when standard options specified' do
-      cmd_out = ""
+      cmd_out = ''
 
-      before(:each) { create_node_name("linux") }
+      before(:each) { create_node_name('linux') }
 
       after { cmd_out = "#{cmd_output}" }
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds + " --sudo"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
 
-      run_cmd_check_status_and_output("succeed", "#{@name_node}")
+      run_cmd_check_status_and_output('succeed', "#{@name_node}")
 
-      context "delete server after create" do
+      context 'delete server after create' do
         let(:command) { delete_instance_cmd(cmd_out) }
-        run_cmd_check_status_and_output("succeed", "#{@name_node}")
+        run_cmd_check_status_and_output('succeed', "#{@name_node}")
       end
     end
 
     context 'when standard options and chef node name prefix is default value(i.e openstack)' do
-      let(:command) { "knife openstack server create "+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds + " --sudo"}
+      let(:command) {
+        'knife openstack server create '\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
 
       after { run(delete_instance_cmd("#{cmd_output}")) }
 
-      run_cmd_check_status_and_output("succeed", "Bootstrapping Chef on")
+      run_cmd_check_status_and_output('succeed', 'Bootstrapping Chef on')
     end
 
     context 'when standard options and chef node name prefix is user specified value' do
-      let(:command) { "knife openstack server create "+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      " --chef-node-name-prefix os-integration-test-" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds + " --sudo"}
+      let(:command) {
+        'knife openstack server create '\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' \
+          ' --chef-node-name-prefix os-integration-test-' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
 
       after { run(delete_instance_cmd("#{cmd_output}")) }
 
-      run_cmd_check_status_and_output("succeed", "os-integration-test-")
+      run_cmd_check_status_and_output('succeed', 'os-integration-test-')
     end
 
     context 'when standard options and delete-server-on-failure specified' do
-      nodename = ""
-      before(:each) { create_node_name("linux") }
+      nodename = ''
+      before(:each) { create_node_name('linux') }
 
       after { nodename = @name_node }
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      " --delete-server-on-failure" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds + " --sudo"}
-      
-      run_cmd_check_status_and_output("succeed", "#{@name_node}")
-
-      context "delete server by using name after create" do
-        let(:command) { "knife openstack server delete #{nodename} " + append_openstack_creds(is_list_cmd = true) + " --yes" }
-        run_cmd_check_status_and_output("succeed", "#{@name_node}")
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' \
+          ' --delete-server-on-failure' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
+
+      run_cmd_check_status_and_output('succeed', "#{@name_node}")
+
+      context 'delete server by using name after create' do
+        let(:command) { "knife openstack server delete #{nodename} " + append_openstack_creds(is_list_cmd = true) + ' --yes' }
+        run_cmd_check_status_and_output('succeed', "#{@name_node}")
       end
     end
 
     context 'when delete-server-on-failure specified and bootstrap fails' do
-      before(:each) { create_node_name("linux") }
-      
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      " --delete-server-on-failure" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/incorrect_openstack.pem"+
-      append_openstack_creds() + " --sudo" }
-      
-      run_cmd_check_status_and_output("fail", "FATAL: Authentication Failed during bootstrapping")
+      before(:each) { create_node_name('linux') }
+
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' \
+          ' --delete-server-on-failure' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/incorrect_openstack.pem" + append_openstack_creds + ' --sudo'
+      }
+
+      run_cmd_check_status_and_output('fail', 'FATAL: Authentication Failed during bootstrapping')
     end
 
     context 'when openstack credentials not specified' do
-      before(:each) { create_node_name("linux") }
-      
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem --sudo" }
+      before(:each) { create_node_name('linux') }
+
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem --sudo"
+      }
 
-      run_cmd_check_status_and_output("fail", "ERROR: You did not provide a valid 'Openstack Username' value")
+      run_cmd_check_status_and_output('fail', "ERROR: You did not provide a valid 'Openstack Username' value")
     end
 
     context 'when ssh-password and identity-file parameters not specified' do
-      before(:each) { create_node_name("linux") }
-      
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes" +
-      append_openstack_creds() + " --sudo" }
-      
-      it { skip "Chef openstack setup not support this functionality."}
+      before(:each) { create_node_name('linux') }
+
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes' +
+          append_openstack_creds + ' --sudo'
+      }
+
+      it { skip 'Chef openstack setup not support this functionality.' }
     end
 
     context 'when standard options and invalid openstack security group specified' do
-      before(:each) { create_node_name("linux") }
-      
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      " --openstack-groups invalid-invalid-1212"+
-      append_openstack_creds() + " --sudo"}
-      
-      run_cmd_check_status_and_output("fail", "Security group invalid-invalid-1212 not found")
+      before(:each) { create_node_name('linux') }
+
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem"\
+          ' --openstack-groups invalid-invalid-1212' + append_openstack_creds + ' --sudo'
+      }
+
+      run_cmd_check_status_and_output('fail', 'Security group invalid-invalid-1212 not found')
     end
 
     context 'when standard options and invalid image id specified' do
-      before(:each) { create_node_name("linux") }
+      before(:each) { create_node_name('linux') }
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{SecureRandom.hex(18)} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds() + " --sudo"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{SecureRandom.hex(18)} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
 
-      run_cmd_check_status_and_output("fail", "ERROR: You have not provided a valid image ID. Please note the options for this value are -I or --image")
+      run_cmd_check_status_and_output('fail', 'ERROR: You have not provided a valid image ID. Please note the options for this value are -I or --image')
     end
 
     context 'when standard options and invalid flavor id specified' do
-      before(:each) { create_node_name("linux") }
-      
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_invalid_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds() + " --sudo"}
-      
-      run_cmd_check_status_and_output("fail", "ERROR: You have not provided a valid flavor ID. Please note the options for this value are -f or --flavor")
+      before(:each) { create_node_name('linux') }
+
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_invalid_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
+
+      run_cmd_check_status_and_output('fail', 'ERROR: You have not provided a valid flavor ID. Please note the options for this value are -f or --flavor')
     end
 
     context 'when standard options and invalid floating ip specified' do
-      before(:each) { create_node_name("linux") }
-      
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} --openstack-floating-ip #{@os_invalid_floating_ip} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds() + " --sudo"}
-      
-      run_cmd_check_status_and_output("fail", "ERROR: You have either requested an invalid floating IP address or none are available")
+      before(:each) { create_node_name('linux') }
+
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} --openstack-floating-ip #{@os_invalid_floating_ip} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
+
+      run_cmd_check_status_and_output('fail', 'ERROR: You have either requested an invalid floating IP address or none are available')
     end
 
     context 'when invalid key_pair specified' do
-      before(:each) { create_node_name("linux") }
+      before(:each) { create_node_name('linux') }
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes" +
-      " --ssh-user #{@os_ssh_user}"+
-      " --openstack-ssh-key-id #{SecureRandom.hex(6)}"+
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds() + " --sudo"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes' \
+          " --ssh-user #{@os_ssh_user}"\
+          " --openstack-ssh-key-id #{SecureRandom.hex(6)}"\
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
 
-      run_cmd_check_status_and_output("fail", "Invalid key_name provided")
+      run_cmd_check_status_and_output('fail', 'Invalid key_name provided')
     end
 
     context 'when incorrect openstack private_key.pem file is used' do
       server_create_common_bfr_aftr
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes" +
-      " --ssh-user #{@os_ssh_user}"+
-      " --openstack-ssh-key-id #{@openstack_key_pair}"+
-      " --identity-file #{temp_dir}/incorrect_openstack.pem"+
-      append_openstack_creds() + " --sudo"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes' \
+          " --ssh-user #{@os_ssh_user}"\
+          " --openstack-ssh-key-id #{@openstack_key_pair}"\
+          " --identity-file #{temp_dir}/incorrect_openstack.pem" + append_openstack_creds + ' --sudo'
+      }
 
-      run_cmd_check_status_and_output("fail", "FATAL: Authentication Failed during bootstrapping")
+      run_cmd_check_status_and_output('fail', 'FATAL: Authentication Failed during bootstrapping')
     end
 
     context 'when standard options and --openstack-private-network option specified' do
       server_create_common_bfr_aftr
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      " --openstack-private-network"+
-      append_openstack_creds() + " --sudo"}
-      
-      it { skip "not yet supported" }
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem"\
+          ' --openstack-private-network' + append_openstack_creds + ' --sudo'
+      }
+
+      it { skip 'not yet supported' }
     end
 
     context 'when standard options and --openstack-floating-ip option specified' do
       server_create_common_bfr_aftr
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      " --openstack-floating-ip"+
-      append_openstack_creds() + " --sudo"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem"\
+          ' --openstack-floating-ip' + append_openstack_creds + ' --sudo'
+      }
 
-      it {skip 'empty floating ip pool'}
+      it { skip 'empty floating ip pool' }
     end
 
     context 'when standard options and user data specified' do
-      before(:each) do 
-        create_node_name("linux")
+      before(:each) do
+        create_node_name('linux')
         @user_data_file = create_sh_user_data_file
       end
 
@@ -424,195 +441,208 @@ describe 'knife-openstack integration test' , :if => is_config_present do
         run(delete_instance_cmd("#{cmd_output}"))
       end
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem" +
-      " --user-data #{@user_data_file.path}" +
-      append_openstack_creds + " --sudo -VV"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" \
+          " --user-data #{@user_data_file.path}" +
+          append_openstack_creds + ' --sudo -VV'
+      }
 
-      run_cmd_check_status_and_output("succeed", "#{@name_node}")
+      run_cmd_check_status_and_output('succeed', "#{@name_node}")
     end
 
     context 'when standard options and no network option specified' do
       server_create_common_bfr_aftr
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      " --no-network" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds + " --sudo"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' \
+          ' --no-network' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
 
-      run_cmd_check_status_and_output("succeed", "#{@name_node}")
+      run_cmd_check_status_and_output('succeed', "#{@name_node}")
     end
 
     context 'when standard options and openstack endpoint type option is specified' do
       server_create_common_bfr_aftr
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      " --openstack-endpoint-type publicURL" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds + " --sudo"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' \
+          ' --openstack-endpoint-type publicURL' +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
 
-      run_cmd_check_status_and_output("succeed", "#{@name_node}")
+      run_cmd_check_status_and_output('succeed', "#{@name_node}")
     end
 
     context 'when standard options and openstack metadata option is specified' do
       server_create_common_bfr_aftr
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      " --metadata testdataone='testmetadata'" +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      " --metadata testdatatwo='testmetadata'" +
-      append_openstack_creds + " --sudo"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' \
+          " --metadata testdataone='testmetadata'" +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem"\
+          " --metadata testdatatwo='testmetadata'" +
+          append_openstack_creds + ' --sudo'
+      }
 
-      run_cmd_check_status_and_output("succeed", "#{@name_node}")
+      run_cmd_check_status_and_output('succeed', "#{@name_node}")
     end
 
     context 'when standard options and openstack network-ids option is specified' do
       server_create_common_bfr_aftr
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      " --network-ids #{@os_network_ids} " +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds + " --sudo"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' \
+          " --network-ids #{@os_network_ids} " +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
 
-      it {skip 'Chef openstack setup not support this functionality'}
+      it { skip 'Chef openstack setup not support this functionality' }
     end
 
     context 'when standard options and openstack availability-zone option is specified' do
       server_create_common_bfr_aftr
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_linux_image} -f #{@os_linux_flavor} "+
-      " --template-file " + get_linux_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      " --availability-zone #{@os_availability_zone} " +
-      get_ssh_credentials +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      append_openstack_creds + " --sudo"}
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_linux_image} -f #{@os_linux_flavor} "\
+      ' --template-file ' + get_linux_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' \
+          " --availability-zone #{@os_availability_zone} " +
+          get_ssh_credentials +
+          " --identity-file #{temp_dir}/openstack.pem" + append_openstack_creds + ' --sudo'
+      }
 
-      it {skip 'Chef openstack setup not support this functionality'}
+      it { skip 'Chef openstack setup not support this functionality' }
     end
   end
 
-  describe 'create and bootstrap Windows Server'  do
-    before(:each) {rm_known_host}
-    
+  describe 'create and bootstrap Windows Server' do
+    before(:each) { rm_known_host }
+
     context 'when standard options specified' do
-      cmd_out = ""
-
-      before(:each) { create_node_name("windows") }
-      
-      let(:command) { "knife openstack server create -N #{@name_node}" +
-      " -I #{@os_windows_image} " +
-      " -f #{@os_windows_flavor} " +
-      " --template-file " + get_windows_msi_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --bootstrap-protocol winrm" +
-      " --yes --server-create-timeout 1800" +
-      get_winrm_credentials+
-      append_openstack_creds_for_windows() }
-      
+      cmd_out = ''
+
+      before(:each) { create_node_name('windows') }
+
+      let(:command) {
+        "knife openstack server create -N #{@name_node}" \
+      " -I #{@os_windows_image} " \
+      " -f #{@os_windows_flavor} " \
+      ' --template-file ' + get_windows_msi_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --bootstrap-protocol winrm' \
+          ' --yes --server-create-timeout 1800' +
+          get_winrm_credentials + append_openstack_creds_for_windows
+      }
+
       after { cmd_out = "#{cmd_output}" }
 
-      run_cmd_check_status_and_output("succeed", "#{@name_node}")
+      run_cmd_check_status_and_output('succeed', "#{@name_node}")
 
-      context "delete server after create" do
+      context 'delete server after create' do
         let(:command) { delete_instance_cmd(cmd_out) }
-        run_cmd_check_status_and_output("succeed")
+        run_cmd_check_status_and_output('succeed')
       end
     end
 
     context 'when invalid winrm user specified' do
-      server_create_common_bfr_aftr("windows")
-
-      let(:command) { "knife openstack server create -N #{@name_node}" +
-      " -I #{@os_windows_image} " +
-      " -f #{@os_windows_flavor} " +
-      " --template-file " + get_windows_msi_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --bootstrap-protocol winrm" +
-      " --yes --server-create-timeout 1800" +
-      " --winrm-user #{SecureRandom.hex(6)}"+
-      " --winrm-password #{@os_winrm_password}" +
-      append_openstack_creds_for_windows() }
-      it { skip "Fails due to OC-9708 bug in knife-windows." }
+      server_create_common_bfr_aftr('windows')
+
+      let(:command) {
+        "knife openstack server create -N #{@name_node}" \
+      " -I #{@os_windows_image} " \
+      " -f #{@os_windows_flavor} " \
+      ' --template-file ' + get_windows_msi_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --bootstrap-protocol winrm' \
+          ' --yes --server-create-timeout 1800' \
+          " --winrm-user #{SecureRandom.hex(6)}"\
+          " --winrm-password #{@os_winrm_password}" +
+          append_openstack_creds_for_windows
+      }
+      it { skip 'Fails due to OC-9708 bug in knife-windows.' }
     end
 
     context 'when invalid winrm password specified' do
-      server_create_common_bfr_aftr("windows")
+      server_create_common_bfr_aftr('windows')
 
-      let(:command) { "knife openstack server create -N #{@name_node}" +
-      " -I #{@os_windows_image} " +
-      " -f #{@os_windows_flavor} " +
-      " --template-file " + get_windows_msi_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --bootstrap-protocol winrm" +
-      " --yes  --server-create-timeout 1800" +
-      " --winrm-user #{@os_winrm_user}"+
-      " --winrm-password #{SecureRandom.hex(6)}" +
-      append_openstack_creds_for_windows() }
-      after(:each)  { run(delete_instance_cmd("#{cmd_output}")) }
+      let(:command) {
+        "knife openstack server create -N #{@name_node}" \
+      " -I #{@os_windows_image} " \
+      " -f #{@os_windows_flavor} " \
+      ' --template-file ' + get_windows_msi_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --bootstrap-protocol winrm' \
+          ' --yes  --server-create-timeout 1800' \
+          " --winrm-user #{@os_winrm_user}"\
+          " --winrm-password #{SecureRandom.hex(6)}" +
+          append_openstack_creds_for_windows
+      }
+      after(:each) { run(delete_instance_cmd("#{cmd_output}")) }
 
-      it { skip "Fails due to OC-9708 bug in knife-windows." }
+      it { skip 'Fails due to OC-9708 bug in knife-windows.' }
     end
 
     context 'when standard options ssh bootstrap and valid image-os-type protocol specified' do
-      server_create_common_bfr_aftr("windows")
+      server_create_common_bfr_aftr('windows')
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_windows_ssh_image}"+
-      " -f #{@os_windows_flavor} "+
-      " --template-file " + get_windows_msi_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      " --openstack-ssh-key-id #{@openstack_key_pair}"+
-      get_ssh_credentials_for_windows_image+
-      append_openstack_creds() + " --image-os-type windows" }
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_windows_ssh_image}"\
+      " -f #{@os_windows_flavor} "\
+      ' --template-file ' + get_windows_msi_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' \
+          " --identity-file #{temp_dir}/openstack.pem"\
+          " --openstack-ssh-key-id #{@openstack_key_pair}" + get_ssh_credentials_for_windows_image + append_openstack_creds + ' --image-os-type windows'
+      }
 
-      run_cmd_check_status_and_output("succeed", "#{@name_node}")
+      run_cmd_check_status_and_output('succeed', "#{@name_node}")
     end
 
     context 'when standard options ssh bootstrap and invalid image-os-type protocol specified' do
-      before(:each) { create_node_name("windows") }
+      before(:each) { create_node_name('windows') }
 
-      let(:command) { "knife openstack server create -N #{@name_node}"+
-      " -I #{@os_windows_ssh_image}"+
-      " -f #{@os_windows_flavor} "+
-      " --template-file " + get_windows_msi_template_file_path +
-      " --server-url http://localhost:8889" +
-      " --yes --server-create-timeout 1800" +
-      " --identity-file #{temp_dir}/openstack.pem"+
-      " --openstack-ssh-key-id #{@openstack_key_pair}"+
-      get_ssh_credentials_for_windows_image+
-      append_openstack_creds() + " --image-os-type invalid" }
+      let(:command) {
+        "knife openstack server create -N #{@name_node}"\
+      " -I #{@os_windows_ssh_image}"\
+      " -f #{@os_windows_flavor} "\
+      ' --template-file ' + get_windows_msi_template_file_path +
+          ' --server-url http://localhost:8889' \
+          ' --yes --server-create-timeout 1800' \
+          " --identity-file #{temp_dir}/openstack.pem"\
+          " --openstack-ssh-key-id #{@openstack_key_pair}" + get_ssh_credentials_for_windows_image + append_openstack_creds + ' --image-os-type invalid'
+      }
 
-      run_cmd_check_status_and_output("fail", "ERROR: You must provide --image-os-type option [windows/linux]")
+      run_cmd_check_status_and_output('fail', 'ERROR: You must provide --image-os-type option [windows/linux]')
     end
   end
-end
+end