foreman_xen 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 232755986ea6e3676d1b625ea28273782ae38b83
-  data.tar.gz: 97ed7ce99f9bdd0acd45e03b00a1cdcb79db18da
+  metadata.gz: 0c3b2a37c986005efe387f6931f768f5359ab6e9
+  data.tar.gz: bb8daba521e44ab73a7e84585202abee259f823b
 SHA512:
-  metadata.gz: 483a76adfad78351fb74bed7c3ab3d1b3ab411407b7a757c24880384d2124f6a47bb429517d2eff5348eca4db0c1ce6c0c992cccc046dac915d4cf6617993025
-  data.tar.gz: dcadde1db7aa889fdebf2b46db975aa9519f9bfb1ed50bb22882f0b5430cad299db5c37991ee89aa6b19440c51ea27b5b10dd054deee8498bb55ba4cb00566bd
+  metadata.gz: f27f16653e04ceb293c3ac3f6fef2a3d727f27297a51fd89c3cf9a11424533e4cab75a4997baef790dd325f7518dae462a088f45063293b7abe6c74585b35fc9
+  data.tar.gz: fb4bc0be2fca1262513e4ad9ddd1f70197e709b9c58fc220a986b612372d0ce037a379befc6b95e10bc2058889fe0ff816989101263f955c0d1a3e9f7f167404

data/README.md

@@ -14,13 +14,13 @@ The gem name is "foreman_xen".
 
 | Foreman Version | Plugin Version |
 | ---------------:| --------------:|
-| >=  1.5         | 0.0.1          |
+| >=  1.5         | 0.0.2          |
 
 ## Latest code
 
 You can get the develop branch of the plugin by specifying your Gemfile in this way:
 
-    gem 'foreman_xen', :git => "https://github.com/ohadlevy/foreman_xen.git"
+    gem 'foreman_xen', :git => "https://github.com/theforeman/foreman-xen.git"
 
 # Copyright
 

data/app/models/foreman_xen/xenserver.rb

@@ -282,7 +282,6 @@ module ForemanXen
         end
       end
       out_hash
-      @key = key
     end
   end
 end

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

@@ -9,21 +9,28 @@
   %>
 
   <div id='templates' class=''>
-    <label class="control-label" for="host_compute_attributes_custom_template_name">Custom template</label>
 
+  <div class="form-group">
+   <label class="col-md-2 control-label" for="host_compute_attributes_custom_template_name">Custom template</label>
+   <div class="col-md-4">
     <div class="controls">
-      <select class="input-xlarge" id="host_compute_attributes_custom_template_name" name="host[compute_attributes][custom_template_name]">
+      <select class="form-control span2" id="host_compute_attributes_custom_template_name" name="host[compute_attributes][custom_template_name]">
         <%= options_for_select([[_("No template"), ""]] + compute_resource.custom_templates.map { |t| [t.name, t.name] }, selected_item_c) %>
       </select>
     </div>
+   </div>  
+  </div>
 
-    <label class="control-label" for="host_compute_attributes_builtin_template_name">Built-in template</label>
-
+    <div class="form-group ">
+    <label class="col-md-2 control-label" for="host_compute_attributes_builtin_template_name">Built-in template</label>
+    <div class="col-md-4">
     <div class="controls">
-      <select class="input-xlarge" id="host_compute_attributes_builtin_template_name" name="host[compute_attributes][builtin_template_name]">
+      <select class="form-control span2" id="host_compute_attributes_builtin_template_name" name="host[compute_attributes][builtin_template_name]">
         <%= options_for_select([[_("No template"), ""]] + compute_resource.builtin_templates.map { |t| [t.name, t.name] }, selected_item_b) %>
       </select>
     </div>
+    </div>
+    </div>
 
   </div>
 

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

@@ -30,53 +30,58 @@
 <div class="children_fields">
 
   <div class="fields"/>
-  <div class="control-group  "><label class="control-label" for="xenstore-vm-data-ifs-0-ip">vm-data/ifs/0/ip</label>
 
+  <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="input" value="<%= ip %>">
+      <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="<%= ip %>">
     </div>
   </div>
+  </div>
 
-  <div class="control-group  ">
-    <label class="control-label" for="xenstore-vm-data-ifs-0-gateway">vm-data/ifs/0/gateway</label>
-
-    <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="input" value="<%= gateway %>">
+  <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="<%= gateway %>">
     </div>
   </div>
+  </div>
 
-  <div class="control-group  ">
-    <label class="control-label" for="xenstore-vm-data-ifs-0-netmask">vm-data/ifs/0/netmask</label>
-
+  <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="input" value="<%= netmask %>">
+      <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="<%= netmask %>">
     </div>
   </div>
+  </div>
 
-  <div class="control-group  ">
-    <label class="control-label" for="xenstore-vm-data-nameserver1">vm-data/nameserver1</label>
-
-    <div class="controls">
-      <input <%= disabled %> id="xenstore-vm-data-nameserver1" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver1]" class="input" value="<%= nameserver1 %>">
+  <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="<%= nameserver1 %>">
     </div>
   </div>
+  </div>
 
-  <div class="control-group  ">
-    <label class="control-label" for="xenstore-vm-data-nameserver2">vm-data/nameserver2</label>
-
-    <div class="controls">
-      <input <%= disabled %> id="xenstore-vm-data-nameserver2" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver2]" class="input" value="<%= nameserver2 %>">
+  <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="<%= nameserver2 %>">
     </div>
   </div>
