foreman_xen 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c4e90c0f194768e19271552a20bc354ba7ad4b0
-  data.tar.gz: 4c83c3c6cefafa974ecb2138c731e3a4d363bcee
+  metadata.gz: 365378e8b9545f3690ba70b7a7330d0f1dbe4176
+  data.tar.gz: 8c78d3fc70a33a56f7440e41f8d712926c9024f5
 SHA512:
-  metadata.gz: 02a09d2f06ac452c429d57292875b5d760d85df36629d98b617004cc8ba0e0163f7a294be1a2b2259acecd0ea581ee55bd9c3c62fa43a763d6700090ff12255b
-  data.tar.gz: 30b1f01b2bea68a654157c5ee32fd437949d1cab40e319f36588d3aab81528f7fcdd235dfd0b831655a243695961af0e5eced28ee348a55ceb29779b8cdf7a64
+  metadata.gz: 0841e7a228fdd5d3a039f09b6cf0096f6dc8af84d3d5f1280fada29edd72047020742f49b02272c34fb1661456e7d0e1f6fa96e1d1040e190be9167912aa8c63
+  data.tar.gz: f6936add8819cafd4bbb862e9b77863fa9fec6babc338472f514109955a2a37bd4815e5829677cc79a7f312dbad45412c192e4f97f72af2639daa439c71fc5ec

data/README.md

@@ -1,18 +1,21 @@
-# Development policy #
-
-Currently we hold master branch as tested and verified version, please submit your changes into development branch only.
-
 # Foreman XEN Plugin
 
 This plugin enables provisioning and managing XEN Server in Foreman.
 
 ## Installation
 
-Please see the Foreman manual for appropriate instructions:
+Packages are available for Debian based distribtions as **ruby-foreman-xen** and for Red Hat based distributions as **ruby193-rubygem-foreman_xen** The gem name is **foreman_xen**.
+
+Please see the Foreman manual for further instructions:
 
 * [Foreman: How to Install a Plugin](http://theforeman.org/manuals/latest/index.html#6.1InstallaPlugin)
 
-The gem name is "foreman_xen".
+## Compatibility
+
+| Foreman Version | Plugin Version |
+|:--------------- |:-------------- |
+| >=1.5, <1.8     | 0.0.x          |
+| >=1.8.1         | 0.1.x          |
 
 ## Special note
 
@@ -21,15 +24,9 @@ To make VNC client work properly, Foreman frontend should be configured without
 /usr/share/foreman/config/settings.yaml
 :require_ssl: false
 
-## Compatibility
-
-| Foreman Version |
-| ---------------:|
-| >=  1.5         |
-
 ## Latest code
 
-You can get the develop branch of the plugin by specifying your Gemfile in this way:
+You can get the latest development code of the plugin by specifying your Gemfile in this way:
 
     gem 'foreman_xen', :git => "https://github.com/theforeman/foreman-xen.git"
 

data/app/models/concerns/fog_extensions/xenserver/server.rb

@@ -41,6 +41,14 @@ module FogExtensions
         _("%{cpus} CPUs and %{memory} memory") % {:cpus => vcpus_max, :memory => number_to_human_size(memory_max.to_i)}
       end
 
+      def interfaces
+        vifs
+      end
+
+      def select_nic(fog_nics, nic)
+        return fog_nics[0]
+      end
+
     end
   end
 end

data/app/models/concerns/foreman_xen/host_helper_extensions.rb

@@ -1,59 +1,31 @@
 module ForemanXen
   module HostHelperExtensions
     extend ActiveSupport::Concern
-    def host_title_actions(host)
-      title_actions(
-          button_group(
-              link_to_if_authorized(_("Edit"), hash_for_edit_host_path(:id => host).merge(:auth_object => host),
-                                    :title    => _("Edit your host")),
-              if host.build
-                link_to_if_authorized(_("Cancel build"), hash_for_cancelBuild_host_path(:id => host).merge(:auth_object => host, :permission => 'build_hosts'),
-                                      :disabled => host.can_be_built?,
-                                      :title    => _("Cancel build request for this host"))
-              else
-                link_to_if_authorized(_("Build"), hash_for_setBuild_host_path(:id => host).merge(:auth_object => host, :permission => 'build_hosts'),
-                                      :disabled => !host.can_be_built?,
-                                      :title    => _("Enable rebuild on next host boot"),
-                                      :confirm  => _("Rebuild %s on next reboot?\nThis would also delete all of its current facts and reports") % host)
-              end
-          ),
-          if host.compute_resource_id || host.bmc_available?
-            button_group(
-                link_to(_("Loading power state ..."), '#', :disabled => true, :id => :loading_power_state)
-            )
-          end,
-          button_group(
-              if host.try(:puppet_proxy)
-                link_to_if_authorized(_("Run puppet"), hash_for_puppetrun_host_path(:id => host).merge(:auth_object => host, :permission => 'puppetrun_hosts'),
-                                      :disabled => !Setting[:puppetrun],
-                                      :title    => _("Trigger a puppetrun on a node; requires that puppet run is enabled"))
-              end
-          ),
-          button_group(
-              link_to_if_authorized(_("Delete"), hash_for_host_path(:id => host).merge(:auth_object => host, :permission => 'destroy_hosts'),
-                                    :class => "btn btn-danger", :confirm => _('Are you sure?'), :method => :delete)
-          )
-      )
-    end
 
     def xen_host_title_actions(host)
       title_actions(
           button_group(
               link_to_if_authorized(_("Edit"), hash_for_edit_host_path(:id => host).merge(:auth_object => host),
-                                    :title    => _("Edit your host")),
-              if host.compute_resource_id
+                                    :title    => _("Edit your host"), :id => "edit-button"),
+              if not host.compute_resource.nil? and host.compute_resource.type =="ForemanXen::Xenserver"
                 link_to(_("Snapshots"), "../foreman_xen/snapshots/#{@host.id}/",
                         :title    => _("Manage machine snapshots"))
               end,
               if host.build
                 link_to_if_authorized(_("Cancel build"), hash_for_cancelBuild_host_path(:id => host).merge(:auth_object => host, :permission => 'build_hosts'),
                                       :disabled => host.can_be_built?,
-                                      :title    => _("Cancel build request for this host"))
+                                      :title    => _("Cancel build request for this host"), :id => "cancel-build-button")
               else
-                link_to_if_authorized(_("Build"), hash_for_setBuild_host_path(:id => host).merge(:auth_object => host, :permission => 'build_hosts'),
+                link_to_if_authorized(_("Build"), hash_for_host_path(:id => host).merge(:auth_object => host, :permission => 'build_hosts', :anchor => "review_before_build"),
                                       :disabled => !host.can_be_built?,
                                       :title    => _("Enable rebuild on next host boot"),
-                                      :confirm  => _("Rebuild %s on next reboot?\nThis would also delete all of its current facts and reports") % host)
+                                      :class    => "btn",
+                                      :id       => "build-review",
+                                      :data     => { :toggle => 'modal',
+                                                     :target => '#review_before_build',
+                                                     :url    => review_before_build_host_path(:id => host)
+                                      }
+                )
               end
           ),
           if host.compute_resource_id || host.bmc_available?
@@ -70,7 +42,7 @@ module ForemanXen
           ),
           button_group(
               link_to_if_authorized(_("Delete"), hash_for_host_path(:id => host).merge(:auth_object => host, :permission => 'destroy_hosts'),
-                                    :class => "btn btn-danger", :confirm => _('Are you sure?'), :method => :delete)
+                                    :class => "btn btn-danger", :id => "delete-button", :data => { :message => _("Are you sure?") }, :method => :delete)
           )
       )
     end

data/app/models/foreman_xen/xenserver.rb

@@ -90,18 +90,7 @@ module ForemanXen
     end
 
     def associated_host(vm)
-      ips = []
-      begin
-        if vm.tools_installed?
-          vm.guest_metrics.networks.each do |k,v|
-            ips << v
-          end
-        end
-      rescue => e
-        logger.error("Error retrieving Network via Guest Metrics: #{e.message}")
-      end
-
-      Host.authorized(:view_hosts, Host).where(:ip => ips).first
+      associate_by("mac", vm.interfaces.map(&:mac))
     end
 
     def get_snapshots_for_vm(vm)

data/lib/foreman_xen/engine.rb

@@ -17,7 +17,7 @@ module ForemanXen
 
     initializer 'foreman_xen.register_plugin', :after => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_xen do
-        requires_foreman '>= 1.5'
+        requires_foreman '>= 1.8'
         # Register xen compute resource in foreman
         compute_resource ForemanXen::Xenserver
       end

data/lib/foreman_xen/version.rb

@@ -1,3 +1,3 @@
 module ForemanXen
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
-- Pavel Nemirovsky, Michał Piotrowski, Avi Israeli
+- Pavel Nemirovsky, Michal Piotrowski, Avi Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.29'
 description: Provision and manage XEN Server from Foreman.
 email:
 - operations@oovoo.com
@@ -75,8 +75,8 @@ files:
 - app/views/compute_resources_vms/form/_network.html.erb
 - app/views/compute_resources_vms/form/_templates.html.erb
 - app/views/compute_resources_vms/form/_volume.html.erb
-- app/views/compute_resources_vms/form/_xenserver.html.erb
 - app/views/compute_resources_vms/form/_xenstore.html.erb
+- app/views/compute_resources_vms/form/xenserver/_base.html.erb
 - app/views/compute_resources_vms/index/_xenserver.html.erb
 - app/views/compute_resources_vms/show/_xenserver.html.erb
 - app/views/foreman_xen/snapshots/new.html.erb