foreman_xen 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 365378e8b9545f3690ba70b7a7330d0f1dbe4176
-  data.tar.gz: 8c78d3fc70a33a56f7440e41f8d712926c9024f5
+  metadata.gz: bbea3b3d6ef90c6eff8545033d2df9ec9a12f881
+  data.tar.gz: e0b81c233dc652ebdaef50a7b18cd8276ef7dbf9
 SHA512:
-  metadata.gz: 0841e7a228fdd5d3a039f09b6cf0096f6dc8af84d3d5f1280fada29edd72047020742f49b02272c34fb1661456e7d0e1f6fa96e1d1040e190be9167912aa8c63
-  data.tar.gz: f6936add8819cafd4bbb862e9b77863fa9fec6babc338472f514109955a2a37bd4815e5829677cc79a7f312dbad45412c192e4f97f72af2639daa439c71fc5ec
+  metadata.gz: 00fedb50740623e4c74ca6d0d84698f2bc38cc8284687da0e5b16f762fa65994e420ddc79b4a247c6c3709b0cd6b04c83db4a01944cded3237c1b1493dc384c6
+  data.tar.gz: d8e15229b3cd13b20d8c8292fe676f0f9c1edcfcf5f2731d8c847b57d9188878e611f599d648b41ed20dc9b562158d6fb02b1f873418fb30ebd88e11bff7bcc0

data/app/models/foreman_xen/xenserver.rb

@@ -62,8 +62,37 @@ module ForemanXen
     end
 
     def storage_pools
-      storages = client.storage_repositories.select { |sr| sr.type!= 'udev' && sr.type!= 'iso'} rescue []
-      storages.sort { |a, b| a.name <=> b.name }
+        results = Array.new
+	
+        storages = client.storage_repositories.select { |sr| sr.type!= 'udev' && sr.type!= 'iso'} rescue []
+	hosts = client.hosts
+
+	storages.each do |sr|
+		subresults = Hash.new()
+		found = 0
+		hosts.each do |host|
+
+			if (sr.reference == host.suspend_image_sr) 
+				found = 1
+				subresults[:name] 		= sr.name
+				subresults[:display_name]	= sr.name + '(' +  host.hostname + ')'
+				subresults[:uuid]		= sr.uuid
+				break
+			end
+
+		end
+		
+		if (found==0) 
+			subresults[:name] 		= sr.name
+			subresults[:display_name] 	= sr.name
+			subresults[:uuid]		= sr.uuid
+		end
+		results.push(subresults)
+	end
+
+	results.sort_by!{|item| item[:display_name] }
+	return results
+
     end
 
     def interfaces
@@ -198,7 +227,7 @@ module ForemanXen
     def create_vm_from_builtin(args)
 
       host               = client.hosts.first
-      storage_repository = client.storage_repositories.find { |sr| sr.name == "#{args[:VBDs][:print]}" }
+      storage_repository = client.storage_repositories.find { |sr| sr.uuid == "#{args[:VBDs][:sr_uuid]}" }
 
       gb   = 1073741824 #1gb in bytes
       size = args[:VBDs][:physical_size].to_i * gb

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

@@ -13,6 +13,7 @@
 		 end
 	end
   -%>
-  <%= selectable_f f, :print, compute_resource.storage_pools.map(&:name), { :selected => selected }, :class => "span2", :label => _("Storage Repository") %>
+  <%= selectable_f f, :sr_uuid, compute_resource.storage_pools.map{ |item| [item[:display_name], item[:uuid]]}, { :selected => selected }, :class => "span2", :label => _("Storage Repository") %>
+
   <%= text_f f, :physical_size, :class => "input-mini", :label => _("Size (GB)"), :value => size %>
 </div>

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

@@ -91,19 +91,19 @@
             $('#xenstore-vm-data-ifs-0-netmask').val($('#subnet_mask', fields).val());
             $('#xenstore-vm-data-nameserver1').val($('#subnet_dns_primary', fields).val());
             $('#xenstore-vm-data-nameserver2').val($('#subnet_dns_secondary', fields).val());