+  </div>
 
-  <div class="control-group  ">
-    <label class="control-label" for="xenstore-vm-data-environment">vm-data/environment</label>
-
-    <div class="controls">
-      <input <%= disabled %> id="xenstore-vm-data-environment" type="text" name="host[compute_attributes][xenstore][vm-data][environment]" class="input" value="<%= environment %>">
+  <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="<%= environment %>">
     </div>
   </div>
 
+  </div>
 </div>
 
 

data/lib/foreman_xen.rb

@@ -1,3 +1,4 @@
+require 'foreman_xen/vnc_tunnel'
 require 'foreman_xen/engine'
 module ForemanXen
 end

data/lib/foreman_xen/version.rb

@@ -1,3 +1,3 @@
 module ForemanXen
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/foreman_xen/vnc_tunnel.rb

@@ -1,90 +1,90 @@
-module ForemanXen
-
-  class VNCTunnel
-    attr_accessor :host, :port
-
-    def initialize(fullURL)
-      @uri = URI(fullURL)
-      logger.info(fullURL)
-      self.host = 'localhost'
-      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', self.port)
-      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"
-                @srv_socket.each_line do |line|
-                  break if line == "\r\n"
-                end
-                listen client_srv
-              else
-                logger.error "Cannot connect to the console located at #{uri.to_s} reason: #{header}"
-                raise "Cannot connect to the console located at #{uri.to_s} reason: #{header}"
-              end
-            end
-    end
+class VNCTunnel
+  attr_accessor :host, :port
+  @uri = nil
+  @srv_socket = nil
+  @client_socket = nil
+  @read_from_server = nil
+  def initialize(fullURL)
+    @uri = URI(fullURL)
+    logger.info(fullURL)
+    self.host = 'localhost'
+    s = TCPServer.new("127.0.0.1", 0)
+    self.port = s.addr[1]
+    s.close
+    @read_from_server = true
+  end
 
-    def logger
-      Rails.logger
+  def start
+    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" 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.to_s} reason: #{header}"
+        raise "Cannot connect to the console located at #{uri.to_s} reason: #{header}"
+      end
     end
+  end
 
-    private
+  def logger
+    Rails.logger
+  end
 
-    def listen(client_srv)
-      @client_socket = client_srv.accept
-      logger.debug 'VNCTunnel Client: client accepted'
+  private
 
-      begin
-        while true
-          begin
-            data = @client_socket.read_nonblock(1024)
-            break if data == nil
-            @srv_socket.write(data)
-          rescue IO::WaitReadable => e
-            IO.select([@client_socket])
-            retry
-          end
+  def listen client_srv
+    @client_socket = client_srv.accept
+    logger.debug "VNCTunnel Client: client accepted"
+    server_listen_thr = Thread.new do
+      listen_from_server
+    end
+    begin
+      while true
+        begin
+          data = @client_socket.read_nonblock(1024)
+          break if data == nil
+          @srv_socket.write(data)
+        rescue IO::WaitReadable => e
+          IO.select([@client_socket])
+          retry
         end
-      rescue EOFError
-        # ignored
-      rescue Exception => e
-        logger.error "VNCTunnel Client: unexpected exception #{e}"
-      ensure
-        @read_from_server = false
-        @client_socket.close
-        @srv_socket.close
       end
-      logger.debug 'VNCTunnel Client is stopping'
+    rescue EOFError
+    rescue Exception => e
+      logger.error "VNCTunnel Client: unexpected exception #{e}"
+    ensure
+      @read_from_server = false
+      @client_socket.close
+      @srv_socket.close
     end
+    logger.debug "VNCTunnel Client is stopping"
+  end
 
-    def listen_from_server
-      logger.debug 'VNCTunnel Server is listening'
-      begin
-        while @read_from_server do
-          begin
-            data = @srv_socket.read_nonblock(1024)
-            @client_socket.write(data)
-          rescue IO::WaitReadable => e
-            if IO.select([@srv_socket], nil, nil, 60) != nil
-              retry
-            end
+  def listen_from_server
+    logger.debug "VNCTunnel Server is listening"
+    begin
+      while @read_from_server do
+        begin
+          data = @srv_socket.read_nonblock(1024)
+          @client_socket.write(data)
+        rescue IO::WaitReadable => e
+          if IO.select([@srv_socket], nil, nil, 60) != nil then
+            retry
           end
         end
-      rescue EOFError
-        # ignored
-      rescue Exception => e
-        logger.error "VNCTunnel Server: unexpected exception #{e}"
       end
-      logger.debug('VNCTunnel Server is stopping')
-    end
-
+     rescue EOFError
+     rescue Exception => e
+       logger.error "VNCTunnel Server: unexpected exception #{e}"
+     end
+     logger.debug("VNCTunnel Server is stopping")
   end
-end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
-- Michał Piotrowski
+- Pavel Nemirovsky, Michał Piotrowski, Avi Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,7 +40,7 @@ dependencies:
         version: '0'
 description: Provision and manage XEN Server from Foreman.
 email:
-- michal.piotrowski@erlang-solutions.com
+- operations@oovoo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -87,10 +87,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Provision and manage XEN Server from Foreman
 test_files:
-- test/test_helper.rb
 - test/foreman_xen_test.rb
+- test/test_helper.rb