foreman_xen 0.1.8 → 0.2.0

data/app/views/compute_resources_vms/form/_volume.html.erb

@@ -1,6 +1,6 @@
 <div class="fields">
 
-  <%= selectable_f f, :sr_uuid, compute_resource.storage_pools.map { |item| [item[:display_name], item[:uuid]] }, { :selected => attribute_map[:volume_selected] }, :class => "span2", :label => _("Storage Repository") %>
+  <%= selectable_f f, :sr_uuid, compute_resource.storage_pools.map{ |item| [item[:display_name], item[:uuid]]}, { :selected => attribute_map[:volume_selected] }, :class => "span2", :label => _("Storage Repository") %>
 
   <%= text_f f, :physical_size, :class => "input-mini", :label => _("Size (GB)"), :value => attribute_map[:volume_size] %>
 </div>

data/app/views/compute_resources_vms/form/_xenstore.html.erb

@@ -16,7 +16,6 @@
 
     <div class="form-group">
       <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-ip">vm-data/ifs/0/ip</label>
-
       <div class="col-md-4">
         <div class="controls">
           <input <%= disabled %> id="xenstore-vm-data-ifs-0-ip" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][ip]" class="form-control input-mini" value="<%= vmdata[:ifs]['0'][:ip] %>">
@@ -26,7 +25,6 @@
 
     <div class="form-group">
       <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-gateway">vm-data/ifs/0/gateway</label>
-
       <div class="col-md-4">
         <div class="controls">
           <input <%= disabled %> id="xenstore-vm-data-ifs-0-gateway" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][gateway]" class="form-control input-mini" value="<%= vmdata[:ifs]['0'][:gateway] %>">
@@ -36,7 +34,6 @@
 
     <div class="form-group">
       <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-netmask">vm-data/ifs/0/netmask</label>
-
       <div class="col-md-4">
         <div class="controls">
           <input <%= disabled %> id="xenstore-vm-data-ifs-0-netmask" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][netmask]" class="form-control input-mini" value="<%= vmdata[:ifs]['0'][:netmask] %>">
@@ -46,7 +43,6 @@
 
     <div class="form-group">
       <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver1">vm-data/nameserver1</label>
-
       <div class="col-md-4">
         <input <%= disabled %> id="xenstore-vm-data-nameserver1" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver1]" class="form-control input-mini" value="<%= vmdata[:nameserver1] %>">
       </div>
@@ -54,15 +50,13 @@
 
     <div class="form-group">
       <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver2">vm-data/nameserver2</label>
-
       <div class="col-md-4">
-        <input <%= disabled %> id="xenstore-vm-data-nameserver2" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver2]" class="form-control input-mini" value="<%= vmdata[:nameserver2] %>">
+        <input <%= disabled %> id="xenstore-vm-data-nameserver2" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver2]" class="form-control input-mini" value="<%= vmdata[:nameserver2]  %>">
       </div>
     </div>
 
     <div class="form-group">
       <label class="col-md-2 control-label" for="xenstore-vm-data-environment">vm-data/environment</label>
-
       <div class="col-md-4">
         <input <%= disabled %> id="xenstore-vm-data-environment" type="text" name="host[compute_attributes][xenstore][vm-data][environment]" class="form-control input-mini" value="<%= vmdata[:environment] %>">
       </div>

data/app/views/compute_resources_vms/form/xenserver/_base.html.erb

@@ -5,18 +5,19 @@
    if params && params['host'] && params['host']['compute_attributes'] && params['host']['compute_attributes']['custom_template_name'] != ''
      hide_raw = 'display:none;'
    end
-
+   
    if controller_name == 'hosts'
-     fields_enabled = true
-     start_enable   = true
-   elsif controller_name == 'compute_attributes'
-     fields_enabled     = true
-     compute_attributes = compute_resource.compute_profile_attributes_for(params['compute_profile_id'])
-     name               = compute_attributes['name']
+      compute_attributes = compute_resource.compute_profile_attributes_for(params['host']['compute_profile_id'])   
+	  fields_enabled = true
+	  start_enable 	 = true
+	elsif controller_name == 'compute_attributes'
+	  fields_enabled = true	
+	  compute_attributes = compute_resource.compute_profile_attributes_for(params['compute_profile_id'])
+	  name 			= compute_attributes['name']
    else
      fields_enabled = false
    end
-
+	
 -%>
 
 <!-- VM Initial Settings -->
@@ -25,9 +26,9 @@
     <legend>VM Profile</legend>
     <div class="fields">
       <!--<%= text_f f, :name, :disabled => !fields_enabled, :value => name, :label => 'Name' if controller_name != 'hosts' %>-->
-      <%= selectable_f f, :vcpus_max, 1..compute_resource.max_cpu_count, { :selected => attribute_map[:cpu_count] }, :class => 'input-mini', :disabled => !fields_enabled, :label => 'vCPUs' %>
-      <%= selectable_f f, :memory_min, memory_options(compute_resource.max_memory), { :selected => attribute_map[:memory_min] }, :class => 'form-control span2', :disabled => !fields_enabled, :label => 'Memory Min' %>
-      <%= selectable_f f, :memory_max, memory_options(compute_resource.max_memory), { :selected => attribute_map[:memory_max] }, :class => 'form-control span2', :disabled => !fields_enabled, :label => 'Memory Max' %>
+      <%= selectable_f f, :vcpus_max, 1..compute_resource.max_cpu_count, {:selected  => attribute_map[:cpu_count]}, :class => 'input-mini', :disabled => !fields_enabled, :label => 'vCPUs' %>
+      <%= selectable_f f, :memory_min, memory_options(compute_resource.max_memory), {:selected  => attribute_map[:memory_min]}, :class => 'form-control span2', :disabled => !fields_enabled, :label => 'Memory Min' %>
+      <%= selectable_f f, :memory_max, memory_options(compute_resource.max_memory), {:selected  => attribute_map[:memory_max]}, :class => 'form-control span2', :disabled => !fields_enabled, :label => 'Memory Max' %>
     </div>
   </fieldset>
 </div>
@@ -72,53 +73,53 @@
 
 <!-- Startup -->
 <div class="children_fields" id="xenserver-vm-start" style="<%= hide_raw %>">
-  <%= field_set_tag 'VM Startup Options', :id => 'vm_startup_options', :title => _('Power ON VM') do -%>
-      <%= checkbox_f f, :start, :checked => (attribute_map[:power_on] == '1' || start_enable), :label => _("Power ON VM") %>
+  <%= field_set_tag 'VM Startup Options', :id => 'vm_starup_options', :title => _('Power ON VM') do -%>
+	<%= checkbox_f f, :start, :checked => (compute_attributes['start'] == '1' || start_enable), :label => _("Power ON VM") %>
   <% end -%>
 </div>
 
 <script type="text/javascript">
-
-    // Check if its a computer resource template then just do not show the form of XenStore
-    if ($("#compute_attribute_compute_profile_id").length > 0) {
-        $('#xenserver-xenstore-data').hide(1)
-    }
-
-    // Check if custom template in use then do now show SR settings
-    if ($("#compute_attribute_vm_attrs_builtin_template_name").val() == "" && $("#compute_attribute_vm_attrs_custom_template_name").val() != "") {
-        $('.xenserver-raw').hide(1);
-    }
-
-    // Check which template are in use
-    if ($("#compute_attribute_vm_attrs_builtin_template_name").val() != "") {
-        $('#compute_attribute_vm_attrs_custom_template_name').val($("#compute_attribute_vm_attrs_custom_template_name option:contains('No template')").val());
-        // IE and Chrome
-        $('#compute_attribute_vm_attrs_custom_template_name').attr("disabled", 'disabled');
-        $('.custom_template_name').prop("disabled", true);
-    }
-
-    if ($("#compute_attribute_vm_attrs_custom_template_name").val() != "") {
-        $('#compute_attribute_vm_attrs_builtin_template_name').val($("#compute_attribute_vm_attrs_custom_template_name option:contains('No template')").val());
-        // IE and Chrome
-        $('#compute_attribute_vm_attrs_builtin_template_name').attr("disabled", 'disabled');
-        $('.builtin_templates').prop("disabled", true);
-    }
-
-    // Computer Profile Templates
+	
+	// Check if its a computer resource template then just do not show the form of XenStore
+	if ($("#compute_attribute_compute_profile_id").length > 0){
+			$('#xenserver-xenstore-data').hide(1)
+	}
+
+	// Check if custom template in use then do now show SR settings
+	if ($("#compute_attribute_vm_attrs_builtin_template_name").val() == "" && $("#compute_attribute_vm_attrs_custom_template_name").val() != ""){
+			$('.xenserver-raw').hide(1);
+	}
+	
+	// Check which template are in use 
+	if ($("#compute_attribute_vm_attrs_builtin_template_name").val() != "" ){
+			$('#compute_attribute_vm_attrs_custom_template_name').val($("#compute_attribute_vm_attrs_custom_template_name option:contains('No template')").val());
+			// IE and Chrome
+			$('#compute_attribute_vm_attrs_custom_template_name').attr("disabled", 'disabled');
+			$('.custom_template_name').prop("disabled", true);
+	}
+
+	if ($("#compute_attribute_vm_attrs_custom_template_name").val() != "" ){
+			$('#compute_attribute_vm_attrs_builtin_template_name').val($("#compute_attribute_vm_attrs_custom_template_name option:contains('No template')").val());
+			// IE and Chrome
+			$('#compute_attribute_vm_attrs_builtin_template_name').attr("disabled", 'disabled');
+			$('.buildin_templates').prop("disabled", true);
+	}
+	
+	// Computer Profile Templates
     $(document).off('change.xenserver', '#compute_attribute_vm_attrs_custom_template_name');
     $(document).on('change.xenserver', '#compute_attribute_vm_attrs_custom_template_name', function (data) {
         if ($('option:selected', data.target).val() == "") {
-            $('.xenserver-raw').show(1000);
-            // IE and Chrome
-            $('.builtin_templates').prop("disabled", false);
-            $('#compute_attribute_vm_attrs_builtin_template_name').removeAttr('disabled');
+			$('.xenserver-raw').show(1000)
+			// IE and Chrome
+	        $('.buildin_templates').prop("disabled", false);
+			$('#compute_attribute_vm_attrs_builtin_template_name').removeAttr('disabled');
         } else {
-            $('.xenserver-raw').hide(1000);
-            $('#compute_attribute_vm_attrs_builtin_template_name').val($("#compute_attribute_vm_attrs_builtin_template_name option:contains('No template')").val());
-            // IE and Chrome
-            $('#compute_attribute_vm_attrs_builtin_template_name').attr("disabled", 'disabled');
-            $('.builtin_templates').prop("disabled", true);
-
+        	$('.xenserver-raw').hide(1000)
+			$('#compute_attribute_vm_attrs_builtin_template_name').val($("#compute_attribute_vm_attrs_builtin_template_name option:contains('No template')").val());
+			// IE and Chrome
+			$('#compute_attribute_vm_attrs_builtin_template_name').attr("disabled", 'disabled');
+			$('.buildin_templates').prop("disabled", true);
+			
         }
 
     });
@@ -126,51 +127,51 @@
     $(document).off('change.xenserver', '#compute_attribute_vm_attrs_builtin_template_name');
     $(document).on('change.xenserver', '#compute_attribute_vm_attrs_builtin_template_name', function (data) {
         if ($('option:selected', data.target).val() == "") {
-            // IE and Chrome
-            $('.builtin_templates').prop("disabled", false);
-            $('#compute_attribute_vm_attrs_custom_template_name').removeAttr('disabled');
+			// IE and Chrome
+	        $('.buildin_templates').prop("disabled", false);
+			$('#compute_attribute_vm_attrs_custom_template_name').removeAttr('disabled');
         } else {
-            $('#compute_attribute_vm_attrs_custom_template_name').val($("#compute_attribute_vm_attrs_custom_template_name option:contains('No template')").val());
-            // IE and Chrome
-            $('#compute_attribute_vm_attrs_custom_template_name').attr("disabled", 'disabled');
-            $('.custom_template_name').prop("disabled", true);
-
+        	$('#compute_attribute_vm_attrs_custom_template_name').val($("#compute_attribute_vm_attrs_custom_template_name option:contains('No template')").val());
+			// IE and Chrome
+			$('#compute_attribute_vm_attrs_custom_template_name').attr("disabled", 'disabled');
+			$('.custom_template_name').prop("disabled", true);
+			
         }
 
-    });
-
-
-    // Host Profile Forms
-
-    // Check which template are in use
-    if ($("#host_compute_attributes_custom_template_name").val() != "") {
-        $('#host_compute_attributes_builtin_template_name').val($("#host_compute_attributes_builtin_template_name option:contains('No template')").val());
-        // IE and Chrome
-        $('#host_compute_attributes_builtin_template_name').attr("disabled", 'disabled');
-        $('.builtin_templates').prop("disabled", true);
-    }
-
-    if ($("#host_compute_attributes_builtin_template_name").val() != "") {
-        $('#host_compute_attributes_custom_template_name').val($("#host_compute_attributes_custom_template_name option:contains('No template')").val());
-        // IE and Chrome
-        $('#host_compute_attributes_custom_template_name').attr("disabled", 'disabled');
-        $('.custom_template_name').prop("disabled", true);
-    }
+    })
 
+	
+	// Host Profile Forms
+	
+	// Check which template are in use 
+	if ($("#host_compute_attributes_custom_template_name").val() != "" ){
+			$('#host_compute_attributes_builtin_template_name').val($("#host_compute_attributes_builtin_template_name option:contains('No template')").val());
+			// IE and Chrome
+			$('#host_compute_attributes_builtin_template_name').attr("disabled", 'disabled');
+			$('.buildin_templates').prop("disabled", true);
+	}
+
+	if ($("#host_compute_attributes_builtin_template_name").val() != "" ){
+			$('#host_compute_attributes_custom_template_name').val($("#host_compute_attributes_custom_template_name option:contains('No template')").val());
+			// IE and Chrome
+			$('#host_compute_attributes_custom_template_name').attr("disabled", 'disabled');
+			$('.custom_template_name').prop("disabled", true);
+	}	
+	
     $(document).off('change.xenserver', '#host_compute_attributes_custom_template_name');
     $(document).on('change.xenserver', '#host_compute_attributes_custom_template_name', function (data) {
         if ($('option:selected', data.target).val() == "") {
-            $('.xenserver-raw').show(1000);
-            // IE and Chrome
-            $('.builtin_templates').prop("disabled", false);
-            $('#host_compute_attributes_builtin_template_name').removeAttr('disabled');
+			$('.xenserver-raw').show(1000)
+			// IE and Chrome
+	        $('.buildin_templates').prop("disabled", false);
+			$('#host_compute_attributes_builtin_template_name').removeAttr('disabled');
         } else {
-            $('.xenserver-raw').hide(1000);
-            $('#host_compute_attributes_builtin_template_name').val($("#host_compute_attributes_builtin_template_name option:contains('No template')").val());
-            // IE and Chrome
-            $('#host_compute_attributes_builtin_template_name').attr("disabled", 'disabled');
-            $('.builtin_templates').prop("disabled", true);
-
+        	$('.xenserver-raw').hide(1000)
+			$('#host_compute_attributes_builtin_template_name').val($("#host_compute_attributes_builtin_template_name option:contains('No template')").val());
+			// IE and Chrome
+			$('#host_compute_attributes_builtin_template_name').attr("disabled", 'disabled');
+			$('.buildin_templates').prop("disabled", true);
+			
         }
 
     });
@@ -178,15 +179,15 @@
     $(document).off('change.xenserver', '#host_compute_attributes_builtin_template_name');
     $(document).on('change.xenserver', '#host_compute_attributes_builtin_template_name', function (data) {
         if ($('option:selected', data.target).val() == "") {
-            // IE and Chrome
-            $('.builtin_templates').prop("disabled", false);
-            $('#host_compute_attributes_custom_template_name').removeAttr('disabled');
+			// IE and Chrome
+	        $('.buildin_templates').prop("disabled", false);
+			$('#host_compute_attributes_custom_template_name').removeAttr('disabled');
         } else {
-            $('#host_compute_attributes_custom_template_name').val($("#host_compute_attributes_builtin_template_name option:contains('No template')").val());
-            // IE and Chrome
-            $('#host_compute_attributes_custom_template_name').attr("disabled", 'disabled');
-            $('.custom_template_name').prop("disabled", true);
-
+        	$('#host_compute_attributes_custom_template_name').val($("#host_compute_attributes_builtin_template_name option:contains('No template')").val());
+			// IE and Chrome
+			$('#host_compute_attributes_custom_template_name').attr("disabled", 'disabled');
+			$('.custom_template_name').prop("disabled", true);
+			
         }
     })
 </script>

data/app/views/compute_resources_vms/index/_xenserver.html.erb

@@ -10,14 +10,14 @@
   </thead>
   <tbody>
   <% @vms.each do |vm| -%>
-      <tr>
-        <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity) %></td>
-        <td><%= vm.vcpus_max %></td>
-        <td><%= (vm.memory_static_max.to_i / 1073741824).to_s %> GB</td>
-        <td><%= vm.power_state %> </td>
-        <td><%= vm.domid %></td>
+    <tr>
+      <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity) %></td>
+      <td><%= vm.vcpus_max %></td>
+      <td><%= (vm.memory_static_max.to_i / 1073741824).to_s %> GB</td>
+      <td><%= vm.power_state %> </td>
+      <td><%= vm.domid %></td>
 
-      </tr>
+    </tr>
   <% end -%>
   </tbody>
 </table>

data/app/views/foreman_xen/snapshots/new.html.erb

@@ -1,23 +1,23 @@
 <% title _("Create Snapshot") %>
 
 <%= form_tag("create", method: "post") do %>
-    <div class="clearfix">
-      <div class="form-group">
-        <%= label_tag 'name', 'Name:', class: 'col-md-2 control-label' %>
-        <div class="col-md-8">
-          <%= text_field_tag(:name, nil, class: "form-control") %>
-        </div>
+  <div class="clearfix">
+    <div class="form-group">
+      <%= label_tag 'name', 'Name:', class: 'col-md-2 control-label' %>
+      <div class="col-md-8">
+        <%= text_field_tag(:name, nil, class: "form-control") %>
+      </div>
 
-        <div class="col-md-8">
+      <div class="col-md-8">
 
-        </div>
       </div>
     </div>
-    <div class="row form-group"></div>
-    <div class="clearfix">
-      <div class="form-actions">
-        <%= link_to("Cancel", "/foreman_xen/snapshots/#{@host.id}", :id => "cancel_button", :class => "btn btn-danger") %>
-        <%= submit_tag("Create", class: "btn btn-primary") %>
-      </div>
+  </div>
+  <div class = "row form-group"></div>
+  <div class="clearfix">
+    <div class="form-actions">
+      <%= link_to("Cancel", "/foreman_xen/snapshots/#{@host.id}", :id => "cancel_button", :class => "btn btn-danger") %>
+      <%= submit_tag("Create", class: "btn btn-primary") %>
     </div>
+  </div>
 <% end %>

data/app/views/foreman_xen/snapshots/show.html.erb

@@ -2,7 +2,7 @@
 <%= title_actions(
             button_group(link_to("Take Snapshot", "/foreman_xen/snapshots/#{@host.id}/new", :id => "takeSnapshotButton", :class => "btn btn-success"),
                          link_to_if_authorized(_("Back to host"), hash_for_host_path(:id => @host), :title => _("Back to host"), :class => 'btn btn-default')
-            )) %>
+            ) ) %>
 
 <table class="table table-hover">
   <tbody>
@@ -15,11 +15,11 @@
         <td><%= h "#{snapshot.snapshot_time.to_date} #{snapshot.snapshot_time.to_time} " %></a></td>
         <td>
           <div class="form-group">
-            <%= link_to("Revert", "/foreman_xen/snapshots/#{@host.id}/revert/#{snapshot.reference}", :id => "revertSnapshotButton", :class => "btn btn-danger", data: { confirm: "Confirm revert to #{snapshot.name}? Please note that all changes since the snapshot time will be lost, and the system will be restarted." }) %>
-            <%= link_to("Delete", "/foreman_xen/snapshots/#{@host.id}/delete/#{snapshot.reference}", :id => "deleteSnapshotButton", :class => "btn btn-danger", data: { confirm: "Delete snapshot #{snapshot.name}?" }) %>
+            <%= link_to("Revert", "/foreman_xen/snapshots/#{@host.id}/revert/#{snapshot.reference}", :id => "revertSnapshotButton", :class => "btn btn-danger", data: { confirm: "Confirm revert to #{snapshot.name}? Please note that all changes since the snapshot time will be lost, and the system will be restarted."})%>
+            <%= link_to("Delete", "/foreman_xen/snapshots/#{@host.id}/delete/#{snapshot.reference}", :id => "deleteSnapshotButton", :class => "btn btn-danger", data: { confirm: "Delete snapshot #{snapshot.name}?"})%>
           </div>
         </td>
-      </tr>
+       </tr>
   <% end %>
   </tbody>
 </table>

data/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+
   namespace :foreman_xen do
     match 'snapshots/:id', :to => 'snapshots#show', :via => 'get'
     match 'snapshots/:id/revert/:ref', :to => 'snapshots#revert', :via => 'get'
@@ -7,4 +8,5 @@ Rails.application.routes.draw do
 
     match 'snapshots/:id/create', :to => 'snapshots#create', :via => 'post'
   end
+
 end

data/lib/foreman_xen/engine.rb

@@ -1,11 +1,13 @@
 require 'fast_gettext'
 require 'gettext_i18n_rails'
 require 'fog/xenserver'
+require 'deface'
 
 module ForemanXen
-  # Inherit from the Rails module of the parent app (Foreman), not the plugin.
-  # Thus, inherits from ::Rails::Engine and not from Rails::Engine
+  #Inherit from the Rails module of the parent app (Foreman), not the plugin.
+  #Thus, inherits from ::Rails::Engine and not from Rails::Engine
   class Engine < ::Rails::Engine
+
     initializer 'foreman_xen.register_gettext', :after => :load_config_initializers do |app|
       locale_dir    = File.join(File.expand_path('../../..', __FILE__), 'locale')
       locale_domain = 'foreman-xen'
@@ -19,6 +21,7 @@ module ForemanXen
         # Register xen compute resource in foreman
         compute_resource ForemanXen::Xenserver
       end
+
     end
 
     config.to_prepare do
@@ -31,8 +34,13 @@ module ForemanXen
         Fog::Compute::XenServer::Server.send(:include, ::FogExtensions::Xenserver::Server)
         ::HostsHelper.send(:include, ForemanXen::HostHelperExtensions)
       rescue => e
-        Rails.logger.warn "Foreman-Xen: skipping engine hook (#{e})"
+        puts "Foreman-Xen: skipping engine hook (#{e.to_s})"
       end
     end
+
   end
+
+
+
+
 end

data/lib/foreman_xen/version.rb

@@ -1,3 +1,3 @@
 module ForemanXen
-  VERSION = '0.1.8'
+  VERSION = "0.2.0"
 end

data/lib/foreman_xen/vnc_tunnel.rb

@@ -1,35 +1,34 @@
 class VNCTunnel
   attr_accessor :host, :port
-  @uri              = nil
-  @srv_socket       = nil
-  @client_socket    = nil
+  @uri = nil
+  @srv_socket = nil
+  @client_socket = nil
   @read_from_server = nil
-
-  def initialize(full_url)
-    @uri = URI(full_url)
-    logger.info(full_url)
+  def initialize(fullURL)
+    @uri = URI(fullURL)
+    logger.info(fullURL)
     self.host = 'localhost'
-    s         = TCPServer.new('127.0.0.1', 0)
+    s = TCPServer.new("127.0.0.1", 0)
     self.port = s.addr[1]
     s.close
     @read_from_server = true
   end
 
   def start
-    client_srv = TCPServer.new('127.0.0.1', port)
-    thr        = Thread.new do
-      req         = "CONNECT #{@uri.path}?#{@uri.query} HTTP/1.1\r\n\r\n"
+    client_srv = TCPServer.new("127.0.0.1", self.port)
+    thr = Thread.new do
+      req =  "CONNECT #{@uri.path}?#{@uri.query} HTTP/1.1\r\n\r\n"
       @srv_socket = TCPSocket.open(@uri.host, 80)
       @srv_socket.print req
       header = @srv_socket.readline
-      if header == "HTTP/1.1 200 OK\r\n"
+      if header == "HTTP/1.1 200 OK\r\n" then
         @srv_socket.each_line do |line|
           break if line == "\r\n"
         end
         listen client_srv
       else
-        logger.error "Cannot connect to the conosle located at #{uri} reason: #{header}"
-        fail "Cannot connect to the console located at #{uri} reason: #{header}"
+        logger.error "Cannot connect to the conosle located at #{uri.to_s} reason: #{header}"
+        raise "Cannot connect to the console located at #{uri.to_s} reason: #{header}"
       end
     end
   end
@@ -40,17 +39,17 @@ class VNCTunnel
 
   private
 
-  def listen(client_srv)
+  def listen client_srv
     @client_socket = client_srv.accept
-    logger.debug 'VNCTunnel Client: client accepted'
+    logger.debug "VNCTunnel Client: client accepted"
     server_listen_thr = Thread.new do
       listen_from_server
     end
     begin
-      loop do
+      while true
         begin
           data = @client_socket.read_nonblock(1024)
-          break if data.nil?
+          break if data == nil
           @srv_socket.write(data)
         rescue IO::WaitReadable => e
           IO.select([@client_socket])
@@ -65,24 +64,27 @@ class VNCTunnel
       @client_socket.close
       @srv_socket.close
     end
-    logger.debug 'VNCTunnel Client is stopping'
+    logger.debug "VNCTunnel Client is stopping"
   end
 
   def listen_from_server
-    logger.debug 'VNCTunnel Server is listening'
+    logger.debug "VNCTunnel Server is listening"
     begin
-      while @read_from_server
+      while @read_from_server do
         begin
           data = @srv_socket.read_nonblock(1024)
           @client_socket.write(data)
         rescue IO::WaitReadable => e
-          retry unless (IO.select([@srv_socket], nil, nil, 60)).nil?
+          if IO.select([@srv_socket], nil, nil, 60) != nil then
+            retry
+          end
         end
       end
-    rescue EOFError
-    rescue Exception => e
-      logger.error "VNCTunnel Server: unexpected exception #{e}"
-    end
-    logger.debug('VNCTunnel Server is stopping')
+     rescue EOFError
+     rescue Exception => e
+       logger.error "VNCTunnel Server: unexpected exception #{e}"
+     end
+     logger.debug("VNCTunnel Server is stopping")
   end
-end
+
+end