-            $('#xenstore-vm-data-ifs-0-ip').val($('#host_ip').val());
+            $('#xenstore-vm-data-ifs-0-ip').val($('#host_interfaces_attributes_0_ip').val());
             $('#xenstore-vm-data-environment').val($('#host_environment_id option:selected').text())
         })
     }
 
-    subnet_id = $('#host_subnet_id option:selected').val();
+    subnet_id = $('#host_interfaces_attributes_0_subnet_id option:selected').val();
 
     if (subnet_id) {
         autocomplete_xenstore(subnet_id)
     }
 
-    $(document).off('change.xenstore', '#host_subnet_id');
-    $(document).on('change.xenstore', '#host_subnet_id', function (data) {
+    $(document).off('change.xenstore', '#host_interfaces_attributes_0_subnet_id');
+    $(document).on('change.xenstore', '#host_interfaces_attributes_0_subnet_id', function (data) {
         subnet_id = $('option:selected', data.target).val();
         if (subnet_id) {
             autocomplete_xenstore(subnet_id)
@@ -120,7 +120,7 @@
 
     $(document).off('click.xenstore', '#compute_resource_tab a');
     $(document).on('click.xenstore', '#compute_resource_tab a', function (data) {
-        subnet_id = $('#host_subnet_id option:selected').val();
+        subnet_id = $('#host_interfaces_attributes_0_subnet_id option:selected').val();
 
         if (subnet_id) {
             autocomplete_xenstore(subnet_id)

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

@@ -40,9 +40,6 @@
 
 <!--Storage-->
 <div class="children_fields xenserver-raw" id="xenserver-storage" style="<%= hide_raw %>">
-  <%= new_child_fields_template(f, :VBDs, {
-          :object  => compute_resource.new_volume,
-          :partial => 'compute_resources_vms/form/volume', :form_builder_attrs => { :compute_resource => compute_resource, :new => new  } }) %>
   <%= field_set_tag 'Storage', :id => 'storage_volumes', :title => _('Storage') do -%>
       <%= f.fields_for :VBDs do |i| %>
           <%= render 'compute_resources_vms/form/volume', :f => i, :compute_resource => compute_resource, :new => new %>
@@ -59,35 +56,71 @@
 </div>
 
 <div class="children_fields" id="xenserver-vm-start" style="<%= hide_raw %>">
-  <%= field_set_tag 'VM Startup Options', :id => 'vm_starup_options', :title => _('Power ON this machine') do -%>
-      <div class="form-group">
-        <label class="col-md-2 control-label" for="xenserver-vm-start-params">Power ON this VM</label>
-        <div class="col-md-4">
-          <div class="controls">
-            <% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
-            <%= checkbox_f f, :start, { :checked => (checked == '1')} if fields_enabled %>
-          </div>
-        </div>
-      </div>
+  <%= field_set_tag 'VM Startup Options', :id => 'vm_starup_options', :title => _('Power ON this VM') do -%>
+ 	 <%= checkbox_f f, :start, :checked => true, :label => _("Power ON this 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)
+	}
 
+    $(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
+	        $('.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');
+			$('.buildin_templates').prop("disabled", true);
+			
+        }
+
+    });
+
+    $(document).off('change.xenserver', '#compute_attribute_vm_attrs_builtin_template_name');
+    $(document).on('change.xenserver', '#compute_attribute_vm_attrs_builtin_template_name', function (data) {
+        $('.xenserver-raw').show(1000);
+        $('.buildin_templates').prop("disabled", false);
+		$('#compute_attribute_vm_attrs_builtin_template_name').removeAttr('disabled');
+    })
+
+	
+	// Create a new host windows 
+	
     $(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)
+			$('.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)
+        	$('.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);
+			
         }
 
     });
 
     $(document).off('change.xenserver', '#host_compute_attributes_builtin_template_name');
     $(document).on('change.xenserver', '#host_compute_attributes_builtin_template_name', function (data) {
-        $('.xenserver-raw').show(1000)
+        	$('.xenserver-raw').show(1000);
+        	$('.buildin_templates').prop("disabled", false);
+		$('#host_compute_attributes_builtin_template_name').removeAttr('disabled');
     })
-</script>
+</script>

data/lib/foreman_xen/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Pavel Nemirovsky, Michal Piotrowski, Avi Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake